import { Injectable } from '@angular/core'
-import { Http } from '@angular/http'
+import { HttpClient } from '@angular/common/http'
import 'rxjs/add/operator/catch'
import 'rxjs/add/operator/map'
-import { AuthService } from '../../core'
-import { AuthHttp } from '../auth'
import { RestExtractor } from '../rest'
+import { UserCreate, UserUpdateMe } from '../../../../../shared'
@Injectable()
export class UserService {
static BASE_USERS_URL = API_URL + '/api/v1/users/'
constructor (
- private http: Http,
- private authHttp: AuthHttp,
- private authService: AuthService,
+ private authHttp: HttpClient,
private restExtractor: RestExtractor
) {}
- checkTokenValidity () {
- const url = UserService.BASE_USERS_URL + 'me'
-
- // AuthHttp will redirect us to the login page if the oken is not valid anymore
- this.authHttp.get(url).subscribe()
- }
-
changePassword (newPassword: string) {
- const url = UserService.BASE_USERS_URL + this.authService.getUser().id
- const body = {
+ const url = UserService.BASE_USERS_URL + 'me'
+ const body: UserUpdateMe = {
password: newPassword
}
return this.authHttp.put(url, body)
.map(this.restExtractor.extractDataBool)
- .catch((res) => this.restExtractor.handleError(res))
+ .catch(res => this.restExtractor.handleError(res))
}
- updateDetails (details: { displayNSFW: boolean }) {
- const url = UserService.BASE_USERS_URL + this.authService.getUser().id
+ updateMyDetails (details: UserUpdateMe) {
+ const url = UserService.BASE_USERS_URL + 'me'
return this.authHttp.put(url, details)
.map(this.restExtractor.extractDataBool)
- .catch((res) => this.restExtractor.handleError(res))
+ .catch(res => this.restExtractor.handleError(res))
}
- signup (username: string, password: string, email: string) {
- const body = {
- username,
- email,
- password
- }
-
- return this.http.post(UserService.BASE_USERS_URL + 'register', body)
+ signup (userCreate: UserCreate) {
+ return this.authHttp.post(UserService.BASE_USERS_URL + 'register', userCreate)
.map(this.restExtractor.extractDataBool)
- .catch(this.restExtractor.handleError)
+ .catch(res => this.restExtractor.handleError(res))
}
}