@tomei/sso 0.8.4 → 0.8.6

package/package.json

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

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

@@ -100,12 +100,12 @@ export class LoginUser extends ObjectBase implements IPerson {
           {
             model: Staff,
           },
-          {
-            model: SystemPrivilege,
-            Include: {
-              model: SystemPrivilege,
-            },
-          },
+          // {
+          //   model: SystemPrivilege,
+          //   Include: {
+          //     model: SystemPrivilege,
+          //   },
+          // },
         ],
       });
 
@@ -216,15 +216,19 @@ export class LoginUser extends ObjectBase implements IPerson {
     userId: string,
     systemId: number,
   ): Promise<void> {
-    const systemAccess = await LoginUser._SystemAccessRepository.findOne({
-      where: {
-        userId: userId,
-        systemId: systemId,
-      },
-    });
-
-    if (!systemAccess) {
-      throw new Error("User don't have access to the system.");
+    try {
+      const systemAccess = await LoginUser._SystemAccessRepository.findOne({
+        where: {
+          UserId: userId,
+          SystemId: systemId,
+        },
+      });
+
+      if (!systemAccess) {
+        throw new Error("User don't have access to the system.");
+      }
+    } catch (error) {
+      throw error;
     }
   }
 
@@ -287,7 +291,7 @@ export class LoginUser extends ObjectBase implements IPerson {
     try {
       const system = await LoginUser._SystemRepository.findOne({
         where: {
-          code: systemCode,
+          Code: systemCode,
         },
       });
 
@@ -352,17 +356,17 @@ export class LoginUser extends ObjectBase implements IPerson {
       // Add privileges from the userGroup to the privileges array
       privileges = [
         ...privileges,
-        ...userGroup.groupSystemPrivileges.map((g) => g.systemPrivilege.code),
-        ...userGroup.groupRolePrivileges.map((g) => g.systemPrivilege.code),
+        ...userGroup.GroupSystemPrivileges.map((g) => g.SystemPrivilege.Code),
+        ...userGroup.GroupRolePrivileges.map((g) => g.SystemPrivilege.Code),
       ];
 
       // Recursive call if conditions are not met and ParentGroupCode exists
       const isContinue =
-        userGroup.groupLevel !== 0 &&
-        userGroup.allowInheritFromParentYN === 'Y';
+        userGroup.GroupLevel !== 0 &&
+        userGroup.AllowInheritFromParentYN === 'Y';
       if (isContinue) {
         const recursivePrivileges = await this.getPrivilegesFromUserGroup(
-          userGroup.parentGroupCode,
+          userGroup.ParentGroupCode,
         );
         privileges = privileges.concat(recursivePrivileges);
       }
@@ -378,7 +382,7 @@ export class LoginUser extends ObjectBase implements IPerson {
     try {
       const userGroup = await LoginUser._UserGroupRepository.findOne({
         where: {
-          groupCode: groupCode,
+          GroupCode: groupCode,
         },
         include: [
           {
@@ -405,8 +409,8 @@ export class LoginUser extends ObjectBase implements IPerson {
     try {
       return await LoginUser._UserUserGroupRepository.findAll({
         where: {
-          userId: this.ObjectId,
-          systemId: systemCode,
+          UserId: this.ObjectId,
+          SystemId: systemCode,
         },
         include: {
           model: UserGroup,
@@ -463,25 +467,29 @@ export class LoginUser extends ObjectBase implements IPerson {
     systemCode: string,
     privilegeName: string,
   ): Promise<boolean> {
-    if (!this.ObjectId) {
-      throw new Error('ObjectId(UserId) is not set');
-    }
+    try {
+      if (!this.ObjectId) {
+        throw new Error('ObjectId(UserId) is not set');
+      }
 
-    const userSession = await this._SessionService.retrieveUserSession(
-      this.ObjectId,
-    );
+      const userSession = await this._SessionService.retrieveUserSession(
+        this.ObjectId,
+      );
 
-    const systemLogin = userSession.systemLogins.find(
-      (system) => system.code === systemCode,
-    );
+      const systemLogin = userSession.systemLogins.find(
+        (system) => system.code === systemCode,
+      );
 
-    if (!systemLogin) {
-      return false;
-    }
+      if (!systemLogin) {
+        return false;
+      }
 
-    const privileges = systemLogin.privileges;
-    const hasPrivilege = privileges.includes(privilegeName);
-    return hasPrivilege;
+      const privileges = systemLogin.privileges;
+      const hasPrivilege = privileges.includes(privilegeName);
+      return hasPrivilege;
+    } catch (error) {
+      throw error;
+    }
   }
 
   async checkSession(

package/src/models/user-group.entity.ts

@@ -36,7 +36,7 @@ export default class UserGroup extends Model {
   @ForeignKey(() => Department)
   @Column({
     type: DataType.STRING,
-    field: 'password',
+    field: 'DepartmentId',
   })
   DepartmentId: string;
 

package/src/models/user-role.entity.ts

@@ -8,6 +8,7 @@ import {
   UpdatedAt,
 } from 'sequelize-typescript';
 import User from './user.entity';
+import Role from './role.entity';
 
 @Table({
   tableName: 'sso_user_roles',
@@ -17,6 +18,7 @@ import User from './user.entity';
   underscored: true,
 })
 export default class UserRole extends Model {
+  @ForeignKey(() => User)
   @Column({
     primaryKey: true,
     type: DataType.INTEGER,
@@ -25,6 +27,7 @@ export default class UserRole extends Model {
   })
   UserId: number;
 
+  @ForeignKey(() => Role)
   @Column({
     primaryKey: true,
     type: DataType.INTEGER,
@@ -47,4 +50,10 @@ export default class UserRole extends Model {
 
   @BelongsTo(() => User)
   User: User;
+
+  @BelongsTo(() => Role)
+  Role: Role;
+
+  @BelongsTo(() => User, 'updated_by_id')
+  UpdatedBy: User;
 }

package/src/models/user-system-privileges.entity.ts

@@ -24,6 +24,7 @@ export default class UserSystemPrivileges extends Model {
     primaryKey: true,
     allowNull: false,
     type: DataType.INTEGER,
+    field: 'UserId',
   })
   UserId: number;