4 files changed, 32 insertions, 30 deletions

diff --git a/client/app/users/login/login.component.ts b/client/app/users/login/login.component.ts
index 33590ad4c..8e369541d 100644
--- a/client/app/users/login/login.component.ts
+++ b/client/app/users/login/login.component.ts
@@ -10,17 +10,17 @@ import { AuthService, AuthStatus, User } from '../shared/index';
 })
 
 export class UserLoginComponent {
-  constructor(private _authService: AuthService, private _router: Router) {}
+  constructor(private authService: AuthService, private router: Router) {}
 
   login(username: string, password: string) {
-    this._authService.login(username, password).subscribe(
+    this.authService.login(username, password).subscribe(
       result => {
         const user = new User(username, result);
         user.save();
 
-        this._authService.setStatus(AuthStatus.LoggedIn);
+        this.authService.setStatus(AuthStatus.LoggedIn);
 
-        this._router.navigate(['VideosList']);
+        this.router.navigate(['VideosList']);
       },
       error => {
         if (error.error === 'invalid_grant') {
diff --git a/client/app/users/shared/auth.service.ts b/client/app/users/shared/auth.service.ts
index 1cb042db5..b1da94436 100644
--- a/client/app/users/shared/auth.service.ts
+++ b/client/app/users/shared/auth.service.ts
@@ -7,27 +7,28 @@ import { User } from './user.model';
 
 @Injectable()
 export class AuthService {
-  loginChanged$;
+  private static BASE_LOGIN_URL = '/api/v1/users/token';
+  private static BASE_CLIENT_URL = '/api/v1/users/client';
 
-  private _loginChanged;
-  private _baseLoginUrl = '/api/v1/users/token';
-  private _baseClientUrl = '/api/v1/users/client';
-  private _clientId = '';
-  private _clientSecret = '';
+  loginChangedSource: Observable<AuthStatus>;
 
-  constructor (private http: Http) {
-    this._loginChanged = new Subject<AuthStatus>();
-    this.loginChanged$ = this._loginChanged.asObservable();
+  private loginChanged: Subject<AuthStatus>;
+  private clientId: string;
+  private clientSecret: string;
+
+  constructor(private http: Http) {
+    this.loginChanged = new Subject<AuthStatus>();
+    this.loginChangedSource = this.loginChanged.asObservable();
 
     // Fetch the client_id/client_secret
     // FIXME: save in local storage?
-    this.http.get(this._baseClientUrl)
+    this.http.get(AuthService.BASE_CLIENT_URL)
       .map(res => res.json())
       .catch(this.handleError)
       .subscribe(
         result => {
-          this._clientId = result.client_id;
-          this._clientSecret = result.client_secret;
+          this.clientId = result.client_id;
+          this.clientSecret = result.client_secret;
           console.log('Client credentials loaded.');
         },
         error => {
@@ -38,8 +39,8 @@ export class AuthService {
 
   login(username: string, password: string) {
     let body = new URLSearchParams();
-    body.set('client_id', this._clientId);
-    body.set('client_secret', this._clientSecret);
+    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');
@@ -53,7 +54,7 @@ export class AuthService {
       headers: headers
     };
 
-    return this.http.post(this._baseLoginUrl, body.toString(), options)
+    return this.http.post(AuthService.BASE_LOGIN_URL, body.toString(), options)
                     .map(res => res.json())
                     .catch(this.handleError);
   }
@@ -62,7 +63,7 @@ export class AuthService {
     // TODO make HTTP request
   }
 
-  getRequestHeader(): Headers {
+  getRequestHeader() {
     return new Headers({ 'Authorization': `${this.getTokenType()} ${this.getToken()}` });
   }
 
@@ -70,11 +71,11 @@ export class AuthService {
     return new RequestOptions({ headers: this.getRequestHeader() });
   }
 
-  getToken(): string {
+  getToken() {
     return localStorage.getItem('access_token');
   }
 
-  getTokenType(): string {
+  getTokenType() {
     return localStorage.getItem('token_type');
   }
 
@@ -88,7 +89,7 @@ export class AuthService {
     return user;
   }
 
-  isLoggedIn(): boolean {
+  isLoggedIn() {
     if (this.getToken()) {
       return true;
     } else {
@@ -97,7 +98,7 @@ export class AuthService {
   }
 
   setStatus(status: AuthStatus) {
-    this._loginChanged.next(status);
+    this.loginChanged.next(status);
   }
 
   private handleError (error: Response) {
diff --git a/client/app/users/shared/token.model.ts b/client/app/users/shared/token.model.ts
index b7872e74a..021c83fad 100644
--- a/client/app/users/shared/token.model.ts
+++ b/client/app/users/shared/token.model.ts
@@ -3,7 +3,7 @@ export class Token {
   refresh_token: string;
   token_type: string;
 
-  static load(): Token {
+  static load() {
     return new Token({
       access_token: localStorage.getItem('access_token'),
       refresh_token: localStorage.getItem('refresh_token'),
@@ -11,10 +11,11 @@ export class Token {
     });
   }
 
-  constructor (hash?: any) {
+  constructor(hash?: any) {
     if (hash) {
       this.access_token = hash.access_token;
       this.refresh_token = hash.refresh_token;
+
       if (hash.token_type === 'bearer') {
         this.token_type = 'Bearer';
       } else {
@@ -23,7 +24,7 @@ export class Token {
     }
   }
 
-  save():void {
+  save() {
     localStorage.setItem('access_token', this.access_token);
     localStorage.setItem('refresh_token', this.refresh_token);
     localStorage.setItem('token_type', this.token_type);
diff --git a/client/app/users/shared/user.model.ts b/client/app/users/shared/user.model.ts
index 73fd4ddc0..ca0a5f26c 100644
--- a/client/app/users/shared/user.model.ts
+++ b/client/app/users/shared/user.model.ts
@@ -4,16 +4,16 @@ export class User {
   username: string;
   token: Token;
 
-  static load(): User {
+  static load() {
     return new User(localStorage.getItem('username'), Token.load());
   }
 
-  constructor (username: string, hash_token: any) {
+  constructor(username: string, hash_token: any) {
     this.username = username;
     this.token = new Token(hash_token);
   }
 
-  save(): void {
+  save() {
     localStorage.setItem('username', this.username);
     this.token.save();
   }