@tomei/sso 0.39.2 → 0.39.4

package/package.json

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

package/src/components/api-key/api-key.repository.ts

@@ -1,5 +1,5 @@
 import { RepositoryBase, IRepositoryBase } from '@tomei/general';
-import APIKeyModel from 'models/api-key-entity';
+import APIKeyModel from '../../models/api-key-entity';
 
 export class APIKeyRepository
   extends RepositoryBase<APIKeyModel>

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

@@ -910,22 +910,25 @@ export class User extends UserBase {
         transaction: dbTransaction,
       });
 
+      const gp = group?.GroupPrivileges || [];
+      const op = objectPrivileges || [];
+
       let privileges: string[] = [];
       // Add privileges from the group to the privileges array
       const groupPrivileges: string[] = [];
-      for (const groupPrivilege of group.GroupPrivileges) {
+      for (const groupPrivilege of gp) {
         groupPrivileges.push(groupPrivilege.Privilege.PrivilegeCode);
       }
 
       const ops: string[] = [];
-      for (const objectPrivilege of objectPrivileges) {
+      for (const objectPrivilege of op) {
         ops.push(objectPrivilege.Privilege.PrivilegeCode);
       }
 
       privileges = [...privileges, ...groupPrivileges, ...ops];
 
       // Recursive call if not root and allow inherit privileges from parent group
-      if (group.ParentGroupCode && group.InheritParentPrivilegeYN === 'Y') {
+      if (group?.ParentGroupCode && group?.InheritParentPrivilegeYN === 'Y') {
         const parentGroupPrivileges = await this.getInheritedPrivileges(
           group.ParentGroupCode,
           systemCode,
@@ -945,20 +948,21 @@ export class User extends UserBase {
     dbTransaction?: any,
   ): Promise<string[]> {
     try {
-      const userPrivileges = await User._UserPrivilegeRepo.findAll({
-        where: {
-          UserId: this.UserId,
-          Status: 'Active',
-        },
-        include: {
-          model: SystemPrivilege,
+      const userPrivileges =
+        (await User._UserPrivilegeRepo.findAll({
           where: {
-            SystemCode: systemCode,
+            UserId: this.UserId,
             Status: 'Active',
           },
-        },
-        transaction: dbTransaction,
-      });
+          include: {
+            model: SystemPrivilege,
+            where: {
+              SystemCode: systemCode,
+              Status: 'Active',
+            },
+          },
+          transaction: dbTransaction,
+        })) || [];
 
       const privileges: string[] = userPrivileges.map(
         (u) => u.Privilege.PrivilegeCode,
@@ -974,19 +978,20 @@ export class User extends UserBase {
     dbTransaction?: any,
   ): Promise<string[]> {
     try {
-      const userObjectPrivileges = await User._UserObjectPrivilegeRepo.findAll({
-        where: {
-          UserId: this.UserId,
-        },
-        include: {
-          model: SystemPrivilege,
+      const userObjectPrivileges =
+        (await User._UserObjectPrivilegeRepo.findAll({
           where: {
-            SystemCode: systemCode,
-            Status: 'Active',
+            UserId: this.UserId,
           },
-        },
-        transaction: dbTransaction,
-      });
+          include: {
+            model: SystemPrivilege,
+            where: {
+              SystemCode: systemCode,
+              Status: 'Active',
+            },
+          },
+          transaction: dbTransaction,
+        })) || [];
 
       const privilegesCodes: string[] = userObjectPrivileges.map(
         (u) => u.Privilege.PrivilegeCode,