-import { Injectable } from '@angular/core';
-import { Http } from '@angular/http';
-import 'rxjs/add/operator/catch';
-import 'rxjs/add/operator/map';
-
-import { AuthService } from '../../core';
-import { AuthHttp } from '../auth';
-import { RestExtractor } from '../rest';
+import { HttpClient } from '@angular/common/http'
+import { Injectable } from '@angular/core'
+import 'rxjs/add/operator/catch'
+import 'rxjs/add/operator/map'
+import { UserCreate, UserUpdateMe } from '../../../../../shared'
+import { environment } from '../../../environments/environment'
+import { RestExtractor } from '../rest'
@Injectable()
export class UserService {
- static BASE_USERS_URL = '/api/v1/users/';
+ static BASE_USERS_URL = environment.apiUrl + '/api/v1/users/'
- constructor(
- private http: Http,
- private authHttp: AuthHttp,
- private authService: AuthService,
+ constructor (
+ 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 = {
+ changePassword (newPassword: string) {
+ 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))
+ }
+
+ changeAvatar (avatarForm: FormData) {
+ const url = UserService.BASE_USERS_URL + 'me/avatar/pick'
+
+ return this.authHttp.post(url, avatarForm)
+ .catch(this.restExtractor.handleError)
+ }
+
+ signup (userCreate: UserCreate) {
+ return this.authHttp.post(UserService.BASE_USERS_URL + 'register', userCreate)
+ .map(this.restExtractor.extractDataBool)
+ .catch(res => this.restExtractor.handleError(res))
+ }
+
+ getMyVideoQuotaUsed () {
+ const url = UserService.BASE_USERS_URL + '/me/video-quota-used'
+
+ return this.authHttp.get(url)
+ .catch(res => this.restExtractor.handleError(res))
}
- signup(username: string, password: string, email: string) {
+ askResetPassword (email: string) {
+ const url = UserService.BASE_USERS_URL + '/ask-reset-password'
+
+ return this.authHttp.post(url, { email })
+ .map(this.restExtractor.extractDataBool)
+ .catch(res => this.restExtractor.handleError(res))
+ }
+
+ resetPassword (userId: number, verificationString: string, password: string) {
+ const url = `${UserService.BASE_USERS_URL}/${userId}/reset-password`
const body = {
- username,
- email,
+ verificationString,
password
- };
+ }
- return this.http.post(UserService.BASE_USERS_URL + 'register', body)
- .map(this.restExtractor.extractDataBool)
- .catch(this.restExtractor.handleError);
+ return this.authHttp.post(url, body)
+ .map(this.restExtractor.extractDataBool)
+ .catch(res => this.restExtractor.handleError(res))
}
}