@tomei/sso 0.37.3 → 0.38.0

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

@@ -104,64 +104,6 @@ export class LoginUser extends User implements ILoginUser {
     }
   }
 
-  // private async checkSystemAccess(
-  //   userId: number,
-  //   systemCode: string,
-  //   dbTransaction?: any,
-  // ): Promise<void> {
-  //   try {
-  //     let isUserHaveAccess = false;
-
-  //     const systemAccess = await User._UserSystemAccessRepo.findOne({
-  //       where: {
-  //         UserId: userId,
-  //         SystemCode: systemCode,
-  //         Status: 'Active',
-  //       },
-  //       dbTransaction,
-  //     });
-
-  //     if (systemAccess) {
-  //       isUserHaveAccess = true;
-  //     } else {
-  //       const userGroups = await User._UserGroupRepo.findAll({
-  //         where: {
-  //           UserId: userId,
-  //           InheritGroupAccessYN: 'Y',
-  //           Status: 'Active',
-  //         },
-  //         include: [
-  //           {
-  //             model: GroupModel,
-  //           },
-  //         ],
-  //         dbTransaction,
-  //       });
-
-  //       for (const usergroup of userGroups) {
-  //         const group = usergroup.Group;
-  //         const groupSystemAccess = await User.getInheritedSystemAccess(
-  //           dbTransaction,
-  //           group,
-  //         );
-
-  //         for (const system of groupSystemAccess) {
-  //           if (system.SystemCode === systemCode) {
-  //             isUserHaveAccess = true;
-  //             break;
-  //           }
-  //         }
-  //       }
-  //     }
-
-  //     if (!isUserHaveAccess) {
-  //       throw new Error("User don't have access to the system.");
-  //     }
-  //   } catch (error) {
-  //     throw error;
-  //   }
-  // }
-
   async checkSession(
     systemCode: string,
     sessionId: string,

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

@@ -6,8 +6,6 @@ import { SystemRepository } from '../system/system.repository';
 import { LoginHistoryRepository } from '../login-history/login-history.repository';
 import { PasswordHashService } from '../password-hash/password-hash.service';
 import { UserGroupRepository } from '../user-group/user-group.repository';
-import { SMTPMailer } from '@tomei/mailer';
-import { ISystemLogin } from '../../../src/interfaces/system-login.interface';
 import Staff from '../../models/staff.entity';
 import SystemPrivilege from '../../models/system-privilege.entity';
 import LoginHistory from '../../models/login-history.entity';
@@ -1380,7 +1378,7 @@ export class User extends UserBase {
       //Part 5: Record Create User Activity
       const activity = new Activity();
       activity.ActivityId = activity.createId();
-      activity.Action = ActionEnum.ADD;
+      activity.Action = ActionEnum.CREATE;
       activity.Description = 'Create User';
       activity.EntityType = 'LoginUser';
       activity.EntityId = newUser.UserId.toString();
@@ -1938,7 +1936,7 @@ export class User extends UserBase {
     //4. Record Create UserGroup Activity
     const activity = new Activity();
     activity.ActivityId = activity.createId();
-    activity.Action = ActionEnum.ADD;
+    activity.Action = ActionEnum.CREATE;
     activity.Description = 'Add User Group';
     activity.EntityType = 'UserGroup';
     activity.EntityId = group.GroupCode;

package/src/components/system/system.ts

@@ -179,7 +179,7 @@ export class System extends ObjectBase {
       //Instantiate new activity from Activity class, call createId() method, then set the properties.
       const activity = new Activity();
       activity.ActivityId = activity.createId();
-      activity.Action = ActionEnum.ADD;
+      activity.Action = ActionEnum.CREATE;
       activity.Description = 'Add System';
       activity.EntityType = 'System';
       activity.EntityId = this.SystemCode;

package/src/components/system-privilege/system-privilege.ts

@@ -13,6 +13,7 @@ export class SystemPrivilege extends ObjectBase {
   ObjectType = 'SystemPrivilege';
   TableName = 'sso_SystemPrivilege';
   ObjectId: string;
+  PrivilegeCode: string;
   SystemCode: string;
   ObjectName: string;
   Description: string;
@@ -22,11 +23,11 @@ export class SystemPrivilege extends ObjectBase {
   private _CreatedById: number;
   private _UpdatedById: number;
 
-  get PrivilegeCode() {
+  get SystemPrivilegeId() {
     return this.ObjectId;
   }
 
-  set PrivilegeCode(value: string) {
+  set SystemPrivilegeId(value: string) {
     this.ObjectId = value;
   }
 
@@ -52,7 +53,8 @@ export class SystemPrivilege extends ObjectBase {
   private constructor(systemPrivilegeAttr?: ISystemPrivilegeAttr) {
     super();
     if (systemPrivilegeAttr) {
-      this.ObjectId = systemPrivilegeAttr.PrivilegeCode;
+      this.SystemPrivilegeId = systemPrivilegeAttr.SystemPrivilegeId;
+      this.PrivilegeCode = systemPrivilegeAttr.PrivilegeCode;
       this.SystemCode = systemPrivilegeAttr.SystemCode;
       this.Description = systemPrivilegeAttr.Description;
       this.Status = systemPrivilegeAttr.Status;
@@ -64,7 +66,8 @@ export class SystemPrivilege extends ObjectBase {
   }
 
   setAttributes(systemPrivilegeAttr: ISystemPrivilegeAttr) {
-    this.ObjectId = systemPrivilegeAttr.PrivilegeCode;
+    this.PrivilegeCode = systemPrivilegeAttr.PrivilegeCode;
+    this.SystemPrivilegeId = systemPrivilegeAttr.SystemPrivilegeId;
     this.SystemCode = systemPrivilegeAttr.SystemCode;
     this.Description = systemPrivilegeAttr.Description;
     this.Status = systemPrivilegeAttr.Status;
@@ -74,18 +77,19 @@ export class SystemPrivilege extends ObjectBase {
     this._UpdatedById = systemPrivilegeAttr.UpdatedById;
   }
 
-  static async init(dbTransaction: any, PrivilegeCode?: string) {
+  static async init(dbTransaction: any, SystemPrivilegeId?: string) {
     try {
       const systemPrivilege = new SystemPrivilege();
-      if (PrivilegeCode) {
+      if (SystemPrivilegeId) {
         const systemPrivilegeAttr = await this._Repository.findByPk(
-          PrivilegeCode,
+          SystemPrivilegeId,
           {
             transaction: dbTransaction,
           },
         );
         if (systemPrivilegeAttr) {
-          systemPrivilege.ObjectId = systemPrivilegeAttr.PrivilegeCode;
+          systemPrivilege.PrivilegeCode = systemPrivilegeAttr.PrivilegeCode;
+          systemPrivilege.ObjectId = systemPrivilegeAttr.SystemPrivilegeId;
           systemPrivilege.SystemCode = systemPrivilegeAttr.SystemCode;
           systemPrivilege.Description = systemPrivilegeAttr.Description;
           systemPrivilege.Status = systemPrivilegeAttr.Status;
@@ -114,7 +118,7 @@ export class SystemPrivilege extends ObjectBase {
   ) {
     try {
       //Part 1: Privilege Checking
-      const systemCode =
+      const systemCode: string =
         ApplicationConfig.getComponentConfigValue('system-code');
       const isPrivileged = await loginUser.checkPrivileges(
         systemCode,
@@ -169,7 +173,8 @@ export class SystemPrivilege extends ObjectBase {
       //Part 3: Create Privilege
       //Initialise new SystemPrivilege instance and populate below
       const newSystemPrivilege = new SystemPrivilege();
-      newSystemPrivilege.ObjectId = systemPrivilege.PrivilegeCode;
+      newSystemPrivilege.ObjectId = newSystemPrivilege.createId();
+      newSystemPrivilege.PrivilegeCode = systemPrivilege.PrivilegeCode;
       newSystemPrivilege.SystemCode = systemPrivilege.SystemCode;
       newSystemPrivilege.Description = systemPrivilege.Description;
       newSystemPrivilege.Status = 'Active';
@@ -181,7 +186,8 @@ export class SystemPrivilege extends ObjectBase {
       //Call SystemPrivilege._Repo create method
       await this._Repository.create(
         {
-          PrivilegeCode: newSystemPrivilege.ObjectId,
+          SystemPrivilegeId: newSystemPrivilege.ObjectId,
+          PrivilegeCode: newSystemPrivilege.PrivilegeCode,
           SystemCode: newSystemPrivilege.SystemCode,
           Description: newSystemPrivilege.Description,
           Status: newSystemPrivilege.Status,
@@ -202,7 +208,7 @@ export class SystemPrivilege extends ObjectBase {
       //Instantiate new activity object and populate
       const activity = new Activity();
       activity.ActivityId = activity.createId();
-      activity.Action = ActionEnum.ADD;
+      activity.Action = ActionEnum.CREATE;
       activity.Description = 'Add System Privilege';
       activity.EntityType = 'SystemPrivilege';
       activity.EntityId = newSystemPrivilege.SystemCode;
@@ -345,9 +351,11 @@ export class SystemPrivilege extends ObjectBase {
       );
 
       //Call SystemPrivilege._Repo create method for each newPrivileges.
+      const np = new SystemPrivilege();
       for (const privilegeConfig of tobeCreatePrivileges) {
         await this._Repository.create(
           {
+            SystemPrivilegeId: np.createId(),
             PrivilegeCode: privilegeConfig.privilegeCode,
             SystemCode: systemCode,
             Description: privilegeConfig.description,

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

@@ -226,7 +226,8 @@ export class UserGroup extends ObjectBase {
       // EntityValueBefore: <stringify of empty object>
       // EntityValueAfter: EntityValueAfter
       const activity = new Activity();
-      activity.Action = ActionEnum.ADD;
+      activity.ActivityId = activity.createId();
+      activity.Action = ActionEnum.CREATE;
       activity.Description = 'Assign user to group.';
       activity.EntityType = 'UserGroup';
       activity.EntityId = this.UserGroupId.toString();

package/src/components/user-object-privilege/user-object-privilege.ts

@@ -8,7 +8,7 @@ export class UserObjectPrivilege extends ObjectBase {
   ObjectName: string;
   ObjectPrivilegeId: number;
   UserId: number;
-  PrivilegeCode: string;
+  SystemPrivilegeId: string;
   ObjectId: string;
   ObjectType: string;
   Status: ObjectStatus;
@@ -40,7 +40,7 @@ export class UserObjectPrivilege extends ObjectBase {
     if (userObjectPrivilegeAttr) {
       this.ObjectPrivilegeId = userObjectPrivilegeAttr.ObjectPrivilegeId;
       this.UserId = userObjectPrivilegeAttr.UserId;
-      this.PrivilegeCode = userObjectPrivilegeAttr.PrivilegeCode;
+      this.SystemPrivilegeId = userObjectPrivilegeAttr.SystemPrivilegeId;
       this.ObjectId = userObjectPrivilegeAttr.ObjectId;
       this.ObjectType = userObjectPrivilegeAttr.ObjectType;
       this.Status = userObjectPrivilegeAttr.Status;

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

@@ -9,7 +9,7 @@ export class UserPrivilege extends ObjectBase {
   ObjectId: string;
   UserPrivilegeId: number;
   UserId: number;
-  PrivilegeCode: string;
+  SystemPrivilegeId: string;
   Status: string;
   private _CreatedById: number;
   private _UpdatedById: number;
@@ -39,7 +39,7 @@ export class UserPrivilege extends ObjectBase {
     if (userPrivilegeAttr) {
       this.UserPrivilegeId = userPrivilegeAttr.UserPrivilegeId;
       this.UserId = userPrivilegeAttr.UserId;
-      this.PrivilegeCode = userPrivilegeAttr.PrivilegeCode;
+      this.SystemPrivilegeId = userPrivilegeAttr.SystemPrivilegeId;
       this.Status = userPrivilegeAttr.Status;
       this._CreatedById = userPrivilegeAttr.CreatedById;
       this._UpdatedById = userPrivilegeAttr.UpdatedById;

package/src/interfaces/group-object-privilege.interface.ts

@@ -3,7 +3,7 @@ import { ObjectStatus } from '../enum/object-status.enum';
 export interface IGroupObjectPrivilegeAttr {
   GroupObjectPrivilegeId?: number;
   GroupCode: string;
-  PrivilegeCode: string;
+  SystemPrivilegeId: string;
   ObjectId: string;
   ObjectType: string;
   Status: ObjectStatus;

package/src/interfaces/group-privilege.interface.ts

@@ -1,7 +1,7 @@
 export interface IGroupPrivilegeAttr {
   GroupPrivilegeId?: number;
   GroupCode: string;
-  PrivilegeCode: string;
+  SystemPrivilegeId: string;
   Status: string;
   CreatedById: number;
   UpdatedById: number;

package/src/interfaces/group.interface.ts

@@ -8,6 +8,7 @@ export interface IGroupAttr {
   ParentGroupCode: string;
   InheritParentPrivilegeYN: string;
   InheritParentSystemAccessYN: string;
+  Path: string;
   Status: string;
   CreatedById: number;
   UpdatedById: number;

package/src/interfaces/system-privilege.interface.ts

@@ -1,4 +1,5 @@
 export interface ISystemPrivilegeAttr {
+  SystemPrivilegeId: string;
   PrivilegeCode: string;
   SystemCode: string;
   Description: string;

package/src/interfaces/user-object-privilege.interface.ts

@@ -3,7 +3,7 @@ import { ObjectStatus } from '../enum/object-status.enum';
 export interface IUserObjectPrivilegeAttr {
   ObjectPrivilegeId: number;
   UserId: number;
-  PrivilegeCode: string;
+  SystemPrivilegeId: string;
   ObjectId: string;
   ObjectType: string;
   Status: ObjectStatus;

package/src/interfaces/user-privilege.interface.ts

@@ -1,7 +1,7 @@
 export interface IUserPrivilegeAttr {
   UserPrivilegeId: number;
   UserId: number;
-  PrivilegeCode: string;
+  SystemPrivilegeId: string;
   Status: string;
   CreatedById: number;
   UpdatedById: number;

package/src/models/group-object-privilege.entity.ts

@@ -39,7 +39,7 @@ export default class GroupObjectPrivilegeModel extends Model {
     type: DataType.STRING(10),
     allowNull: false,
   })
-  PrivilegeCode: string;
+  SystemPrivilegeId: string;
 
   @Column({
     type: DataType.STRING,

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

@@ -38,7 +38,7 @@ export default class GroupPrivilegeModel extends Model {
     type: DataType.STRING(10),
     allowNull: false,
   })
-  PrivilegeCode: string;
+  SystemPrivilegeId: string;
 
   @Column({
     type: DataType.CHAR(20),

package/src/models/group.entity.ts

@@ -71,6 +71,12 @@ export default class GroupModel extends Model {
   })
   Status: string;
 
+  @Column({
+    allowNull: false,
+    type: DataType.STRING(10),
+  })
+  Path: string;
+
   @ForeignKey(() => User)
   @Column({
     allowNull: false,

package/src/models/system-privilege.entity.ts

@@ -22,6 +22,13 @@ import UserPrivilegeModel from './user-privilege.entity';
 export default class SystemPrivilegeModel extends Model {
   @Column({
     primaryKey: true,
+    allowNull: false,
+    type: DataType.STRING(30),
+    field: 'SystemPrivilegeId',
+  })
+  SystemPrivilegeId: string;
+
+  @Column({
     allowNull: false,
     type: DataType.STRING(50),
     field: 'PrivilegeCode',

package/src/models/user-object-privilege.entity.ts

@@ -38,7 +38,7 @@ export default class UserObjectPrivilegeModel extends Model {
     type: DataType.STRING(10),
     allowNull: false,
   })
-  PrivilegeCode: string;
+  SystemPrivilegeId: string;
 
   @Column({
     type: DataType.STRING,

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

@@ -39,7 +39,7 @@ export default class UserPrivilegeModel extends Model {
     type: DataType.STRING(10),
     allowNull: false,
   })
-  PrivilegeCode: string;
+  SystemPrivilegeId: string;
 
   @Column({
     type: DataType.CHAR(20),