Client: check token valitidy at startup

diff --git a/client/src/app/account/account.component.ts b/client/src/app/account/account.component.ts
index 9b6b5fbf421123f282cc1e2e1a8d065d22d346a7..14452a73eccbdeacb406c1ab6eb87d7f667bc40d 100644 (file)
--- 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 53f6ba58e22ac22078d8e460966cd62011712573..75f2ee6f9b33d8ac7ecf230073d7306e7327fc48 100644 (file)
--- 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/index.ts b/client/src/app/account/index.ts
index be03713cb7fb37320606717b608d40fe3d0abb29..9265fa10adf369d32eecb28c443bdc5fd59b8f88 100644 (file)
--- 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';

diff --git a/client/src/app/app.component.ts b/client/src/app/app.component.ts
index f487e6c482dab245824e8c7efa8f325d1f0ec715..47d2bfdd2e32bc11480b2350230d13e8bceaf927 100644 (file)
--- a/client/src/app/app.component.ts
+++ b/client/src/app/app.component.ts
@@ -1,14 +1,17 @@
-import { Component, ViewContainerRef } from '@angular/core';
+import { Component, OnInit, ViewContainerRef } from '@angular/core';
 import { Router } from '@angular/router';
 
 import { MetaService } from 'ng2-meta';
+
+import { AuthService } from './core';
+import { UserService } from './shared';
+
 @Component({
   selector: 'my-app',
   templateUrl: './app.component.html',
   styleUrls: [ './app.component.scss' ]
 })
-
-export class AppComponent {
+export class AppComponent implements OnInit {
   notificationOptions = {
     timeOut: 3000,
     lastOnBottom: true,
@@ -25,9 +28,18 @@ export class AppComponent {
   constructor(
     private router: Router,
     private metaService: MetaService,
+    private authService: AuthService,
+    private userService: UserService,
     viewContainerRef: ViewContainerRef
   ) {}
 
+  ngOnInit() {
+    if (this.authService.isLoggedIn()) {
+      // The service will automatically redirect to the login page if the token is not valid anymore
+      this.userService.checkTokenValidity();
+    }
+  }
+
   isInAdmin() {
     return this.router.url.indexOf('/admin/') !== -1;
   }

diff --git a/client/src/app/shared/auth/auth-status.model.ts b/client/src/app/core/auth/auth-status.model.ts
similarity index 100%
rename from client/src/app/shared/auth/auth-status.model.ts
rename to client/src/app/core/auth/auth-status.model.ts

diff --git a/client/src/app/shared/auth/auth-user.model.ts b/client/src/app/core/auth/auth-user.model.ts
similarity index 96%
rename from client/src/app/shared/auth/auth-user.model.ts
rename to client/src/app/core/auth/auth-user.model.ts
index f560351f4878416186c8af25b9b201d81672427c..5d61954d6105e2777d2d9d5c42ca13bb3f05920c 100644 (file)
--- a/client/src/app/shared/auth/auth-user.model.ts
+++ b/client/src/app/core/auth/auth-user.model.ts
@@ -1,4 +1,5 @@
-import { User } from '../users';
+// Do not use the barrel (dependency loop)
+import { User } from '../../shared/users/user.model';
 
 export class AuthUser extends User {
   private static KEYS = {

diff --git a/client/src/app/core/auth/auth.service.ts b/client/src/app/core/auth/auth.service.ts
index a56adbbad913196370524f98dff33a89484db890..2e73281976c2e6626289701f08fe26913373b04d 100644 (file)
--- a/client/src/app/core/auth/auth.service.ts
+++ b/client/src/app/core/auth/auth.service.ts
@@ -9,9 +9,9 @@ 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 { AuthStatus } from '../../shared/auth/auth-status.model';
-import { AuthUser } from '../../shared/auth/auth-user.model';
 import { RestExtractor } from '../../shared/rest';
 
 @Injectable()

diff --git a/client/src/app/core/auth/index.ts b/client/src/app/core/auth/index.ts
index cf52c9c7ce7552b978e578a666d07ffe41f3794c..67a18cfbbd389e9df52f55f804539590b03c70c0 100644 (file)
--- a/client/src/app/core/auth/index.ts
+++ b/client/src/app/core/auth/index.ts
@@ -1 +1,3 @@
+export * from './auth-status.model';
+export * from './auth-user.model';
 export * from './auth.service'

diff --git a/client/src/app/core/menu/menu.component.ts b/client/src/app/core/menu/menu.component.ts
index f1bf6966d63a37a79db5f83dfa9f696d46d3c246..5ca60e5e0abcecf06be607f2d4475fe81d60d18e 100644 (file)
--- a/client/src/app/core/menu/menu.component.ts
+++ b/client/src/app/core/menu/menu.component.ts
@@ -1,8 +1,7 @@
 import { Component, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
 
-import { AuthService } from '../auth';
-import { AuthStatus } from '../../shared';
+import { AuthService, AuthStatus } from '../auth';
 
 @Component({
   selector: 'my-menu',

diff --git a/client/src/app/shared/auth/index.ts b/client/src/app/shared/auth/index.ts
index ce0bd8adfc240834d4bb11ed894f96083dce1930..c488aed695936bda84a723a9a62614c37285cd89 100644 (file)
--- a/client/src/app/shared/auth/index.ts
+++ b/client/src/app/shared/auth/index.ts
@@ -1,3 +1 @@
 export * from './auth-http.service';
-export * from './auth-status.model';
-export * from './auth-user.model';

diff --git a/client/src/app/shared/shared.module.ts b/client/src/app/shared/shared.module.ts
index 0f57ef078b18243840f7ebf925da31a2108aeb82..84cc86c64ef3f94f52bba97a389956941cde077b 100644 (file)
--- a/client/src/app/shared/shared.module.ts
+++ b/client/src/app/shared/shared.module.ts
@@ -16,6 +16,7 @@ import { Ng2SmartTableModule } from 'ng2-smart-table';
 import { AUTH_HTTP_PROVIDERS } from './auth';
 import { RestExtractor, RestService } from './rest';
 import { SearchComponent, SearchService } from './search';
+import { UserService } from './users';
 import { VideoAbuseService } from './video-abuse';
 
 @NgModule({
@@ -65,7 +66,8 @@ import { VideoAbuseService } from './video-abuse';
     RestExtractor,
     RestService,
     SearchService,
-    VideoAbuseService
+    VideoAbuseService,
+    UserService
   ]
 })
 export class SharedModule { }

diff --git a/client/src/app/shared/users/index.ts b/client/src/app/shared/users/index.ts
index 5a670ce8f9c25e52f39be4335866407fadd8bda2..ff009e89b49e269651399c8a074db677c45ffeb8 100644 (file)
--- a/client/src/app/shared/users/index.ts
+++ b/client/src/app/shared/users/index.ts
@@ -1 +1,2 @@
 export * from './user.model';
+export * from './user.service';

diff --git a/client/src/app/account/account.service.ts b/client/src/app/shared/users/user.service.ts
similarity index 57%
rename from client/src/app/account/account.service.ts
rename to client/src/app/shared/users/user.service.ts
index 046690347482e3a6089033c67e838734279094c2..4cf100f0dd157f20db082f7801575b0f52973e43 100644 (file)
--- a/client/src/app/account/account.service.ts
+++ b/client/src/app/shared/users/user.service.ts
@@ -2,11 +2,12 @@ import { Injectable } from '@angular/core';
 import 'rxjs/add/operator/catch';
 import 'rxjs/add/operator/map';
 
-import { AuthService } from '../core';
-import { AuthHttp, RestExtractor } from '../shared';
+import { AuthService } from '../../core';
+import { AuthHttp } from '../auth';
+import { RestExtractor } from '../rest';
 
 @Injectable()
-export class AccountService {
+export class UserService {
   private static BASE_USERS_URL = '/api/v1/users/';
 
   constructor(
@@ -15,8 +16,15 @@ export class AccountService {
     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 = AccountService.BASE_USERS_URL + this.authService.getUser().id;
+    const url = UserService.BASE_USERS_URL + this.authService.getUser().id;
     const body = {
       password: newPassword
     };

diff --git a/client/src/app/videos/video-list/video-list.component.ts b/client/src/app/videos/video-list/video-list.component.ts
index b3780f8b66ead38076bc5ad13aa9ecf004891ba7..844e14567883b88b65df53770265c207ddf8a01b 100644 (file)
--- a/client/src/app/videos/video-list/video-list.component.ts
+++ b/client/src/app/videos/video-list/video-list.component.ts
@@ -9,8 +9,8 @@ import {
   Video,
   VideoService
 } from '../shared';
-import { AuthService } from '../../core';
-import { AuthUser, RestPagination, Search, SearchField } from '../../shared';
+import { AuthService, AuthUser } from '../../core';
+import { RestPagination, Search, SearchField } from '../../shared';
 import { SearchService } from '../../shared';
 
 @Component({