Merge pull request #439 from ever-co/develop

Develop
ever-co · Apr 18, 2019 · e12200b · e12200b
2 parents 6f5b6ad + 3275fc2
commit e12200b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 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
@@ -289,6 +289,8 @@ export class AdminAuthStrategy extends NbAuthStrategy {
 	private async _logout(): Promise<NbAuthResult> {
 		this.store.clear();
 
+		this.store.serverConnection = '200';
+
 		await this.apollo.getClient().resetStore();
 
 		return new NbAuthResult(

diff --git 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();
 	}