]> git.immae.eu Git - github/Chocobozzz/PeerTube.git/blobdiff - client/src/app/shared/users/user.service.ts
Add account settings new design
[github/Chocobozzz/PeerTube.git] / client / src / app / shared / users / user.service.ts
index b479ac0348d14155f90e74d7ae2566c0ef5f4fa0..6d1017fc9b0fc85ca364adb2e9fe45df6dc553b8 100644 (file)
@@ -1,53 +1,42 @@
 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, UserUpdate } from '../../../../../shared'
+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: UserUpdate = {
+    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: UserUpdate) {
-    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 (userCreate: UserCreate) {
-    return this.http.post(UserService.BASE_USERS_URL + 'register', 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))
   }
 }