From 86c16b5ee071a556cb613e98b97e1133b53bb85d Mon Sep 17 00:00:00 2001
From: TheDiaval <thediavall@gmail.com>
Date: Fri, 2 Aug 2019 11:12:18 +0300
Subject: [PATCH] feature(core): add tenantId to session state

---
 .../core/src/lib/actions/session.actions.ts      |  4 ++++
 .../packages/core/src/lib/models/session.ts      |  1 +
 .../core/src/lib/states/session.state.ts         | 16 ++++++++++++++--
 .../src/lib/handlers/error.handler.ts            |  3 ++-
 4 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/npm/ng-packs/packages/core/src/lib/actions/session.actions.ts b/npm/ng-packs/packages/core/src/lib/actions/session.actions.ts
index 7b596a25c3..278fb59f4e 100644
--- a/npm/ng-packs/packages/core/src/lib/actions/session.actions.ts
+++ b/npm/ng-packs/packages/core/src/lib/actions/session.actions.ts
@@ -2,3 +2,7 @@ export class SessionSetLanguage {
   static readonly type = '[Session] Set Language';
   constructor(public payload: string) {}
 }
+export class SessionSetTenantId {
+  static readonly type = '[Session] Set Tenant Id';
+  constructor(public payload: string) {}
+}
diff --git a/npm/ng-packs/packages/core/src/lib/models/session.ts b/npm/ng-packs/packages/core/src/lib/models/session.ts
index ec595ff38d..44392b2692 100644
--- a/npm/ng-packs/packages/core/src/lib/models/session.ts
+++ b/npm/ng-packs/packages/core/src/lib/models/session.ts
@@ -1,5 +1,6 @@
 export namespace Session {
   export interface State {
     language: string;
+    tenantId: string;
   }
 }
diff --git a/npm/ng-packs/packages/core/src/lib/states/session.state.ts b/npm/ng-packs/packages/core/src/lib/states/session.state.ts
index e312d605e8..8008084371 100644
--- a/npm/ng-packs/packages/core/src/lib/states/session.state.ts
+++ b/npm/ng-packs/packages/core/src/lib/states/session.state.ts
@@ -1,5 +1,5 @@
-import { State, Action, StateContext, Selector } from '@ngxs/store';
-import { SessionSetLanguage } from '../actions/session.actions';
+import { Action, Selector, State, StateContext } from '@ngxs/store';
+import { SessionSetLanguage, SessionSetTenantId } from '../actions/session.actions';
 import { Session } from '../models/session';
 
 @State<Session.State>({
@@ -12,6 +12,11 @@ export class SessionState {
     return language;
   }
 
+  @Selector()
+  static getSelectedTenantId({ tenantId }: Session.State): string {
+    return tenantId;
+  }
+
   constructor() {}
 
   @Action(SessionSetLanguage)
@@ -20,4 +25,11 @@ export class SessionState {
       language: payload,
     });
   }
+
+  @Action(SessionSetTenantId)
+  sessionSetTenantId({ patchState }: StateContext<Session.State>, { payload }: SessionSetTenantId) {
+    patchState({
+      tenantId: payload,
+    });
+  }
 }
diff --git a/npm/ng-packs/packages/theme-shared/src/lib/handlers/error.handler.ts b/npm/ng-packs/packages/theme-shared/src/lib/handlers/error.handler.ts
index 3291c1b1af..9d1cfb9662 100644
--- a/npm/ng-packs/packages/theme-shared/src/lib/handlers/error.handler.ts
+++ b/npm/ng-packs/packages/theme-shared/src/lib/handlers/error.handler.ts
@@ -14,6 +14,7 @@ import { Observable } from 'rxjs';
 import { ErrorComponent } from '../components/errors/error.component';
 import { Toaster } from '../models/toaster';
 import { ConfirmationService } from '../services/confirmation.service';
+import snq from 'snq';
 
 const DEFAULTS = {
   defaultError: {
@@ -50,7 +51,7 @@ export class ErrorHandler {
   ) {
     actions.pipe(ofActionSuccessful(RestOccurError)).subscribe(res => {
       const { payload: err = {} as HttpErrorResponse | any } = res;
-      const body = (err as HttpErrorResponse).error.error;
+      const body = snq(() => (err as HttpErrorResponse).error.error, DEFAULTS.defaultError.message);
 
       if (err.headers.get('_AbpErrorFormat')) {
         const confirmation$ = this.showError(null, null, body);