@tomei/sso 0.2.8 → 0.4.0

package/index.ts

@@ -1 +1 @@
-export * from "./src"
+export * from "./src"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tomei/sso",
-  "version": "0.2.8",
+  "version": "0.4.0",
   "description": "Tomei SSO Package",
   "main": "dist/index.js",
   "scripts": {
@@ -41,6 +41,7 @@
     "husky": "^8.0.3",
     "jest": "^29.5.0",
     "jest-mock-extended": "^3.0.4",
+    "lint-staged": "^13.2.2",
     "prettier": "^2.7.1",
     "prisma": "^4.14.0",
     "redis-mock": "^0.56.3",
@@ -58,12 +59,16 @@
     "@prisma/client": "^4.14.1",
     "@tomei/general": "^0.1.0",
     "@types/jest": "^29.5.2",
+    "argon2": "^0.30.3",
     "cls-hooked": "^4.2.2",
     "nodemailer": "^6.9.3",
     "prismock": "^1.14.0",
     "redis": "^4.6.7"
   },
-  "dependencies": {
-    "argon2": "^0.30.3"
+  "lint-staged": {
+    "*/**/*.{js,ts,tsx}": [
+      "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
+      "eslint \"{src,apps,libs,test}/**/*.ts\" --fix"
+    ]
   }
 }

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

@@ -134,78 +134,82 @@ export class LoginUser extends ObjectBase implements IPerson {
     password: string,
     ipAddress: string,
   ): Promise<string> {
-    //validate email
-    if (this.Email !== email) {
-      throw new Error('Invalid credentials.');
-    }
+    try {
+      //validate email
+      if (this.Email !== email) {
+        throw new Error('Invalid credentials.');
+      }
 
-    //validate password
-    const isPasswordValid = await this._PasswordHashService.verify(
-      password,
-      this.Password,
-    );
+      //validate password
+      const isPasswordValid = await this._PasswordHashService.verify(
+        password,
+        this.Password,
+      );
 
-    if (!isPasswordValid) {
-      throw new Error('Invalid credentials.');
-    }
+      if (!isPasswordValid) {
+        throw new Error('Invalid credentials.');
+      }
 
-    //validate system code
-    const system = await LoginUser._SystemRepository.findOne({
-      where: {
-        code: systemCode,
-      },
-    });
+      //validate system code
+      const system = await LoginUser._SystemRepository.findOne({
+        where: {
+          code: systemCode,
+        },
+      });
 
-    if (!system) {
-      throw new Error('Invalid system code.');
-    }
+      if (!system) {
+        throw new Error('Invalid system code.');
+      }
+
+      //validate system access
+      await this.checkSystemAccess(this.ObjectId, system.id);
+      // alert user if new login
+      await this.alertNewLogin(this.ObjectId, system.id, ipAddress);
 
-    //validate system access
-    await this.checkSystemAccess(this.ObjectId, system.id);
-    // alert user if new login
-    await this.alertNewLogin(this.ObjectId, system.id, ipAddress);
-
-    // fetch user session if exists
-    const userSession = await this._SessionService.retrieveUserSession(
-      this.ObjectId,
-    );
-    let systemLogin = userSession.systemLogins.find(
-      (system) => system.code === systemCode,
-    );
-
-    // generate new session id
-    const { randomUUID } = require('crypto');
-    const sessionId = randomUUID();
-
-    if (systemLogin) {
-      systemLogin = systemLogin.sessionId = sessionId;
-      userSession.systemLogins.map((system) =>
-        system.code === systemCode ? systemLogin : system,
+      // fetch user session if exists
+      const userSession = await this._SessionService.retrieveUserSession(
+        this.ObjectId,
       );
-    } else {
-      // if not, add new system login into the userSession
-      const newLogin = {
-        id: system.id.toString(),
-        code: system.code,
-        sessionId: sessionId,
-        privileges: await this.getPrivileges(system.code),
-      };
-      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);
-
-    // record new login history
-    await LoginUser._LoginHistoryRepository.create({
-      data: {
-        userId: this.ObjectId,
-        systemId: system.id,
-        originIp: ipAddress,
-        createdAt: new Date(),
-      },
-    });
+      let systemLogin = userSession.systemLogins.find(
+        (system) => system.code === systemCode,
+      );
+
+      // generate new session id
+      const { randomUUID } = require('crypto');
+      const sessionId = randomUUID();
+
+      if (systemLogin) {
+        systemLogin = systemLogin.sessionId = sessionId;
+        userSession.systemLogins.map((system) =>
+          system.code === systemCode ? systemLogin : system,
+        );
+      } else {
+        // if not, add new system login into the userSession
+        const newLogin = {
+          id: system.id.toString(),
+          code: system.code,
+          sessionId: sessionId,
+          privileges: await this.getPrivileges(system.code),
+        };
+        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);
 
-    return sessionId;
+      // record new login history
+      await LoginUser._LoginHistoryRepository.create({
+        data: {
+          userId: this.ObjectId,
+          systemId: system.id,
+          originIp: ipAddress,
+          createdAt: new Date(),
+        },
+      });
+
+      return sessionId;
+    } catch (error) {
+      throw error;
+    }
   }
 
   private async checkSystemAccess(
@@ -252,7 +256,7 @@ export class LoginUser extends ObjectBase implements IPerson {
     }
   }
 
-  async getPrivileges(systemCode: string): Promise<string[]> {
+  private async getPrivileges(systemCode: string): Promise<string[]> {
     try {
       const system = await LoginUser._SystemRepository.findOne({
         where: {
@@ -263,12 +267,12 @@ export class LoginUser extends ObjectBase implements IPerson {
       if (!system) {
         throw new Error('Invalid system code.');
       }
+
       // retrive user userGroups with system privileges
       const userUserGroups = await this.getUserUserGroupFromDB(system.id);
 
       // get all userGroup data from user userGroups
       const userGroupData = userUserGroups.map((u) => u.userGroup);
-
       // get all privileges from userGroup data
       let privileges: string[] = [];
       for (const userGroup of userGroupData) {
@@ -286,7 +290,7 @@ export class LoginUser extends ObjectBase implements IPerson {
         ) {
           // get all parent tree privileges
           const parentTreePrivileges = await this.getPrivilegesFromUserGroup(
-            userGroup.parentCode,
+            userGroup.parentGroupCode,
           );
 
           privileges = [...privileges, ...parentTreePrivileges];
@@ -417,8 +421,8 @@ export class LoginUser extends ObjectBase implements IPerson {
         (u) => u.systemPrivilege,
       );
 
-      userSystemPrivileges = userRole.userSystemPrivileges.filter(
-        (u) => u.systemPrivilege.systemId === systemId,
+      userSystemPrivileges = userSystemPrivileges.filter(
+        (u) => u.systemId === systemId,
       );
 
       const userPrivileges: string[] = userSystemPrivileges.map((u) => u.code);