Client: check token valitidy at startup

4 files changed, 4 insertions, 36 deletions

diff --git a/client/src/app/account/account.component.ts b/client/src/app/account/account.component.ts
index 9b6b5fbf4..14452a73e 100644
--- a/client/src/app/account/account.component.ts
+++ b/client/src/app/account/account.component.ts
@@ -4,8 +4,7 @@ import { Router } from '@angular/router';
 
 import { NotificationsService } from 'angular2-notifications';
 
-import { AccountService } from './account.service';
-import { FormReactive, USER_PASSWORD } from '../shared';
+import { FormReactive, UserService, USER_PASSWORD } from '../shared';
 
 @Component({
   selector: 'my-account',
@@ -29,7 +28,7 @@ export class AccountComponent extends FormReactive implements OnInit {
     private formBuilder: FormBuilder,
     private router: Router,
     private notificationsService: NotificationsService,
-    private accountService: AccountService
+    private userService: UserService
   ) {
     super();
   }
@@ -58,7 +57,7 @@ export class AccountComponent extends FormReactive implements OnInit {
       return;
     }
 
-    this.accountService.changePassword(newPassword).subscribe(
+    this.userService.changePassword(newPassword).subscribe(
       () => this.notificationsService.success('Success', 'Password updated.'),
 
       err => this.error = err
diff --git a/client/src/app/account/account.module.ts b/client/src/app/account/account.module.ts
index 53f6ba58e..75f2ee6f9 100644
--- a/client/src/app/account/account.module.ts
+++ b/client/src/app/account/account.module.ts
@@ -19,8 +19,6 @@ import { SharedModule } from '../shared';
     AccountComponent
   ],
 
-  providers: [
-    AccountService
-  ]
+  providers: []
 })
 export class AccountModule { }
diff --git a/client/src/app/account/account.service.ts b/client/src/app/account/account.service.ts
deleted file mode 100644
index 046690347..000000000
--- a/client/src/app/account/account.service.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { Injectable } from '@angular/core';
-import 'rxjs/add/operator/catch';
-import 'rxjs/add/operator/map';
-
-import { AuthService } from '../core';
-import { AuthHttp, RestExtractor } from '../shared';
-
-@Injectable()
-export class AccountService {
-  private static BASE_USERS_URL = '/api/v1/users/';
-
-  constructor(
-    private authHttp: AuthHttp,
-    private authService: AuthService,
-    private restExtractor: RestExtractor
-  ) {}
-
-  changePassword(newPassword: string) {
-    const url = AccountService.BASE_USERS_URL + this.authService.getUser().id;
-    const body = {
-      password: newPassword
-    };
-
-    return this.authHttp.put(url, body)
-                        .map(this.restExtractor.extractDataBool)
-                        .catch((res) => this.restExtractor.handleError(res));
-  }
-}
diff --git a/client/src/app/account/index.ts b/client/src/app/account/index.ts
index be03713cb..9265fa10a 100644
--- a/client/src/app/account/index.ts
+++ b/client/src/app/account/index.ts
@@ -1,4 +1,3 @@
 export * from './account-routing.module';
 export * from './account.component';
 export * from './account.module';
-export * from './account.service';