@tomei/sso 0.58.9 → 0.58.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tomei/sso",
-  "version": "0.58.9",
+  "version": "0.58.10",
   "description": "Tomei SSO Package",
   "main": "dist/index.js",
   "scripts": {

package/src/components/login-user/login-user.ts

@@ -12,6 +12,7 @@ import { createHash, randomBytes } from 'crypto';
 import { UserGroupRepository } from '../user-group/user-group.repository';
 import GroupSystemAccessModel from '../../models/group-system-access.entity';
 import SystemModel from '../../models/system.entity';
+import { ApplicationConfig } from '@tomei/config';
 
 export class LoginUser extends User implements ILoginUser {
   session = {
@@ -91,8 +92,15 @@ export class LoginUser extends User implements ILoginUser {
         throw new Error('ObjectId(UserId) is not set');
       }
 
+      const sessionName =
+        ApplicationConfig.getComponentConfigValue('sessionName');
+      if (!sessionName) {
+        throw new Error('Session name is not set');
+      }
+
       const userSession = await this._SessionService.retrieveUserSession(
         this.ObjectId,
+        sessionName,
       );
 
       const systemLogin = userSession.systemLogins.find(
@@ -117,8 +125,15 @@ export class LoginUser extends User implements ILoginUser {
     userId: string,
   ): Promise<ISystemLogin> {
     try {
-      const userSession =
-        await this._SessionService.retrieveUserSession(userId);
+      const sessionName =
+        ApplicationConfig.getComponentConfigValue('sessionName');
+      if (!sessionName) {
+        throw new Error('Session name is not set');
+      }
+      const userSession = await this._SessionService.retrieveUserSession(
+        userId,
+        sessionName,
+      );
 
       if (userSession.systemLogins.length === 0) {
         throw new Error('Session expired.');
@@ -136,7 +151,7 @@ export class LoginUser extends User implements ILoginUser {
         throw new Error('Session expired.');
       }
 
-      await this._SessionService.refreshDuration(userId);
+      await this._SessionService.refreshDuration(userId, sessionName);
 
       return systemLogin;
     } catch (error) {
@@ -149,14 +164,26 @@ export class LoginUser extends User implements ILoginUser {
       if (!this.ObjectId) {
         throw new Error('ObjectId(UserId) is not set');
       }
+
+      const sessionName =
+        ApplicationConfig.getComponentConfigValue('sessionName');
+      if (!sessionName) {
+        throw new Error('Session name is not set');
+      }
+
       const userSession = await this._SessionService.retrieveUserSession(
         this.ObjectId,
+        sessionName,
       );
       const index = userSession.systemLogins.findIndex(
         (system) => system.code === systemCode,
       );
       userSession.systemLogins.splice(index, 1);
-      this._SessionService.setUserSession(this.ObjectId, userSession);
+      this._SessionService.setUserSession(
+        this.ObjectId,
+        userSession,
+        sessionName,
+      );
     } catch (error) {
       throw error;
     }

package/src/components/login-user/user.ts

@@ -656,8 +656,16 @@ export class User extends UserBase {
       );
 
       // fetch user session if exists
+      const sessionName =
+        ApplicationConfig.getComponentConfigValue('sessionName');
+
+      if (!sessionName) {
+        throw new Error('Session name is not set in the configuration');
+      }
+
       const userSession = await this._SessionService.retrieveUserSession(
         this.ObjectId,
+        sessionName,
       );
       const systemLogin = userSession.systemLogins.find(
         (system) => system.code === systemCode,
@@ -690,7 +698,11 @@ export class User extends UserBase {
         userSession.systemLogins.push(newLogin);
       }
       // then update userSession inside the redis storage with 1 day duration of time-to-live
-      this._SessionService.setUserSession(this.ObjectId, userSession);
+      this._SessionService.setUserSession(
+        this.ObjectId,
+        userSession,
+        sessionName,
+      );
 
       // record new login history
       await User._LoginHistoryRepository.create(
@@ -810,8 +822,14 @@ export class User extends UserBase {
         throw new Error('ObjectId(UserId) is not set');
       }
 
+      const sessionName =
+        ApplicationConfig.getComponentConfigValue('sessionName');
+      if (!sessionName) {
+        throw new Error('Session name is not set in the configuration');
+      }
       const userSession = await this._SessionService.retrieveUserSession(
         this.ObjectId,
+        sessionName,
       );
 
       const systemLogin = userSession.systemLogins.find(
@@ -1960,8 +1978,19 @@ export class User extends UserBase {
     await user.save({ transaction: dbTransaction });
 
     // 5. Retrieve Session
+    const sessionName =
+      ApplicationConfig.getComponentConfigValue('sessionName');
+
+    if (!sessionName) {
+      throw new ClassError(
+        'LoginUser',
+        'LoginUserErrMsg0X',
+        'Session name is not set in config file',
+      );
+    }
     const userSession = await this._SessionService.retrieveUserSession(
       `${userId}`,
+      sessionName,
     );
 
     if (!systemCode) {
@@ -2021,8 +2050,16 @@ export class User extends UserBase {
     }
 
     // 5. Retrieve Session
+    const sessionName =
+      ApplicationConfig.getComponentConfigValue('sessionName');
+
+    if (!sessionName) {
+      throw new Error('Session name is not set in config file');
+    }
+
     const userSession = await this._SessionService.retrieveUserSession(
       `${userId}`,
+      sessionName,
     );
 
     if (!systemCode) {
@@ -2055,8 +2092,16 @@ export class User extends UserBase {
       }
 
       //Retrieve user session
+      const sessionName =
+        ApplicationConfig.getComponentConfigValue('sessionName');
+
+      if (!sessionName) {
+        throw new Error('Session name is not set in config file');
+      }
+
       const userSession = await this._SessionService.retrieveUserSession(
         `${this.UserId}`,
+        sessionName,
       );
 
       //Retrieve system code

package/src/session/interfaces/session-service.interface.ts

@@ -1,9 +1,21 @@
 import { IUserSession } from '../../interfaces/user-session.interface';
 
 export interface ISessionService {
-  retrieveUserSession(userId: string): Promise<IUserSession>;
-  setUserSession(userId: string, sessionData: IUserSession): Promise<void>;
-  refreshDuration(userId: string): Promise<void>;
+  retrieveUserSession(
+    userId: string,
+    sessionName: string,
+  ): Promise<IUserSession>;
+  setUserSession(
+    userId: string,
+    sessionData: IUserSession,
+    sessionName: string,
+    duration?: number,
+  ): Promise<void>;
+  refreshDuration(
+    userId: string,
+    sessionName: string,
+    duration?: number,
+  ): Promise<void>;
   setAuthorizationCode(
     token: string,
     value: string,

package/src/session/session.service.ts

@@ -22,19 +22,23 @@ export class SessionService implements ISessionService {
   async setUserSession(
     userId: string,
     sessionData: IUserSession,
+    sessionName: string = 'tomei-sid',
     duration: number = 60 * 60, //1 hour
   ): Promise<void> {
     try {
-      const key = `${this.environment}tomei-sid:${userId}`;
+      const key = `${this.environment}${sessionName}:${userId}`;
       await SessionService._RedisService.set(key, sessionData, duration);
     } catch (error) {
       throw error;
     }
   }
 
-  async retrieveUserSession(userId: string): Promise<IUserSession> {
+  async retrieveUserSession(
+    userId: string,
+    sessionName: string = 'tomei-sid',
+  ): Promise<IUserSession> {
     try {
-      const key = `${this.environment}tomei-sid:${userId}`;
+      const key = `${this.environment}${sessionName}:${userId}`;
       const stringData = await SessionService._RedisService.get(key);
       if (!stringData)
         return {
@@ -48,11 +52,12 @@ export class SessionService implements ISessionService {
 
   async refreshDuration(
     userid: string,
+    sessionName: string = 'tomei-sid',
     duration: number = 60 * 60,
   ): Promise<void> {
     try {
-      const userSession = await this.retrieveUserSession(userid);
-      await this.setUserSession(userid, userSession, duration);
+      const userSession = await this.retrieveUserSession(userid, sessionName);
+      await this.setUserSession(userid, userSession, sessionName, duration);
     } catch (error) {
       throw error;
     }