From b1c30fdcd15e6b9471d44fcbd2cb65290566ab60 Mon Sep 17 00:00:00 2001
From: TheDiaval <thediavall@gmail.com>
Date: Fri, 2 Aug 2019 17:28:46 +0300
Subject: [PATCH] fix(core): store tenant instead of tenant id

---
 .../core/src/lib/actions/session.actions.ts        |  8 +++++---
 .../packages/core/src/lib/models/session.ts        |  4 +++-
 .../packages/core/src/lib/states/session.state.ts  | 14 +++++++-------
 3 files changed, 15 insertions(+), 11 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 278fb59f4e..61a69b00fc 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
@@ -1,8 +1,10 @@
+import { ABP } from '../models';
+
 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) {}
+export class SessionSetTenant {
+  static readonly type = '[Session] Set Tenant';
+  constructor(public payload: ABP.BasicItem) {}
 }
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 44392b2692..8eba0cb36c 100644
--- a/npm/ng-packs/packages/core/src/lib/models/session.ts
+++ b/npm/ng-packs/packages/core/src/lib/models/session.ts
@@ -1,6 +1,8 @@
+import { ABP } from '../models';
+
 export namespace Session {
   export interface State {
     language: string;
-    tenantId: string;
+    tenant: ABP.BasicItem;
   }
 }
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 8008084371..f009f7a574 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,6 +1,6 @@
 import { Action, Selector, State, StateContext } from '@ngxs/store';
-import { SessionSetLanguage, SessionSetTenantId } from '../actions/session.actions';
-import { Session } from '../models/session';
+import { SessionSetLanguage, SessionSetTenant } from '../actions/session.actions';
+import { ABP, Session } from '../models';
 
 @State<Session.State>({
   name: 'SessionState',
@@ -13,8 +13,8 @@ export class SessionState {
   }
 
   @Selector()
-  static getSelectedTenantId({ tenantId }: Session.State): string {
-    return tenantId;
+  static getTenant({ tenant }: Session.State): ABP.BasicItem {
+    return tenant;
   }
 
   constructor() {}
@@ -26,10 +26,10 @@ export class SessionState {
     });
   }
 
-  @Action(SessionSetTenantId)
-  sessionSetTenantId({ patchState }: StateContext<Session.State>, { payload }: SessionSetTenantId) {
+  @Action(SessionSetTenant)
+  sessionSetTenantId({ patchState }: StateContext<Session.State>, { payload }: SessionSetTenant) {
     patchState({
-      tenantId: payload,
+      tenant: payload,
     });
   }
 }