@tomei/sso 0.66.1-test.2 → 0.66.1-test.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tomei/sso",
-  "version": "0.66.1-test.2",
+  "version": "0.66.1-test.4",
   "description": "Tomei SSO Package",
   "main": "dist/index.js",
   "scripts": {
@@ -65,6 +65,7 @@
     "@tomei/general": "^0.21.10",
     "@tomei/mailer": "^0.6.2",
     "argon2": "^0.44.0",
+    "axios": "^1.13.2",
     "redis": "^5.8.2",
     "reflect-metadata": "^0.2.2",
     "sequelize": "^6.37.7",

package/src/components/login-user/interfaces/user-info.interface.ts

@@ -9,6 +9,7 @@ export interface IUserInfo {
   ContactNo: string;
   UserName: string;
   UserId?: number;
+  V1Id?: number;
   Password: string;
   staffs?: any;
 }

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

@@ -12,13 +12,27 @@ import { createHash, randomBytes, randomUUID } 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';
+import { ApplicationConfig, ComponentConfig } from '@tomei/config';
+import axios from 'axios';
 
 export class LoginUser extends User implements ILoginUser {
   session = {
     Id: null,
   };
 
+  private static isLoginApiEnabled(): boolean {
+    try {
+      const useLoginApiYN =
+        ComponentConfig.getComponentConfigValue(
+          '@tomei/sso',
+          'useLoginApiYN',
+        ) || 'Y';
+      return String(useLoginApiYN).toUpperCase() !== 'N';
+    } catch (error) {
+      return true;
+    }
+  }
+
   static async init(
     sessionService: ISessionService,
     userId?: number,
@@ -26,20 +40,43 @@ export class LoginUser extends User implements ILoginUser {
   ): Promise<LoginUser> {
     User._RedisService = await RedisService.init();
     if (userId) {
-      if (dbTransaction) {
-        User._Repository = new UserRepository();
-      }
-      const user = await User._Repository.findOne({
-        where: {
-          UserId: userId,
-        },
-        include: [
+      let user: any;
+
+      if (LoginUser.isLoginApiEnabled()) {
+        const loginApiEndpoint = ComponentConfig.getComponentConfigValue(
+          '@tomei/sso',
+          'loginApiEndpoint',
+        );
+
+        let payload = { UserId: userId };
+
+        const { data } = await axios.post(
+          `${loginApiEndpoint.baseUrl}${loginApiEndpoint.getProfile}`,
+          payload,
           {
-            model: Staff,
+            headers: {
+              'Content-Type': 'application/json',
+              'x-api-key': loginApiEndpoint.apiKey,
+            },
           },
-        ],
-        transaction: dbTransaction,
-      });
+        );
+        user = data.loginUser;
+      } else {
+        if (dbTransaction) {
+          User._Repository = new UserRepository();
+        }
+        user = await User._Repository.findOne({
+          where: {
+            UserId: userId,
+          },
+          include: [
+            {
+              model: Staff,
+            },
+          ],
+          transaction: dbTransaction,
+        });
+      }
 
       if (!user) {
         throw new Error('Invalid credentials.');
@@ -99,6 +136,30 @@ export class LoginUser extends User implements ILoginUser {
         throw new Error('Session name is not set');
       }
 
+      if (LoginUser.isLoginApiEnabled()) {
+        const loginApiEndpoint = ComponentConfig.getComponentConfigValue(
+          '@tomei/sso',
+          'loginApiEndpoint',
+        );
+        let payload = {
+          SystemCode: systemCode,
+          SessionName: sessionName,
+          PrivilegeName: privilegeName,
+          UserId: this.ObjectId,
+        };
+        const { data } = await axios.post(
+          `${loginApiEndpoint.baseUrl}${loginApiEndpoint.checkPrivileges}`,
+          payload,
+          {
+            headers: {
+              'Content-Type': 'application/json',
+              'x-api-key': loginApiEndpoint.apiKey,
+            },
+          },
+        );
+        return data.hasPrivilege;
+      }
+
       const userSession = await this._SessionService.retrieveUserSession(
         this.ObjectId,
         sessionName,
@@ -113,8 +174,7 @@ export class LoginUser extends User implements ILoginUser {
       }
 
       const privileges = systemLogin.privileges;
-      const hasPrivilege = privileges.includes(privilegeName);
-      return hasPrivilege;
+      return privileges.includes(privilegeName);
     } catch (error) {
       throw error;
     }
@@ -131,6 +191,31 @@ export class LoginUser extends User implements ILoginUser {
       if (!sessionName) {
         throw new Error('Session name is not set');
       }
+
+      if (LoginUser.isLoginApiEnabled()) {
+        const loginApiEndpoint = ComponentConfig.getComponentConfigValue(
+          '@tomei/sso',
+          'loginApiEndpoint',
+        );
+        let payload = {
+          SystemCode: systemCode,
+          SessionName: sessionName,
+          SessionId: sessionId,
+          UserId: userId,
+        };
+        const { data } = await axios.post(
+          `${loginApiEndpoint.baseUrl}${loginApiEndpoint.checkSession}`,
+          payload,
+          {
+            headers: {
+              'Content-Type': 'application/json',
+              'x-api-key': loginApiEndpoint.apiKey,
+            },
+          },
+        );
+        return data.systemLogin;
+      }
+
       const userSession = await this._SessionService.retrieveUserSession(
         userId,
         sessionName,
@@ -328,6 +413,31 @@ export class LoginUser extends User implements ILoginUser {
       throw new Error('Session name is not set in the configuration');
     }
 
+    if (LoginUser.isLoginApiEnabled()) {
+      const loginApiEndpoint = ComponentConfig.getComponentConfigValue(
+        '@tomei/sso',
+        'loginApiEndpoint',
+      );
+      let payload = {
+        SystemCode: systemCode,
+        SessionName: sessionName,
+        SessionId: sessionId,
+        UserId: this.ObjectId,
+      };
+
+      await axios.post(
+        `${loginApiEndpoint.baseUrl}${loginApiEndpoint.setSession}`,
+        payload,
+        {
+          headers: {
+            'Content-Type': 'application/json',
+            'x-api-key': loginApiEndpoint.apiKey,
+          },
+        },
+      );
+      return;
+    }
+
     const userSession = await this._SessionService.retrieveUserSession(
       this.ObjectId,
       sessionName,
@@ -344,7 +454,6 @@ export class LoginUser extends User implements ILoginUser {
         system.code === systemCode ? systemLogin : system,
       );
     } else {
-      // if not, add new system login into the userSession
       const newLogin = {
         id: systemCode,
         code: systemCode,
@@ -353,7 +462,6 @@ export class LoginUser extends User implements ILoginUser {
       };
       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,

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

@@ -40,6 +40,7 @@ import { UserPasswordHistory } from '../user-password-history/user-password-hist
 
 export class User extends UserBase {
   ObjectId: string;
+  V1Id: number;
   Email: string;
   private _UserName: string;
   private _Password: string;
@@ -291,6 +292,7 @@ export class User extends UserBase {
     // set all the class properties
     if (userInfo) {
       this.UserId = userInfo.UserId;
+      this.V1Id = userInfo.V1Id;
       this.UserName = userInfo.UserName;
       this.FullName = userInfo.FullName;
       this.IDNo = userInfo.IDNo;
@@ -3071,6 +3073,11 @@ export class User extends UserBase {
         return { expired: false, expiringSoon: false, expiresInDays: null };
       }
 
+      // Accounts authenticated without a local password cannot rotate one here.
+      if (!this.Password) {
+        return { expired: false, expiringSoon: false, expiresInDays: null };
+      }
+
       // Forces first-login change for temp-password/admin-created accounts (AC#4), regardless of password age.
       if (this.NeedToChangePasswordYN === YN.Yes) {
         return { expired: true, expiringSoon: false, expiresInDays: null };
@@ -3092,14 +3099,19 @@ export class User extends UserBase {
       }
 
       const createdAt = latestHistory.CreatedAt;
+      const expiryMonth = createdAt.getUTCMonth() + expiryMonths;
+      const lastDayOfExpiryMonth = new Date(
+        Date.UTC(createdAt.getUTCFullYear(), expiryMonth + 1, 0),
+      ).getUTCDate();
       const expiryDate = new Date(
         Date.UTC(
           createdAt.getUTCFullYear(),
-          createdAt.getUTCMonth() + expiryMonths,
-          createdAt.getUTCDate(),
+          expiryMonth,
+          Math.min(createdAt.getUTCDate(), lastDayOfExpiryMonth),
           createdAt.getUTCHours(),
           createdAt.getUTCMinutes(),
           createdAt.getUTCSeconds(),
+          createdAt.getUTCMilliseconds(),
         ),
       );
 

package/src/components/system/system.ts

@@ -10,6 +10,7 @@ import { v4 as uuidv4 } from 'uuid';
 
 export class System extends ObjectBase {
   ObjectId: string;
+  V1Id: number;
   ObjectName: string;
   TableName = 'sso_System';
   ObjectType = 'System';
@@ -49,6 +50,7 @@ export class System extends ObjectBase {
   private constructor(systemAttr?: ISystemAttr) {
     super();
     if (systemAttr) {
+      this.V1Id = systemAttr.V1Id;
       this.SystemCode = systemAttr.SystemCode;
       this.Name = systemAttr.Name;
       this.Description = systemAttr?.Description;

package/src/components/system-privilege/system-privilege.ts

@@ -13,6 +13,7 @@ export class SystemPrivilege extends ObjectBase {
   ObjectType = 'SystemPrivilege';
   TableName = 'sso_SystemPrivilege';
   ObjectId: string;
+  V1Id: string;
   PrivilegeCode: string;
   SystemCode: string;
   ObjectName: string;
@@ -53,6 +54,7 @@ export class SystemPrivilege extends ObjectBase {
   private constructor(systemPrivilegeAttr?: ISystemPrivilegeAttr) {
     super();
     if (systemPrivilegeAttr) {
+      this.V1Id = systemPrivilegeAttr.V1Id;
       this.SystemPrivilegeId = systemPrivilegeAttr.SystemPrivilegeId;
       this.PrivilegeCode = systemPrivilegeAttr.PrivilegeCode;
       this.SystemCode = systemPrivilegeAttr.SystemCode;
@@ -66,6 +68,7 @@ export class SystemPrivilege extends ObjectBase {
   }
 
   setAttributes(systemPrivilegeAttr: ISystemPrivilegeAttr) {
+    this.V1Id = systemPrivilegeAttr.V1Id;
     this.PrivilegeCode = systemPrivilegeAttr.PrivilegeCode;
     this.SystemPrivilegeId = systemPrivilegeAttr.SystemPrivilegeId;
     this.SystemCode = systemPrivilegeAttr.SystemCode;

package/src/index.ts

@@ -6,3 +6,4 @@ export * from './session';
 export * from './enum';
 export * as ssoDb from './database';
 export * from './types';
+export * from './models/user.entity';

package/src/interfaces/system-privilege.interface.ts

@@ -1,4 +1,5 @@
 export interface ISystemPrivilegeAttr {
+  V1Id?: string;
   SystemPrivilegeId: string;
   PrivilegeCode: string;
   SystemCode: string;

package/src/interfaces/system.interface.ts

@@ -1,4 +1,5 @@
 export interface ISystemAttr {
+  V1Id?: number;
   SystemCode: string;
   Name: string;
   Description: string;

package/src/models/group.entity.ts

@@ -24,6 +24,12 @@ import GroupReportingUserModel from './group-reporting-user.entity';
   updatedAt: 'UpdatedAt',
 })
 export default class GroupModel extends Model {
+  @Column({
+    allowNull: true,
+    type: DataType.INTEGER,
+  })
+  V1Id: number;
+
   @Column({
     primaryKey: true,
     allowNull: false,
@@ -74,7 +80,7 @@ export default class GroupModel extends Model {
 
   @Column({
     allowNull: false,
-    type: DataType.STRING(10),
+    type: DataType.STRING(100),
   })
   Path: string;
 

package/src/models/system-privilege.entity.ts

@@ -76,6 +76,12 @@ export default class SystemPrivilegeModel extends Model {
   @UpdatedAt
   UpdatedAt: Date;
 
+  @Column({
+    allowNull: true,
+    type: DataType.STRING(30),
+  })
+  V1Id: string;
+
   @BelongsTo(() => System)
   System: System;
 

package/src/models/system.entity.ts

@@ -96,6 +96,12 @@ export default class SystemModel extends Model {
   @UpdatedAt
   UpdatedAt: Date;
 
+  @Column({
+    allowNull: true,
+    type: DataType.INTEGER,
+  })
+  V1Id: number;
+
   @BelongsTo(() => User, 'CreatedById')
   CreatedByUser: User;
 

package/src/models/user.entity.ts

@@ -171,6 +171,12 @@ export default class User extends Model {
   @UpdatedAt
   UpdatedAt: Date;
 
+  @Column({
+    allowNull: true,
+    type: DataType.INTEGER,
+  })
+  V1Id: number;
+
   @HasOne(() => Staff, 'UserId')
   Staff: Staff;