@tomei/sso 0.65.0 → 0.66.0

package/package.json

@@ -1,87 +1,90 @@
-{
-  "name": "@tomei/sso",
-  "version": "0.65.0",
-  "description": "Tomei SSO Package",
-  "main": "dist/index.js",
-  "scripts": {
-    "start:dev": "tsc -w",
-    "build": "tsc",
-    "prepare": "husky",
-    "format": "prettier --write \"src/**/*.ts\"",
-    "lint": "npx eslint . --fix",
-    "test": "jest --forceExit --detectOpenHandles --coverage"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+ssh://git@gitlab.com/tomei-package/sso.git"
-  },
-  "keywords": [
-    "tomei",
-    "sso"
-  ],
-  "author": "Tomei",
-  "license": "ISC",
-  "bugs": {
-    "url": "https://gitlab.com/tomei-package/sso/issues"
-  },
-  "homepage": "https://gitlab.com/tomei-package/sso#readme",
-  "devDependencies": {
-    "@commitlint/cli": "^19.8.1",
-    "@commitlint/config-conventional": "^19.8.1",
-    "@eslint/js": "^9.35.0",
-    "@tsconfig/node18": "^18.2.4",
-    "@types/bcrypt": "^6.0.0",
-    "@types/jest": "^30.0.0",
-    "@types/node": "^24.5.2",
-    "@types/validator": "^13.15.3",
-    "@typescript-eslint/eslint-plugin": "^8.44.0",
-    "@typescript-eslint/parser": "^8.44.0",
-    "cls-hooked": "^4.2.2",
-    "dotenv": "^17.2.2",
-    "eslint": "^9.35.0",
-    "eslint-config-prettier": "^10.1.8",
-    "eslint-plugin-import": "^2.32.0",
-    "eslint-plugin-prettier": "^5.5.4",
-    "globals": "^16.4.0",
-    "husky": "^9.1.7",
-    "jest": "^30.1.3",
-    "jest-mock-extended": "^4.0.0",
-    "jest-sonar-reporter": "^2.0.0",
-    "lint-staged": "^16.1.6",
-    "prettier": "^3.6.2",
-    "redis-mock": "^0.56.3",
-    "ts-jest": "^29.4.3",
-    "ts-node": "^10.9.2",
-    "tsc-watch": "^7.1.1",
-    "tsconfig-paths": "^4.2.0",
-    "typescript": "^5.9.2"
-  },
-  "publishConfig": {
-    "access": "public"
-  },
-  "peerDependencies": {
-    "@tomei/activity-history": "^0.4.4",
-    "@tomei/config": "^0.3.22",
-    "@tomei/general": "^0.21.10",
-    "@tomei/mailer": "^0.6.2",
-    "argon2": "^0.44.0",
-    "redis": "^5.8.2",
-    "reflect-metadata": "^0.2.2",
-    "sequelize": "^6.37.7",
-    "sequelize-cli": "^6.6.3",
-    "sequelize-typescript": "^2.1.6",
-    "speakeasy": "^2.0.0",
-    "uuid": "^11.1.0"
-  },
-  "lint-staged": {
-    "*/**/*.{js,ts,tsx}": [
-      "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
-      "eslint \"{src,apps,libs,test}/**/*.ts\" --fix"
-    ]
-  },
-  "jestSonar": {
-    "reportPath": "coverage",
-    "reportFile": "test-report.xml",
-    "indent": 2
-  }
-}
+{
+  "name": "@tomei/sso",
+  "version": "0.66.0",
+  "description": "Tomei SSO Package",
+  "main": "dist/index.js",
+  "scripts": {
+    "start:dev": "tsc -w",
+    "build": "tsc",
+    "prepare": "husky",
+    "format": "prettier --write \"src/**/*.ts\"",
+    "lint": "npx eslint . --fix",
+    "test": "jest --forceExit --detectOpenHandles --coverage"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+ssh://git@gitlab.com/tomei-package/sso.git"
+  },
+  "keywords": [
+    "tomei",
+    "sso"
+  ],
+  "author": "Tomei",
+  "license": "ISC",
+  "bugs": {
+    "url": "https://gitlab.com/tomei-package/sso/issues"
+  },
+  "homepage": "https://gitlab.com/tomei-package/sso#readme",
+  "devDependencies": {
+    "@commitlint/cli": "^19.8.1",
+    "@commitlint/config-conventional": "^19.8.1",
+    "@eslint/js": "^9.35.0",
+    "@tsconfig/node18": "^18.2.4",
+    "@types/bcrypt": "^6.0.0",
+    "@types/jest": "^30.0.0",
+    "@types/node": "^24.5.2",
+    "@types/validator": "^13.15.3",
+    "@typescript-eslint/eslint-plugin": "^8.44.0",
+    "@typescript-eslint/parser": "^8.44.0",
+    "cls-hooked": "^4.2.2",
+    "dotenv": "^17.2.2",
+    "eslint": "^9.35.0",
+    "eslint-config-prettier": "^10.1.8",
+    "eslint-plugin-import": "^2.32.0",
+    "eslint-plugin-prettier": "^5.5.4",
+    "globals": "^16.4.0",
+    "husky": "^9.1.7",
+    "jest": "^30.1.3",
+    "jest-mock-extended": "^4.0.0",
+    "jest-sonar-reporter": "^2.0.0",
+    "lint-staged": "^16.1.6",
+    "prettier": "^3.6.2",
+    "redis-mock": "^0.56.3",
+    "ts-jest": "^29.4.3",
+    "ts-node": "^10.9.2",
+    "tsc-watch": "^7.1.1",
+    "tsconfig-paths": "^4.2.0",
+    "typescript": "^5.9.2"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "peerDependencies": {
+    "@tomei/activity-history": "^0.4.4",
+    "@tomei/config": "^0.3.22",
+    "@tomei/general": "^0.21.10",
+    "@tomei/mailer": "^0.6.2",
+    "argon2": "^0.44.0",
+    "redis": "^5.8.2",
+    "reflect-metadata": "^0.2.2",
+    "sequelize": "^6.37.7",
+    "sequelize-cli": "^6.6.3",
+    "sequelize-typescript": "^2.1.6",
+    "speakeasy": "^2.0.0",
+    "uuid": "^11.1.0"
+  },
+  "lint-staged": {
+    "*/**/*.{js,ts,tsx}": [
+      "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
+      "eslint \"{src,apps,libs,test}/**/*.ts\" --fix"
+    ]
+  },
+  "jestSonar": {
+    "reportPath": "coverage",
+    "reportFile": "test-report.xml",
+    "indent": 2
+  },
+  "dependencies": {
+    "axios": "^1.13.2"
+  }
+}

package/sampledotenv

@@ -1,8 +1,8 @@
-DATABASE_URL=
-SHADOW_DATABASE_URL=
-REDIS_URL=
-REDIS_PASSWORD=
-SMTP_HOST=
-SMTP_PORT=
-EMAIL_SENDER=
+DATABASE_URL=
+SHADOW_DATABASE_URL=
+REDIS_URL=
+REDIS_PASSWORD=
+SMTP_HOST=
+SMTP_PORT=
+EMAIL_SENDER=
 EMAIL_PASSWORD=

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

@@ -12,7 +12,8 @@ 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 = {
@@ -26,20 +27,24 @@ 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: [
-          {
-            model: Staff,
+      const loginApiEndpoint = ComponentConfig.getComponentConfigValue(
+        '@tomei/sso',
+        'loginApiEndpoint',
+      );
+
+      let payload = { UserId: userId };
+
+      const { data } = await axios.post(
+        `${loginApiEndpoint.baseUrl}${loginApiEndpoint.getProfile}`,
+        payload,
+        {
+          headers: {
+            'Content-Type': 'application/json',
+            'x-api-key': loginApiEndpoint.apiKey,
           },
-        ],
-        transaction: dbTransaction,
-      });
+        },
+      );
+      const user = data.loginUser;
 
       if (!user) {
         throw new Error('Invalid credentials.');
@@ -54,21 +59,21 @@ export class LoginUser extends User implements ILoginUser {
           IDType: user?.IdType || null,
           ContactNo: user?.ContactNo || null,
           Email: user.Email,
-          Password: user.Password,
+          Password: null,
           Status: user.Status,
-          DefaultPasswordChangedYN: user.DefaultPasswordChangedYN,
-          FirstLoginAt: user.FirstLoginAt,
-          LastLoginAt: user.LastLoginAt,
-          MFAEnabled: user.MFAEnabled,
-          MFAConfig: user.MFAConfig,
-          MFABypassYN: user.MFABypassYN,
-          RecoveryEmail: user.RecoveryEmail,
-          FailedLoginAttemptCount: user.FailedLoginAttemptCount,
-          LastFailedLoginAt: user.LastFailedLoginAt,
-          LastPasswordChangedAt: user.LastPasswordChangedAt,
-          NeedToChangePasswordYN: user.NeedToChangePasswordYN,
-          PasscodeHash: user.PasscodeHash,
-          PasscodeUpdatedAt: user.PasscodeUpdatedAt,
+          DefaultPasswordChangedYN: null,
+          FirstLoginAt: null,
+          LastLoginAt: null,
+          MFAEnabled: null,
+          MFAConfig: null,
+          MFABypassYN: null,
+          RecoveryEmail: null,
+          FailedLoginAttemptCount: null,
+          LastFailedLoginAt: null,
+          LastPasswordChangedAt: null,
+          NeedToChangePasswordYN: null,
+          PasscodeHash: null,
+          PasscodeUpdatedAt: null,
           CreatedById: user.CreatedById,
           CreatedAt: user.CreatedAt,
           UpdatedById: user.UpdatedById,
@@ -99,21 +104,28 @@ export class LoginUser extends User implements ILoginUser {
         throw new Error('Session name is not set');
       }
 
-      const userSession = await this._SessionService.retrieveUserSession(
-        this.ObjectId,
-        sessionName,
+      const loginApiEndpoint = ComponentConfig.getComponentConfigValue(
+        '@tomei/sso',
+        'loginApiEndpoint',
       );
-
-      const systemLogin = userSession.systemLogins.find(
-        (system) => system.code === systemCode,
+      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,
+          },
+        },
       );
+      const hasPrivilege = data.hasPrivilege;
 
-      if (!systemLogin) {
-        return false;
-      }
-
-      const privileges = systemLogin.privileges;
-      const hasPrivilege = privileges.includes(privilegeName);
       return hasPrivilege;
     } catch (error) {
       throw error;
@@ -131,28 +143,27 @@ export class LoginUser extends User implements ILoginUser {
       if (!sessionName) {
         throw new Error('Session name is not set');
       }
-      const userSession = await this._SessionService.retrieveUserSession(
-        userId,
-        sessionName,
+      const loginApiEndpoint = ComponentConfig.getComponentConfigValue(
+        '@tomei/sso',
+        'loginApiEndpoint',
       );
-
-      if (userSession.systemLogins.length === 0) {
-        throw new Error('Session expired.');
-      }
-
-      const systemLogin = userSession.systemLogins.find(
-        (sl) => sl.code === systemCode,
+      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,
+          },
+        },
       );
-
-      if (!systemLogin) {
-        throw new Error('Session expired.');
-      }
-
-      if (systemLogin.sessionId !== sessionId) {
-        throw new Error('Session expired.');
-      }
-
-      await this._SessionService.refreshDuration(userId, sessionName);
+      const systemLogin = data.systemLogin;
 
       return systemLogin;
     } catch (error) {
@@ -328,36 +339,26 @@ export class LoginUser extends User implements ILoginUser {
       throw new Error('Session name is not set in the configuration');
     }
 
-    const userSession = await this._SessionService.retrieveUserSession(
-      this.ObjectId,
-      sessionName,
+    const loginApiEndpoint = ComponentConfig.getComponentConfigValue(
+      '@tomei/sso',
+      'loginApiEndpoint',
     );
-    const systemLogin = userSession.systemLogins.find(
-      (system) => system.code === systemCode,
-    );
-
-    if (systemLogin) {
-      const privileges = await this.getPrivileges(systemCode, dbTransaction);
-      systemLogin.sessionId = sessionId;
-      systemLogin.privileges = privileges;
-      userSession.systemLogins.map((system) =>
-        system.code === systemCode ? systemLogin : system,
-      );
-    } else {
-      // if not, add new system login into the userSession
-      const newLogin = {
-        id: systemCode,
-        code: systemCode,
-        sessionId: sessionId,
-        privileges: await this.getPrivileges(systemCode, dbTransaction),
-      };
-      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,
-      sessionName,
+    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,
+        },
+      },
     );
   }
 }

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/tsconfig.build.json

@@ -1,6 +1,6 @@
-{
-  "extends": "./tsconfig.json",
-  "include": ["**/*.ts"],
-  "exclude": ["node_modules", "__tests__", "dist", "**/*spec.ts"]
-}
+{
+  "extends": "./tsconfig.json",
+  "include": ["**/*.ts"],
+  "exclude": ["node_modules", "__tests__", "dist", "**/*spec.ts"]
+}
   

package/tsconfig.json

@@ -1,24 +1,24 @@
-{
-  "compilerOptions": {
-    "module": "commonjs",
-    "declaration": true,
-    "removeComments": true,
-    "emitDecoratorMetadata": true,
-    "experimentalDecorators": true,
-    "allowSyntheticDefaultImports": true,
-    "moduleResolution": "node",
-    "target": "es6",
-    "sourceMap": true,
-    "outDir": "./dist",
-    "baseUrl": "./src",
-    "rootDir": "./",
-    "incremental": true,
-    "skipLibCheck": true,
-    "noImplicitAny": false,
-    "strictBindCallApply": false,
-    "forceConsistentCasingInFileNames": false,
-    "noFallthroughCasesInSwitch": false,
-    "strictNullChecks": false,
-  },
-  "exclude": ["node_modules", "dist"]
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "declaration": true,
+    "removeComments": true,
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "allowSyntheticDefaultImports": true,
+    "moduleResolution": "node",
+    "target": "es6",
+    "sourceMap": true,
+    "outDir": "./dist",
+    "baseUrl": "./src",
+    "rootDir": "./",
+    "incremental": true,
+    "skipLibCheck": true,
+    "noImplicitAny": false,
+    "strictBindCallApply": false,
+    "forceConsistentCasingInFileNames": false,
+    "noFallthroughCasesInSwitch": false,
+    "strictNullChecks": false,
+  },
+  "exclude": ["node_modules", "dist"]
 }