From 0aeae725c7e9a80d29cd9dc5fd7f81e01c83b3ec Mon Sep 17 00:00:00 2001 From: blagovest Date: Thu, 18 Apr 2019 13:15:35 +0300 Subject: [PATCH 1/3] feat(ever-admin): log out redirects to '/server-down' page EV-1217 --- .../src/app/@core/auth/admin-auth-strategy.service.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/admin/website-angular/src/app/@core/auth/admin-auth-strategy.service.ts b/admin/website-angular/src/app/@core/auth/admin-auth-strategy.service.ts index 4d5a142c0..94ca7e493 100644 --- a/admin/website-angular/src/app/@core/auth/admin-auth-strategy.service.ts +++ b/admin/website-angular/src/app/@core/auth/admin-auth-strategy.service.ts @@ -289,6 +289,8 @@ export class AdminAuthStrategy extends NbAuthStrategy { private async _logout(): Promise { this.store.clear(); + localStorage.setItem('serverConnection', '200'); + await this.apollo.getClient().resetStore(); return new NbAuthResult( From 7c9b395e36b1470e303b83cf005f6059e780afdb Mon Sep 17 00:00:00 2001 From: blagovest Date: Thu, 18 Apr 2019 13:36:04 +0300 Subject: [PATCH 2/3] feat(ever-admin): using store service EV-1217 --- .../src/app/@core/auth/admin-auth-strategy.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/website-angular/src/app/@core/auth/admin-auth-strategy.service.ts b/admin/website-angular/src/app/@core/auth/admin-auth-strategy.service.ts index 94ca7e493..8847ebd73 100644 --- a/admin/website-angular/src/app/@core/auth/admin-auth-strategy.service.ts +++ b/admin/website-angular/src/app/@core/auth/admin-auth-strategy.service.ts @@ -289,7 +289,7 @@ export class AdminAuthStrategy extends NbAuthStrategy { private async _logout(): Promise { this.store.clear(); - localStorage.setItem('serverConnection', '200'); + this.store.serverConnection = '200'; await this.apollo.getClient().resetStore(); From 9c5c15f4881fd2abcf43800bc3cd628dd380ea61 Mon Sep 17 00:00:00 2001 From: alish Date: Thu, 18 Apr 2019 18:13:40 +0300 Subject: [PATCH 3/3] fix(ever-api): fixed bug with start on SocketIO server --- backend/api/src/services/services.app.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/api/src/services/services.app.ts b/backend/api/src/services/services.app.ts index 81dc6fafd..1d6a76c26 100644 --- a/backend/api/src/services/services.app.ts +++ b/backend/api/src/services/services.app.ts @@ -203,7 +203,7 @@ export class ServicesApp { await this._registerModels(); await this._registerEntityAdministrator(); this._passportSetup(); - this._startExpress(); + await this._startExpress(); this._startSocketIO(); }