@tomei/sso 0.27.0 → 0.28.3

package/src/components/login-user/interfaces/user-info.interface.ts

@@ -6,6 +6,7 @@ export interface IUserInfo {
   IDNo: string;
   Email: string;
   ContactNo: string;
+  UserName: string;
   UserId?: number;
   Password: string;
   staffs?: any;

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

@@ -11,7 +11,6 @@ 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';
-import UserGroup from '../../models/user-group.entity';
 import { YN } from '../../enum/yn.enum';
 import { UserStatus } from '../../enum';
 import { ApplicationConfig, ComponentConfig } from '@tomei/config';
@@ -31,10 +30,12 @@ import { UserObjectPrivilegeRepository } from '../user-object-privilege/user-obj
 import GroupPrivilegeModel from '../../models/group-privilege.entity';
 import { GroupObjectPrivilegeRepository } from '../group-object-privilege/group-object-privilege.repository';
 import * as speakeasy from 'speakeasy';
+import { LoginStatusEnum } from '../../enum/login-status.enum';
 
 export class LoginUser extends LoginUserBase {
   ObjectId: string;
   Email: string;
+  private _UserName: string;
   private _Password: string;
   private _Status: UserStatus;
   private _DefaultPasswordChangedYN: YN;
@@ -102,6 +103,14 @@ export class LoginUser extends LoginUserBase {
     this._Status = value;
   }
 
+  get UserName(): string {
+    return this._UserName;
+  }
+
+  set UserName(value: string) {
+    this._UserName = value;
+  }
+
   get DefaultPasswordChangedYN(): YN {
     return this._DefaultPasswordChangedYN;
   }
@@ -244,6 +253,7 @@ export class LoginUser extends LoginUserBase {
     // set all the class properties
     if (userInfo) {
       this.UserId = userInfo.UserId;
+      this.UserName = userInfo.FullName;
       this.FullName = userInfo.FullName;
       this.IDNo = userInfo.IDNo;
       this.Email = userInfo.Email;
@@ -295,6 +305,7 @@ export class LoginUser extends LoginUserBase {
       if (user) {
         const userAttr: IUserAttr = {
           UserId: user.UserId,
+          UserName: user.UserName,
           FullName: user.Staff.FullName,
           IDNo: user.Staff.IdNo,
           ContactNo: user.Staff.Mobile,
@@ -356,6 +367,7 @@ export class LoginUser extends LoginUserBase {
         if (user) {
           const userAttr: IUserAttr = {
             UserId: user.UserId,
+            UserName: user.UserName,
             FullName: user.Staff.FullName,
             IDNo: user.Staff.IdNo,
             ContactNo: user.Staff.Mobile,
@@ -491,6 +503,7 @@ export class LoginUser extends LoginUserBase {
       await LoginUser._Repository.update(
         {
           FullName: this.FullName,
+          UserName: this.UserName,
           IDNo: this.IDNo,
           Email: this.Email,
           ContactNo: this.ContactNo,
@@ -554,6 +567,7 @@ export class LoginUser extends LoginUserBase {
         SystemCode: system.SystemCode,
         OriginIp: ipAddress,
         CreatedAt: new Date(),
+        LoginStatus: LoginStatusEnum.SUCCESS,
         dbTransaction,
       });
 
@@ -569,6 +583,14 @@ export class LoginUser extends LoginUserBase {
 
       return `${this.UserId}:${sessionId}`;
     } catch (error) {
+      await LoginUser._LoginHistoryRepository.create({
+        UserId: this.UserId,
+        SystemCode: systemCode,
+        OriginIp: ipAddress,
+        LoginStatus: LoginStatusEnum.FAILURE,
+        CreatedAt: new Date(),
+        dbTransaction,
+      });
       throw error;
     }
   }
@@ -814,12 +836,12 @@ export class LoginUser extends LoginUserBase {
       // Add privileges from the group to the privileges array
       const groupPrivileges: string[] = [];
       for (const groupPrivilege of group.GroupPrivileges) {
-        groupPrivileges.push(groupPrivilege.Privilege.Name);
+        groupPrivileges.push(groupPrivilege.Privilege.PrivilegeCode);
       }
 
       const ops: string[] = [];
       for (const objectPrivilege of objectPrivileges) {
-        ops.push(objectPrivilege.Privilege.Name);
+        ops.push(objectPrivilege.Privilege.PrivilegeCode);
       }
 
       privileges = [...privileges, ...groupPrivileges, ...ops];
@@ -860,7 +882,9 @@ export class LoginUser extends LoginUserBase {
         transaction: dbTransaction,
       });
 
-      const privileges: string[] = userPrivileges.map((u) => u.Privilege.Name);
+      const privileges: string[] = userPrivileges.map(
+        (u) => u.Privilege.PrivilegeCode,
+      );
       return privileges;
     } catch (error) {
       throw error;
@@ -888,7 +912,7 @@ export class LoginUser extends LoginUserBase {
         });
 
       const privilegesCodes: string[] = userObjectPrivileges.map(
-        (u) => u.Privilege.Name,
+        (u) => u.Privilege.PrivilegeCode,
       );
       return privilegesCodes;
     } catch (error) {
@@ -985,7 +1009,7 @@ export class LoginUser extends LoginUserBase {
     try {
       //Part 1: Prepare Query Params
       //Params is all optional but at least one is required.
-      const { Email, IdType, IdNo, ContactNo } = query;
+      const { Email, UserName, IdType, IdNo, ContactNo } = query;
       //Prepare the Params to be used as OR operation in SQL query.
       const where = {
         [Op.or]: {},
@@ -993,6 +1017,10 @@ export class LoginUser extends LoginUserBase {
       if (Email) {
         where[Op.or]['Email'] = Email;
       }
+
+      if (UserName) {
+        where[Op.or]['UserName'] = UserName;
+      }
       //If Params.IdNo is not null, then Params.IdType is required and vice versa.
       if (IdType && IdNo) {
         where[Op.or]['IdType'] = IdType;
@@ -1269,16 +1297,17 @@ export class LoginUser extends LoginUserBase {
 
       //Part 2: Validation
       //Make sure Params.user.Email got values. If not, throw new ClassError
-      if (!user.Email) {
+      if (!user.Email && !user.UserName) {
         throw new ClassError(
           'LoginUser',
           'LoginUserErrMsg0X',
-          'Email is required',
+          'Email and Username is required',
         );
       }
       //Check if user info exists, call LoginUser.CheckUserInfoDuplicated method
       await LoginUser.checkUserInfoDuplicated(dbTransaction, {
         Email: user.Email,
+        UserName: user.UserName,
         IdType: user.IDType,
         IdNo: user.IDNo,
         ContactNo: user.ContactNo,
@@ -1290,6 +1319,7 @@ export class LoginUser extends LoginUserBase {
       //Part 4: Insert User Record
       //Set userToBeCreated to the instantiation of new LoginUser (using private constructor)
       const userInfo: IUserAttr = {
+        UserName: user.UserName,
         FullName: user.FullName,
         IDNo: user.IDNo,
         Email: user.Email,
@@ -1316,6 +1346,7 @@ export class LoginUser extends LoginUserBase {
       const newUser = await LoginUser._Repository.create(
         {
           Email: userInfo.Email,
+          UserName: userInfo.UserName,
           Password: userInfo.Password,
           Status: userInfo.Status,
           DefaultPasswordChangedYN: userInfo.DefaultPasswordChangedYN,

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

@@ -24,14 +24,6 @@ export class SystemPrivilege extends ObjectBase {
     this.ObjectId = value;
   }
 
-  set Name(value: string) {
-    this.ObjectName = value;
-  }
-
-  get Name() {
-    return this.ObjectName;
-  }
-
   get CreatedAt() {
     return this._CreatedAt;
   }
@@ -56,7 +48,6 @@ export class SystemPrivilege extends ObjectBase {
     if (systemPrivilegeAttr) {
       this.ObjectId = systemPrivilegeAttr.PrivilegeCode;
       this.SystemCode = systemPrivilegeAttr.SystemCode;
-      this.ObjectName = systemPrivilegeAttr.Name;
       this.Description = systemPrivilegeAttr.Description;
       this.Status = systemPrivilegeAttr.Status;
       this._CreatedById = systemPrivilegeAttr.CreatedById;
@@ -79,7 +70,6 @@ export class SystemPrivilege extends ObjectBase {
         if (systemPrivilegeAttr) {
           systemPrivilege.ObjectId = systemPrivilegeAttr.PrivilegeCode;
           systemPrivilege.SystemCode = systemPrivilegeAttr.SystemCode;
-          systemPrivilege.ObjectName = systemPrivilegeAttr.Name;
           systemPrivilege.Description = systemPrivilegeAttr.Description;
           systemPrivilege.Status = systemPrivilegeAttr.Status;
           systemPrivilege._CreatedById = systemPrivilegeAttr.CreatedById;

package/src/enum/index.ts

@@ -2,3 +2,4 @@ export * from './yn.enum';
 export * from './user-status.enum';
 export * from './group-type.enum';
 export * from './object-status.enum';
+export * from './login-status.enum';

package/src/enum/login-status.enum.ts

@@ -0,0 +1,4 @@
+export enum LoginStatusEnum {
+  SUCCESS = 'Success',
+  FAILURE = 'Failure',
+}

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

@@ -1,7 +1,6 @@
 export interface ISystemPrivilegeAttr {
   PrivilegeCode: string;
   SystemCode: string;
-  Name: string;
   Description: string;
   Status: string;
   CreatedById: number;

package/src/models/login-history.entity.ts

@@ -9,6 +9,7 @@ import {
 } from 'sequelize-typescript';
 import User from './user.entity';
 import SystemModel from './system.entity';
+import { LoginStatusEnum } from '../enum/login-status.enum';
 
 @Table({
   tableName: 'sso_LoginHistory',
@@ -39,6 +40,12 @@ export default class LoginHistory extends Model {
   })
   SystemCode: number;
 
+  @Column({
+    allowNull: true,
+    type: DataType.STRING(191),
+  })
+  LoginStatus: LoginStatusEnum;
+
   @Column({
     allowNull: true,
     type: DataType.STRING(191),

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

@@ -23,7 +23,7 @@ export default class SystemPrivilegeModel extends Model {
   @Column({
     primaryKey: true,
     allowNull: false,
-    type: DataType.STRING(10),
+    type: DataType.STRING(50),
     field: 'PrivilegeCode',
   })
   PrivilegeCode: string;
@@ -36,13 +36,6 @@ export default class SystemPrivilegeModel extends Model {
   })
   SystemCode: string;
 
-  @Column({
-    allowNull: false,
-    type: DataType.STRING(200),
-    field: 'Name',
-  })
-  Name: string;
-
   @Column({
     allowNull: true,
     type: DataType.STRING(3000),

package/src/models/user.entity.ts

@@ -40,6 +40,12 @@ export default class User extends Model {
   })
   Email: string;
 
+  @Column({
+    allowNull: true,
+    type: DataType.STRING,
+  })
+  UserName: string;
+
   @Column({
     allowNull: false,
     type: DataType.STRING,