diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 9ee494f71b0627298c4e79f0873381d5ca95fcfc..db66563e0e62b70372a62d02add54301d2642a97 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -46,16 +46,17 @@ export function initAppConfig(appConfigService: AppConfigService) { Angulartics2Module.forRoot(), ], providers: [ + // The order is important as the InitUserService require the configuration of the app { provide: APP_INITIALIZER, - useFactory: initUserService, - deps: [UserService], + useFactory: initAppConfig, + deps: [AppConfigService], multi: true, }, { provide: APP_INITIALIZER, - useFactory: initAppConfig, - deps: [AppConfigService], + useFactory: initUserService, + deps: [UserService], multi: true, }, ], diff --git a/src/app/user/services/user.service.ts b/src/app/user/services/user.service.ts index 129942e3d0547702e45eb506552bc5236f5b9214..93882aaeee85531dd84f55faa1a6f6774cb3508f 100644 --- a/src/app/user/services/user.service.ts +++ b/src/app/user/services/user.service.ts @@ -42,7 +42,11 @@ export class UserService { setUserInfo() { const userInfo = JSON.parse(localStorage.getItem('userInfo')); if (userInfo) { - this._user = new User(userInfo); + if (userInfo.exp > Date.now()) { + this._user = new User(userInfo); + } else { + this.resetAuth(); + } } }