@tomei/sso 0.39.1 → 0.39.3

package/package.json

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

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

@@ -17,7 +17,7 @@ export class APIKey extends ObjectBase {
   Name: string;
   Description: string;
   Status: APIKeyStatusEnum;
-  ExperationDate: Date;
+  ExpirationDate: Date;
   _InvokedById: number;
   _InvokedAt: Date;
   _CreatedAt: Date;
@@ -57,7 +57,7 @@ export class APIKey extends ObjectBase {
       this.Name = apiKeyAttr.Name;
       this.Description = apiKeyAttr.Description;
       this.Status = apiKeyAttr.Status;
-      this.ExperationDate = apiKeyAttr.ExperationDate;
+      this.ExpirationDate = apiKeyAttr.ExpirationDate;
       this._InvokedById = apiKeyAttr.InvokedById;
       this._InvokedAt = apiKeyAttr.InvokedAt;
       this._CreatedAt = apiKeyAttr.CreatedAt;
@@ -132,7 +132,7 @@ export class APIKey extends ObjectBase {
         ApiKey: this.ApiKey,
         Name: this.Name,
         Status: this.Status,
-        ExpirationDate: this.ExperationDate,
+        ExpirationDate: this.ExpirationDate,
         CreatedAt: this.CreatedAt,
         CreatedById: this.CreatedById,
         InvokedAt: this.InvokedAt,
@@ -183,7 +183,7 @@ export class APIKey extends ObjectBase {
         ApiKey: this.ApiKey,
         Name: this.Name,
         Status: this.Status,
-        ExpirationDate: this.ExperationDate,
+        ExpirationDate: this.ExpirationDate,
         CreatedAt: this.CreatedAt,
         CreatedById: this.CreatedById,
         InvokedAt: this.InvokedAt,

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,

package/src/index.ts

@@ -3,4 +3,5 @@ export * from './components';
 export * from './interfaces';
 export * from './redis-client';
 export * from './session';
+export * from './enum';
 export * as ssoDb from './database';

package/src/interfaces/api-key-attr.interface.ts

@@ -6,7 +6,7 @@ export interface IAPIKeyAttr {
   Name: string;
   Description: string;
   Status: APIKeyStatusEnum;
-  ExperationDate: Date;
+  ExpirationDate: Date;
   CreatedById: number;
   InvokedById: number;
   CreatedAt: Date;

package/src/models/api-key-entity.ts

@@ -54,7 +54,7 @@ export default class APIKeyModel extends Model {
     type: DataType.DATE,
     allowNull: true,
   })
-  ExperationDate: Date;
+  ExpirationDate: Date;
 
   @ForeignKey(() => User)
   @Column({