1 files changed, 118 insertions, 118 deletions

diff --git a/client/src/app/core/auth/auth.service.ts b/client/src/app/core/auth/auth.service.ts
index 4c75df1ca..32f7a5503 100644
--- a/client/src/app/core/auth/auth.service.ts
+++ b/client/src/app/core/auth/auth.service.ts
@@ -1,40 +1,40 @@
-import { Injectable } from '@angular/core';
-import { Headers, Http, Response, URLSearchParams } from '@angular/http';
-import { Router } from '@angular/router';
-import { Observable } from 'rxjs/Observable';
-import { Subject } from 'rxjs/Subject';
-import 'rxjs/add/operator/map';
-import 'rxjs/add/operator/mergeMap';
-import 'rxjs/add/observable/throw';
-
-import { NotificationsService } from 'angular2-notifications';
-
-import { AuthStatus } from './auth-status.model';
-import { AuthUser } from './auth-user.model';
+import { Injectable } from '@angular/core'
+import { Headers, Http, Response, URLSearchParams } from '@angular/http'
+import { Router } from '@angular/router'
+import { Observable } from 'rxjs/Observable'
+import { Subject } from 'rxjs/Subject'
+import 'rxjs/add/operator/map'
+import 'rxjs/add/operator/mergeMap'
+import 'rxjs/add/observable/throw'
+
+import { NotificationsService } from 'angular2-notifications'
+
+import { AuthStatus } from './auth-status.model'
+import { AuthUser } from './auth-user.model'
 // Do not use the barrel (dependency loop)
-import { RestExtractor } from '../../shared/rest';
+import { RestExtractor } from '../../shared/rest'
 
 @Injectable()
 export class AuthService {
-  private static BASE_CLIENT_URL = API_URL + '/api/v1/clients/local';
-  private static BASE_TOKEN_URL = API_URL + '/api/v1/users/token';
-  private static BASE_USER_INFORMATIONS_URL = API_URL + '/api/v1/users/me';
+  private static BASE_CLIENT_URL = API_URL + '/api/v1/clients/local'
+  private static BASE_TOKEN_URL = API_URL + '/api/v1/users/token'
+  private static BASE_USER_INFORMATIONS_URL = API_URL + '/api/v1/users/me'
 
-  loginChangedSource: Observable<AuthStatus>;
+  loginChangedSource: Observable<AuthStatus>
 
-  private clientId: string;
-  private clientSecret: string;
-  private loginChanged: Subject<AuthStatus>;
-  private user: AuthUser = null;
+  private clientId: string
+  private clientSecret: string
+  private loginChanged: Subject<AuthStatus>
+  private user: AuthUser = null
 
-  constructor(
+  constructor (
     private http: Http,
     private notificationsService: NotificationsService,
     private restExtractor: RestExtractor,
     private router: Router
    ) {
-    this.loginChanged = new Subject<AuthStatus>();
-    this.loginChangedSource = this.loginChanged.asObservable();
+    this.loginChanged = new Subject<AuthStatus>()
+    this.loginChangedSource = this.loginChanged.asObservable()
 
     // Fetch the client_id/client_secret
     // FIXME: save in local storage?
@@ -43,120 +43,120 @@ export class AuthService {
       .catch((res) => this.restExtractor.handleError(res))
       .subscribe(
         result => {
-          this.clientId = result.client_id;
-          this.clientSecret = result.client_secret;
-          console.log('Client credentials loaded.');
+          this.clientId = result.client_id
+          this.clientSecret = result.client_secret
+          console.log('Client credentials loaded.')
         },
 
         error => {
-          let errorMessage = `Cannot retrieve OAuth Client credentials: ${error.text}. \n`;
-          errorMessage += 'Ensure you have correctly configured PeerTube (config/ directory), in particular the "webserver" section.';
+          let errorMessage = `Cannot retrieve OAuth Client credentials: ${error.text}. \n`
+          errorMessage += 'Ensure you have correctly configured PeerTube (config/ directory), in particular the "webserver" section.'
 
           // We put a bigger timeout
           // This is an important message
-          this.notificationsService.error('Error', errorMessage, { timeOut: 7000 });
+          this.notificationsService.error('Error', errorMessage, { timeOut: 7000 })
         }
-      );
+      )
 
     // Return null if there is nothing to load
-    this.user = AuthUser.load();
+    this.user = AuthUser.load()
   }
 
-  getRefreshToken() {
-    if (this.user === null) return null;
+  getRefreshToken () {
+    if (this.user === null) return null
 
-    return this.user.getRefreshToken();
+    return this.user.getRefreshToken()
   }
 
-  getRequestHeaderValue() {
-    return `${this.getTokenType()} ${this.getAccessToken()}`;
+  getRequestHeaderValue () {
+    return `${this.getTokenType()} ${this.getAccessToken()}`
   }
 
-  getAccessToken() {
-    if (this.user === null) return null;
+  getAccessToken () {
+    if (this.user === null) return null
 
-    return this.user.getAccessToken();
+    return this.user.getAccessToken()
   }
 
-  getTokenType() {
-    if (this.user === null) return null;
+  getTokenType () {
+    if (this.user === null) return null
 
-    return this.user.getTokenType();
+    return this.user.getTokenType()
   }
 
-  getUser(): AuthUser {
-    return this.user;
+  getUser () {
+    return this.user
   }
 
-  isAdmin() {
-    if (this.user === null) return false;
+  isAdmin () {
+    if (this.user === null) return false
 
-    return this.user.isAdmin();
+    return this.user.isAdmin()
   }
 
-  isLoggedIn() {
+  isLoggedIn () {
     if (this.getAccessToken()) {
-      return true;
+      return true
     } else {
-      return false;
+      return false
     }
   }
 
-  login(username: string, password: string) {
-    let body = new URLSearchParams();
-    body.set('client_id', this.clientId);
-    body.set('client_secret', this.clientSecret);
-    body.set('response_type', 'code');
-    body.set('grant_type', 'password');
-    body.set('scope', 'upload');
-    body.set('username', username);
-    body.set('password', password);
+  login (username: string, password: string) {
+    let body = new URLSearchParams()
+    body.set('client_id', this.clientId)
+    body.set('client_secret', this.clientSecret)
+    body.set('response_type', 'code')
+    body.set('grant_type', 'password')
+    body.set('scope', 'upload')
+    body.set('username', username)
+    body.set('password', password)
 
-    let headers = new Headers();
-    headers.append('Content-Type', 'application/x-www-form-urlencoded');
+    let headers = new Headers()
+    headers.append('Content-Type', 'application/x-www-form-urlencoded')
 
     let options = {
       headers: headers
-    };
+    }
 
     return this.http.post(AuthService.BASE_TOKEN_URL, body.toString(), options)
                     .map(this.restExtractor.extractDataGet)
                     .map(res => {
-                      res.username = username;
-                      return res;
+                      res.username = username
+                      return res
                     })
                     .flatMap(res => this.mergeUserInformations(res))
                     .map(res => this.handleLogin(res))
-                    .catch((res) => this.restExtractor.handleError(res));
+                    .catch((res) => this.restExtractor.handleError(res))
   }
 
-  logout() {
+  logout () {
     // TODO: make an HTTP request to revoke the tokens
-    this.user = null;
+    this.user = null
 
-    AuthUser.flush();
+    AuthUser.flush()
 
-    this.setStatus(AuthStatus.LoggedOut);
+    this.setStatus(AuthStatus.LoggedOut)
   }
 
-  refreshAccessToken() {
-    console.log('Refreshing token...');
+  refreshAccessToken () {
+    console.log('Refreshing token...')
 
-    const refreshToken = this.getRefreshToken();
+    const refreshToken = this.getRefreshToken()
 
-    let body = new URLSearchParams();
-    body.set('refresh_token', refreshToken);
-    body.set('client_id', this.clientId);
-    body.set('client_secret', this.clientSecret);
-    body.set('response_type', 'code');
-    body.set('grant_type', 'refresh_token');
+    let body = new URLSearchParams()
+    body.set('refresh_token', refreshToken)
+    body.set('client_id', this.clientId)
+    body.set('client_secret', this.clientSecret)
+    body.set('response_type', 'code')
+    body.set('grant_type', 'refresh_token')
 
-    let headers = new Headers();
-    headers.append('Content-Type', 'application/x-www-form-urlencoded');
+    let headers = new Headers()
+    headers.append('Content-Type', 'application/x-www-form-urlencoded')
 
     let options = {
       headers: headers
-    };
+    }
 
     return this.http.post(AuthService.BASE_TOKEN_URL, body.toString(), options)
                     .map(this.restExtractor.extractDataGet)
@@ -164,41 +164,41 @@ export class AuthService {
                     .catch((res: Response) => {
                       // The refresh token is invalid?
                       if (res.status === 400 && res.json() && res.json().error === 'invalid_grant') {
-                        console.error('Cannot refresh token -> logout...');
-                        this.logout();
-                        this.router.navigate(['/login']);
+                        console.error('Cannot refresh token -> logout...')
+                        this.logout()
+                        this.router.navigate(['/login'])
 
                         return Observable.throw({
                           json: () => '',
                           text: () => 'You need to reconnect.'
-                        });
+                        })
                       }
 
-                      return this.restExtractor.handleError(res);
-                    });
+                      return this.restExtractor.handleError(res)
+                    })
   }
 
-  refreshUserInformations() {
+  refreshUserInformations () {
     const obj = {
       access_token: this.user.getAccessToken()
-    };
+    }
 
-    this.mergeUserInformations(obj)
+    this.mergeUserInformations (obj)
         .subscribe(
           res => {
-            this.user.displayNSFW = res.displayNSFW;
-            this.user.role = res.role;
+            this.user.displayNSFW = res.displayNSFW
+            this.user.role = res.role
 
-            this.user.save();
+            this.user.save()
           }
-        );
+        )
   }
 
-  private mergeUserInformations(obj: { access_token: string }) {
+  private mergeUserInformations (obj: { access_token: string }) {
     // Do not call authHttp here to avoid circular dependencies headaches
 
-    const headers = new Headers();
-    headers.set('Authorization', `Bearer ${obj.access_token}`);
+    const headers = new Headers()
+    headers.set('Authorization', `Bearer ${obj.access_token}`)
 
     return this.http.get(AuthService.BASE_USER_INFORMATIONS_URL, { headers })
              .map(res => res.json())
@@ -207,38 +207,38 @@ export class AuthService {
                  id: res.id,
                  role: res.role,
                  displayNSFW: res.displayNSFW
-               };
+               }
 
-               return Object.assign(obj, newProperties);
+               return Object.assign(obj, newProperties)
              }
-    );
+    )
   }
 
   private handleLogin (obj: any) {
-    const id = obj.id;
-    const username = obj.username;
-    const role = obj.role;
-    const email = obj.email;
-    const displayNSFW = obj.displayNSFW;
+    const id = obj.id
+    const username = obj.username
+    const role = obj.role
+    const email = obj.email
+    const displayNSFW = obj.displayNSFW
     const hashTokens = {
-      access_token: obj.access_token,
-      token_type: obj.token_type,
-      refresh_token: obj.refresh_token
-    };
+      accessToken: obj.access_token,
+      tokenType: obj.token_type,
+      refreshToken: obj.refresh_token
+    }
 
-    this.user = new AuthUser({ id, username, role, displayNSFW, email }, hashTokens);
-    this.user.save();
+    this.user = new AuthUser({ id, username, role, displayNSFW, email }, hashTokens)
+    this.user.save()
 
-    this.setStatus(AuthStatus.LoggedIn);
+    this.setStatus(AuthStatus.LoggedIn)
   }
 
   private handleRefreshToken (obj: any) {
-    this.user.refreshTokens(obj.access_token, obj.refresh_token);
-    this.user.save();
+    this.user.refreshTokens(obj.access_token, obj.refresh_token)
+    this.user.save()
   }
 
-  private setStatus(status: AuthStatus) {
-    this.loginChanged.next(status);
+  private setStatus (status: AuthStatus) {
+    this.loginChanged.next(status)
   }
 
 }