@tomei/sso 0.27.0 → 0.28.3

package/coverage/test-report.xml

@@ -1,129 +1,129 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<testExecutions version="1">
-  <file path="C:\Work\sso\__tests__\unit\components\login-user\login.spec.ts">
-    <testCase name="LoginUser init should initialize LoginUser with valid userId" duration="5"/>
-    <testCase name="LoginUser init should throw an error when user is not found" duration="20"/>
-    <testCase name="LoginUser checkSession should throw an error if session expired" duration="20"/>
-    <testCase name="LoginUser checkSession should refresh the session duration if session is valid" duration="2"/>
-    <testCase name="LoginUser shouldReleaseLock should return true if autoReleaseYN is &quot;Y&quot; and time difference is greater than minuteToAutoRelease" duration="2"/>
-    <testCase name="LoginUser shouldReleaseLock should return false if autoReleaseYN is &quot;Y&quot; and time difference is less than or equal to minuteToAutoRelease" duration="1"/>
-    <testCase name="LoginUser shouldReleaseLock should return false if autoReleaseYN is &quot;N&quot;" duration="1"/>
-    <testCase name="LoginUser releaseLock should release the lock for a user" duration="1"/>
-    <testCase name="LoginUser checkUserInfoDuplicated should throw an error if duplicate user info is found" duration="1"/>
-    <testCase name="LoginUser checkUserInfoDuplicated should not throw an error if duplicate user info is not found" duration="0"/>
-    <testCase name="LoginUser generateDefaultPassword should generate a default password with the specified length" duration="2"/>
-    <testCase name="LoginUser generateDefaultPassword should generate a default password with at least one capital letter" duration="1"/>
-    <testCase name="LoginUser generateDefaultPassword should generate a default password with at least one number" duration="1"/>
-    <testCase name="LoginUser generateDefaultPassword should generate a default password with at least one special character" duration="1"/>
-    <testCase name="LoginUser generateDefaultPassword should generate a default password without any non-acceptable characters" duration="1"/>
-    <testCase name="LoginUser setPassword should set the password for the user" duration="159"/>
-    <testCase name="LoginUser setPassword should throw an error if the password does not meet the security requirements" duration="13"/>
-    <testCase name="LoginUser create should create a new user record" duration="5"/>
-    <testCase name="LoginUser create should throw an error if user dont have the privilege to create new user" duration="2"/>
-    <testCase name="LoginUser create should throw an error if user email is missing" duration="2"/>
-    <testCase name="LoginUser incrementFailedLoginAttemptCount should increment FailedLoginAttemptCount and update user status" duration="1"/>
-    <testCase name="LoginUser incrementFailedLoginAttemptCount should throw an error if maxFailedLoginAttempts or autoReleaseYN is missing" duration="1"/>
-    <testCase name="LoginUser incrementFailedLoginAttemptCount should lock the user account if the failed login attempts exceed the maximum allowed" duration="1"/>
-    <testCase name="LoginUser incrementFailedLoginAttemptCount should permanently lock the user account if the failed login attempts exceed the maximum allowed and autoReleaseYN is N" duration="1"/>
-    <testCase name="LoginUser combineSystemAccess should combine user and group system access and remove duplicates" duration="1"/>
-    <testCase name="LoginUser checkPrivileges should return true if user has the specified privilege" duration="1"/>
-    <testCase name="LoginUser checkPrivileges should return false if user does not have the specified privilege" duration="1"/>
-    <testCase name="LoginUser checkPrivileges should throw an error if ObjectId is not set" duration="1"/>
-    <testCase name="LoginUser getObjectPrivileges should return an array of privileges" duration="1"/>
-    <testCase name="LoginUser getObjectPrivileges should throw an error if an exception occurs" duration="1"/>
-    <testCase name="LoginUser getUserPersonalPrivileges should return an array of privileges" duration="2"/>
-    <testCase name="LoginUser getUserPersonalPrivileges should throw an error if an error occurs" duration="1"/>
-    <testCase name="LoginUser getInheritedSystemAccess should return group system access with its parent group system access if applicable" duration="3"/>
-  </file>
-  <file path="C:\Work\sso\__tests__\unit\components\system\system.spec.ts">
-    <testCase name="System init should initialize a system when SystemCode is provided" duration="3"/>
-    <testCase name="System init should throw an error when SystemCode is not found" duration="8"/>
-    <testCase name="System init should initialize a new system when SystemCode is not provided" duration="1"/>
-    <testCase name="System createSystem should create a new system" duration="4"/>
-    <testCase name="System createSystem should throw an error when user does not have permission" duration="1"/>
-    <testCase name="System createSystem should throw an error when SystemCode is missing" duration="1"/>
-    <testCase name="System createSystem should throw an error when Name is missing" duration="1"/>
-    <testCase name="System createSystem should throw an error when Description is missing" duration="1"/>
-    <testCase name="System createSystem should throw an error when failed to create system" duration="5"/>
-    <testCase name="System setSystemCode should set the SystemCode when there is no duplicate" duration="1"/>
-    <testCase name="System setSystemCode should throw an error when SystemCode already exists" duration="1"/>
-    <testCase name="System setSystemCode should throw an error when failed to check duplicate SystemCode" duration="1"/>
-    <testCase name="System findAll should find all systems based on filter" duration="2"/>
-    <testCase name="System findAll should find all systems without pagination when page and rows are not provided" duration="1"/>
-  </file>
-  <file path="C:\Work\sso\__tests__\unit\components\group-object-privilege\group-object-privilege.spec.ts">
-    <testCase name="GroupObjectPrivilege should create an instance of GroupObjectPrivilege" duration="2"/>
-    <testCase name="GroupObjectPrivilege should have the correct TableName" duration="0"/>
-    <testCase name="GroupObjectPrivilege should have the correct properties" duration="1"/>
-    <testCase name="GroupObjectPrivilege init should return an instance of GroupObjectPrivilege when GroupObjectPrivilegeId is provided" duration="2"/>
-    <testCase name="GroupObjectPrivilege init should throw an error when GroupObjectPrivilegeId is provided but no GroupObjectPrivilege is found" duration="3"/>
-    <testCase name="GroupObjectPrivilege init should return a new instance of GroupObjectPrivilege when GroupObjectPrivilegeId is not provided" duration="3"/>
-  </file>
-  <file path="C:\Work\sso\__tests__\unit\components\group-system-access\group-system-access.spec.ts">
-    <testCase name="GroupSystemAccess should create a new GroupSystemAccess instance" duration="2"/>
-    <testCase name="GroupSystemAccess init should initialize GroupSystemAccess without GroupSystemAccessId" duration="2"/>
-    <testCase name="GroupSystemAccess init should initialize GroupSystemAccess with GroupSystemAccessId" duration="3"/>
-    <testCase name="GroupSystemAccess init should throw an error if GroupSystemAccessId is not found" duration="5"/>
-  </file>
-  <file path="C:\Work\sso\__tests__\unit\components\group\group.spec.ts">
-    <testCase name="Group should initialize a group with valid GroupCode" duration="4"/>
-    <testCase name="Group should throw an error when initializing a group with invalid GroupCode" duration="5"/>
-    <testCase name="Group should throw an error when initializing a group with an error" duration="2"/>
-  </file>
-  <file path="C:\Work\sso\__tests__\unit\components\group-reporting-user\group-reporting-user.spec.ts">
-    <testCase name="GroupReportingUser init should initialize GroupReportingUser without GroupReportingUserId" duration="3"/>
-    <testCase name="GroupReportingUser init should initialize GroupReportingUser with valid GroupReportingUserId" duration="2"/>
-    <testCase name="GroupReportingUser init should throw ClassError when GroupReportingUser is not found" duration="8"/>
-    <testCase name="GroupReportingUser init should throw ClassError when failed to initialize GroupReportingUser" duration="1"/>
-  </file>
-  <file path="C:\Work\sso\__tests__\unit\components\system-privilege\system-privilege.spec.ts">
-    <testCase name="SystemPrivilege constructor should create a new SystemPrivilege instance" duration="2"/>
-    <testCase name="SystemPrivilege init should initialize SystemPrivilege without PrivilegeCode" duration="1"/>
-    <testCase name="SystemPrivilege init should initialize SystemPrivilege with PrivilegeCode" duration="2"/>
-    <testCase name="SystemPrivilege init should throw an error if PrivilegeCode is not found" duration="4"/>
-  </file>
-  <file path="C:\Work\sso\__tests__\unit\components\user-group\user-group.spec.ts">
-    <testCase name="UserGroup constructor should create a new UserGroup instance" duration="3"/>
-    <testCase name="UserGroup init should initialize UserGroup with valid UserGroupId" duration="2"/>
-    <testCase name="UserGroup init should throw ClassError when UserGroupId is not found" duration="5"/>
-  </file>
-  <file path="C:\Work\sso\__tests__\unit\components\user-object-privilege\user-object-privilege.spec.ts">
-    <testCase name="UserObjectPrivilege constructor should create a new UserObjectPrivilege instance" duration="2"/>
-    <testCase name="UserObjectPrivilege init should initialize UserObjectPrivilege with valid ObjectPrivilegeId" duration="5"/>
-    <testCase name="UserObjectPrivilege init should throw ClassError when ObjectPrivilegeId is not found" duration="4"/>
-  </file>
-  <file path="C:\Work\sso\__tests__\unit\components\group-privilege\group-privilege.spec.ts">
-    <testCase name="GroupPrivilege should initialize with GroupPrivilegeAttr" duration="6"/>
-    <testCase name="GroupPrivilege should throw ClassError when GroupPrivilegeAttr is not found" duration="4"/>
-    <testCase name="GroupPrivilege should initialize with default values" duration="1"/>
-  </file>
-  <file path="C:\Work\sso\__tests__\unit\components\user-system-access\user-system-access.spec.ts">
-    <testCase name="UserSystemAccess constructor should create a new UserSystemAccess instance" duration="2"/>
-    <testCase name="UserSystemAccess init should initialize UserSystemAccess with valid UserSystemAccessId" duration="2"/>
-    <testCase name="UserSystemAccess init should throw ClassError when UserSystemAccessId is not found" duration="1"/>
-  </file>
-  <file path="C:\Work\sso\__tests__\unit\components\user-privilege\user-privilege.spec.ts">
-    <testCase name="UserPrivilege constructor should create a new UserPrivilege instance" duration="2"/>
-    <testCase name="UserPrivilege init should initialize UserPrivilege with valid UserPrivilegeId" duration="2"/>
-    <testCase name="UserPrivilege init should throw ClassError when UserPrivilegeId is not found" duration="4"/>
-  </file>
-  <file path="C:\Work\sso\__tests__\unit\session\session.service.spec.ts">
-    <testCase name="session.service should return session service when instansiated" duration="2"/>
-    <testCase name="session.service should able to write session data" duration="3"/>
-    <testCase name="session.service should able to refresh session data" duration="3"/>
-  </file>
-  <file path="C:\Work\sso\__tests__\unit\system-privilege\system-privilage.spec.ts">
-    <testCase name="SystemPrivilege should be true" duration="2"/>
-  </file>
-  <file path="C:\Work\sso\__tests__\unit\components\password-hash\password-hash.service.spec.ts">
-    <testCase name="password-hash.service should return hash password" duration="2"/>
-    <testCase name="password-hash.service should return true when verify password" duration="1"/>
-  </file>
-  <file path="C:\Work\sso\__tests__\unit\redis-client\redis.service.spec.ts">
-    <testCase name="redis.service should return redis service when instansiated" duration="1"/>
-    <testCase name="redis.service should able to write and read redis" duration="2"/>
-  </file>
-  <file path="C:\Work\sso\__tests__\unit\components\login-user\l.spec.ts">
-    <testCase name="SystemPrivilege should be true" duration="1"/>
-  </file>
+<?xml version="1.0" encoding="UTF-8"?>
+<testExecutions version="1">
+  <file path="C:\Work\sso\__tests__\unit\components\login-user\login.spec.ts">
+    <testCase name="LoginUser init should initialize LoginUser with valid userId" duration="5"/>
+    <testCase name="LoginUser init should throw an error when user is not found" duration="20"/>
+    <testCase name="LoginUser checkSession should throw an error if session expired" duration="20"/>
+    <testCase name="LoginUser checkSession should refresh the session duration if session is valid" duration="2"/>
+    <testCase name="LoginUser shouldReleaseLock should return true if autoReleaseYN is &quot;Y&quot; and time difference is greater than minuteToAutoRelease" duration="2"/>
+    <testCase name="LoginUser shouldReleaseLock should return false if autoReleaseYN is &quot;Y&quot; and time difference is less than or equal to minuteToAutoRelease" duration="1"/>
+    <testCase name="LoginUser shouldReleaseLock should return false if autoReleaseYN is &quot;N&quot;" duration="1"/>
+    <testCase name="LoginUser releaseLock should release the lock for a user" duration="1"/>
+    <testCase name="LoginUser checkUserInfoDuplicated should throw an error if duplicate user info is found" duration="1"/>
+    <testCase name="LoginUser checkUserInfoDuplicated should not throw an error if duplicate user info is not found" duration="0"/>
+    <testCase name="LoginUser generateDefaultPassword should generate a default password with the specified length" duration="2"/>
+    <testCase name="LoginUser generateDefaultPassword should generate a default password with at least one capital letter" duration="1"/>
+    <testCase name="LoginUser generateDefaultPassword should generate a default password with at least one number" duration="1"/>
+    <testCase name="LoginUser generateDefaultPassword should generate a default password with at least one special character" duration="1"/>
+    <testCase name="LoginUser generateDefaultPassword should generate a default password without any non-acceptable characters" duration="1"/>
+    <testCase name="LoginUser setPassword should set the password for the user" duration="159"/>
+    <testCase name="LoginUser setPassword should throw an error if the password does not meet the security requirements" duration="13"/>
+    <testCase name="LoginUser create should create a new user record" duration="5"/>
+    <testCase name="LoginUser create should throw an error if user dont have the privilege to create new user" duration="2"/>
+    <testCase name="LoginUser create should throw an error if user email is missing" duration="2"/>
+    <testCase name="LoginUser incrementFailedLoginAttemptCount should increment FailedLoginAttemptCount and update user status" duration="1"/>
+    <testCase name="LoginUser incrementFailedLoginAttemptCount should throw an error if maxFailedLoginAttempts or autoReleaseYN is missing" duration="1"/>
+    <testCase name="LoginUser incrementFailedLoginAttemptCount should lock the user account if the failed login attempts exceed the maximum allowed" duration="1"/>
+    <testCase name="LoginUser incrementFailedLoginAttemptCount should permanently lock the user account if the failed login attempts exceed the maximum allowed and autoReleaseYN is N" duration="1"/>
+    <testCase name="LoginUser combineSystemAccess should combine user and group system access and remove duplicates" duration="1"/>
+    <testCase name="LoginUser checkPrivileges should return true if user has the specified privilege" duration="1"/>
+    <testCase name="LoginUser checkPrivileges should return false if user does not have the specified privilege" duration="1"/>
+    <testCase name="LoginUser checkPrivileges should throw an error if ObjectId is not set" duration="1"/>
+    <testCase name="LoginUser getObjectPrivileges should return an array of privileges" duration="1"/>
+    <testCase name="LoginUser getObjectPrivileges should throw an error if an exception occurs" duration="1"/>
+    <testCase name="LoginUser getUserPersonalPrivileges should return an array of privileges" duration="2"/>
+    <testCase name="LoginUser getUserPersonalPrivileges should throw an error if an error occurs" duration="1"/>
+    <testCase name="LoginUser getInheritedSystemAccess should return group system access with its parent group system access if applicable" duration="3"/>
+  </file>
+  <file path="C:\Work\sso\__tests__\unit\components\system\system.spec.ts">
+    <testCase name="System init should initialize a system when SystemCode is provided" duration="3"/>
+    <testCase name="System init should throw an error when SystemCode is not found" duration="8"/>
+    <testCase name="System init should initialize a new system when SystemCode is not provided" duration="1"/>
+    <testCase name="System createSystem should create a new system" duration="4"/>
+    <testCase name="System createSystem should throw an error when user does not have permission" duration="1"/>
+    <testCase name="System createSystem should throw an error when SystemCode is missing" duration="1"/>
+    <testCase name="System createSystem should throw an error when Name is missing" duration="1"/>
+    <testCase name="System createSystem should throw an error when Description is missing" duration="1"/>
+    <testCase name="System createSystem should throw an error when failed to create system" duration="5"/>
+    <testCase name="System setSystemCode should set the SystemCode when there is no duplicate" duration="1"/>
+    <testCase name="System setSystemCode should throw an error when SystemCode already exists" duration="1"/>
+    <testCase name="System setSystemCode should throw an error when failed to check duplicate SystemCode" duration="1"/>
+    <testCase name="System findAll should find all systems based on filter" duration="2"/>
+    <testCase name="System findAll should find all systems without pagination when page and rows are not provided" duration="1"/>
+  </file>
+  <file path="C:\Work\sso\__tests__\unit\components\group-object-privilege\group-object-privilege.spec.ts">
+    <testCase name="GroupObjectPrivilege should create an instance of GroupObjectPrivilege" duration="2"/>
+    <testCase name="GroupObjectPrivilege should have the correct TableName" duration="0"/>
+    <testCase name="GroupObjectPrivilege should have the correct properties" duration="1"/>
+    <testCase name="GroupObjectPrivilege init should return an instance of GroupObjectPrivilege when GroupObjectPrivilegeId is provided" duration="2"/>
+    <testCase name="GroupObjectPrivilege init should throw an error when GroupObjectPrivilegeId is provided but no GroupObjectPrivilege is found" duration="3"/>
+    <testCase name="GroupObjectPrivilege init should return a new instance of GroupObjectPrivilege when GroupObjectPrivilegeId is not provided" duration="3"/>
+  </file>
+  <file path="C:\Work\sso\__tests__\unit\components\group-system-access\group-system-access.spec.ts">
+    <testCase name="GroupSystemAccess should create a new GroupSystemAccess instance" duration="2"/>
+    <testCase name="GroupSystemAccess init should initialize GroupSystemAccess without GroupSystemAccessId" duration="2"/>
+    <testCase name="GroupSystemAccess init should initialize GroupSystemAccess with GroupSystemAccessId" duration="3"/>
+    <testCase name="GroupSystemAccess init should throw an error if GroupSystemAccessId is not found" duration="5"/>
+  </file>
+  <file path="C:\Work\sso\__tests__\unit\components\group\group.spec.ts">
+    <testCase name="Group should initialize a group with valid GroupCode" duration="4"/>
+    <testCase name="Group should throw an error when initializing a group with invalid GroupCode" duration="5"/>
+    <testCase name="Group should throw an error when initializing a group with an error" duration="2"/>
+  </file>
+  <file path="C:\Work\sso\__tests__\unit\components\group-reporting-user\group-reporting-user.spec.ts">
+    <testCase name="GroupReportingUser init should initialize GroupReportingUser without GroupReportingUserId" duration="3"/>
+    <testCase name="GroupReportingUser init should initialize GroupReportingUser with valid GroupReportingUserId" duration="2"/>
+    <testCase name="GroupReportingUser init should throw ClassError when GroupReportingUser is not found" duration="8"/>
+    <testCase name="GroupReportingUser init should throw ClassError when failed to initialize GroupReportingUser" duration="1"/>
+  </file>
+  <file path="C:\Work\sso\__tests__\unit\components\system-privilege\system-privilege.spec.ts">
+    <testCase name="SystemPrivilege constructor should create a new SystemPrivilege instance" duration="2"/>
+    <testCase name="SystemPrivilege init should initialize SystemPrivilege without PrivilegeCode" duration="1"/>
+    <testCase name="SystemPrivilege init should initialize SystemPrivilege with PrivilegeCode" duration="2"/>
+    <testCase name="SystemPrivilege init should throw an error if PrivilegeCode is not found" duration="4"/>
+  </file>
+  <file path="C:\Work\sso\__tests__\unit\components\user-group\user-group.spec.ts">
+    <testCase name="UserGroup constructor should create a new UserGroup instance" duration="3"/>
+    <testCase name="UserGroup init should initialize UserGroup with valid UserGroupId" duration="2"/>
+    <testCase name="UserGroup init should throw ClassError when UserGroupId is not found" duration="5"/>
+  </file>
+  <file path="C:\Work\sso\__tests__\unit\components\user-object-privilege\user-object-privilege.spec.ts">
+    <testCase name="UserObjectPrivilege constructor should create a new UserObjectPrivilege instance" duration="2"/>
+    <testCase name="UserObjectPrivilege init should initialize UserObjectPrivilege with valid ObjectPrivilegeId" duration="5"/>
+    <testCase name="UserObjectPrivilege init should throw ClassError when ObjectPrivilegeId is not found" duration="4"/>
+  </file>
+  <file path="C:\Work\sso\__tests__\unit\components\group-privilege\group-privilege.spec.ts">
+    <testCase name="GroupPrivilege should initialize with GroupPrivilegeAttr" duration="6"/>
+    <testCase name="GroupPrivilege should throw ClassError when GroupPrivilegeAttr is not found" duration="4"/>
+    <testCase name="GroupPrivilege should initialize with default values" duration="1"/>
+  </file>
+  <file path="C:\Work\sso\__tests__\unit\components\user-system-access\user-system-access.spec.ts">
+    <testCase name="UserSystemAccess constructor should create a new UserSystemAccess instance" duration="2"/>
+    <testCase name="UserSystemAccess init should initialize UserSystemAccess with valid UserSystemAccessId" duration="2"/>
+    <testCase name="UserSystemAccess init should throw ClassError when UserSystemAccessId is not found" duration="1"/>
+  </file>
+  <file path="C:\Work\sso\__tests__\unit\components\user-privilege\user-privilege.spec.ts">
+    <testCase name="UserPrivilege constructor should create a new UserPrivilege instance" duration="2"/>
+    <testCase name="UserPrivilege init should initialize UserPrivilege with valid UserPrivilegeId" duration="2"/>
+    <testCase name="UserPrivilege init should throw ClassError when UserPrivilegeId is not found" duration="4"/>
+  </file>
+  <file path="C:\Work\sso\__tests__\unit\session\session.service.spec.ts">
+    <testCase name="session.service should return session service when instansiated" duration="2"/>
+    <testCase name="session.service should able to write session data" duration="3"/>
+    <testCase name="session.service should able to refresh session data" duration="3"/>
+  </file>
+  <file path="C:\Work\sso\__tests__\unit\system-privilege\system-privilage.spec.ts">
+    <testCase name="SystemPrivilege should be true" duration="2"/>
+  </file>
+  <file path="C:\Work\sso\__tests__\unit\components\password-hash\password-hash.service.spec.ts">
+    <testCase name="password-hash.service should return hash password" duration="2"/>
+    <testCase name="password-hash.service should return true when verify password" duration="1"/>
+  </file>
+  <file path="C:\Work\sso\__tests__\unit\redis-client\redis.service.spec.ts">
+    <testCase name="redis.service should return redis service when instansiated" duration="1"/>
+    <testCase name="redis.service should able to write and read redis" duration="2"/>
+  </file>
+  <file path="C:\Work\sso\__tests__\unit\components\login-user\l.spec.ts">
+    <testCase name="SystemPrivilege should be true" duration="1"/>
+  </file>
 </testExecutions>

package/dist/__tests__/unit/components/system-privilege/system-privilege.spec.js

@@ -35,7 +35,6 @@ describe('SystemPrivilege', () => {
             expect(systemPrivilege).toBeInstanceOf(system_privilege_1.SystemPrivilege);
             expect(systemPrivilege.PrivilegeCode).toBe(systemPrivilegeAttr.PrivilegeCode);
             expect(systemPrivilege.SystemCode).toBe(systemPrivilegeAttr.SystemCode);
-            expect(systemPrivilege.Name).toBe(systemPrivilegeAttr.Name);
             expect(systemPrivilege.Description).toBe(systemPrivilegeAttr.Description);
             expect(systemPrivilege.Status).toBe(systemPrivilegeAttr.Status);
             expect(systemPrivilege.CreatedById).toBe(systemPrivilegeAttr.CreatedById);
@@ -51,7 +50,6 @@ describe('SystemPrivilege', () => {
             expect(systemPrivilege).toBeInstanceOf(system_privilege_1.SystemPrivilege);
             expect(systemPrivilege.PrivilegeCode).toBeUndefined();
             expect(systemPrivilege.SystemCode).toBeUndefined();
-            expect(systemPrivilege.Name).toBeUndefined();
             expect(systemPrivilege.Description).toBeUndefined();
             expect(systemPrivilege.Status).toBeUndefined();
             expect(systemPrivilege.CreatedById).toBeUndefined();
@@ -71,7 +69,6 @@ describe('SystemPrivilege', () => {
             expect(systemPrivilege).toBeInstanceOf(system_privilege_1.SystemPrivilege);
             expect(systemPrivilege.PrivilegeCode).toBe(systemPrivilegeAttr.PrivilegeCode);
             expect(systemPrivilege.SystemCode).toBe(systemPrivilegeAttr.SystemCode);
-            expect(systemPrivilege.Name).toBe(systemPrivilegeAttr.Name);
             expect(systemPrivilege.Description).toBe(systemPrivilegeAttr.Description);
             expect(systemPrivilege.Status).toBe(systemPrivilegeAttr.Status);
             expect(systemPrivilege.CreatedById).toBe(systemPrivilegeAttr.CreatedById);

package/dist/__tests__/unit/components/system-privilege/system-privilege.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"system-privilege.spec.js","sourceRoot":"","sources":["../../../../../__tests__/unit/components/system-privilege/system-privilege.spec.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"system-privilege.spec.js","sourceRoot":"","sources":["../../../../../__tests__/unit/components/system-privilege/system-privilege.spec.ts"],"names":[],"mappings":"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"}

package/dist/src/components/login-user/interfaces/check-user-info-duplicated.interface.d.ts

@@ -1,5 +1,6 @@
 export interface ICheckUserInfoDuplicatedQuery {
     Email?: string;
+    UserName?: string;
     IdType?: string;
     IdNo?: string;
     ContactNo?: string;

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

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

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

@@ -1,12 +1,12 @@
 import { LoginUserBase } from '@tomei/general';
 import { ISessionService } from '../../session/interfaces/session-service.interface';
 import { ISystemLogin } from '../../../src/interfaces/system-login.interface';
-import UserGroup from '../../models/user-group.entity';
 import { YN } from '../../enum/yn.enum';
 import { UserStatus } from '../../enum';
 export declare class LoginUser extends LoginUserBase {
     ObjectId: string;
     Email: string;
+    private _UserName;
     private _Password;
     private _Status;
     private _DefaultPasswordChangedYN;
@@ -47,6 +47,8 @@ export declare class LoginUser extends LoginUserBase {
     private set Password(value);
     get Status(): UserStatus;
     private set Status(value);
+    get UserName(): string;
+    set UserName(value: string);
     get DefaultPasswordChangedYN(): YN;
     private set DefaultPasswordChangedYN(value);
     get FirstLoginAt(): Date;
@@ -101,7 +103,7 @@ export declare class LoginUser extends LoginUserBase {
     private incrementFailedLoginAttemptCount;
     static shouldReleaseLock(LastFailedLoginAt: any): boolean;
     private static releaseLock;
-    static getGroups(loginUser: LoginUser, dbTransaction: any): Promise<UserGroup[]>;
+    static getGroups(loginUser: LoginUser, dbTransaction: any): Promise<import("../../models/user-group.entity").default[]>;
     private static getInheritedSystemAccess;
     private static combineSystemAccess;
     static getSystems(loginUser: LoginUser, dbTransaction: any): Promise<any[]>;

package/dist/src/components/login-user/login-user.js

@@ -35,6 +35,7 @@ const user_object_privilege_repository_1 = require("../user-object-privilege/use
 const group_privilege_entity_1 = require("../../models/group-privilege.entity");
 const group_object_privilege_repository_1 = require("../group-object-privilege/group-object-privilege.repository");
 const speakeasy = require("speakeasy");
+const login_status_enum_1 = require("../../enum/login-status.enum");
 class LoginUser extends general_1.LoginUserBase {
     get SessionService() {
         return this._SessionService;
@@ -57,6 +58,12 @@ class LoginUser extends general_1.LoginUserBase {
     set Status(value) {
         this._Status = value;
     }
+    get UserName() {
+        return this._UserName;
+    }
+    set UserName(value) {
+        this._UserName = value;
+    }
     get DefaultPasswordChangedYN() {
         return this._DefaultPasswordChangedYN;
     }
@@ -163,6 +170,7 @@ class LoginUser extends general_1.LoginUserBase {
         }
         if (userInfo) {
             this.UserId = userInfo.UserId;
+            this.UserName = userInfo.FullName;
             this.FullName = userInfo.FullName;
             this.IDNo = userInfo.IDNo;
             this.Email = userInfo.Email;
@@ -208,6 +216,7 @@ class LoginUser extends general_1.LoginUserBase {
                 if (user) {
                     const userAttr = {
                         UserId: user.UserId,
+                        UserName: user.UserName,
                         FullName: user.Staff.FullName,
                         IDNo: user.Staff.IdNo,
                         ContactNo: user.Staff.Mobile,
@@ -260,6 +269,7 @@ class LoginUser extends general_1.LoginUserBase {
                     if (user) {
                         const userAttr = {
                             UserId: user.UserId,
+                            UserName: user.UserName,
                             FullName: user.Staff.FullName,
                             IDNo: user.Staff.IdNo,
                             ContactNo: user.Staff.Mobile,
@@ -356,6 +366,7 @@ class LoginUser extends general_1.LoginUserBase {
                 }
                 yield LoginUser._Repository.update({
                     FullName: this.FullName,
+                    UserName: this.UserName,
                     IDNo: this.IDNo,
                     Email: this.Email,
                     ContactNo: this.ContactNo,
@@ -400,6 +411,7 @@ class LoginUser extends general_1.LoginUserBase {
                     SystemCode: system.SystemCode,
                     OriginIp: ipAddress,
                     CreatedAt: new Date(),
+                    LoginStatus: login_status_enum_1.LoginStatusEnum.SUCCESS,
                     dbTransaction,
                 });
                 const is2FAEnabledYN = config_1.ComponentConfig.getComponentConfigValue('@tomei/sso', 'is2FAEnabledYN');
@@ -409,6 +421,14 @@ class LoginUser extends general_1.LoginUserBase {
                 return `${this.UserId}:${sessionId}`;
             }
             catch (error) {
+                yield LoginUser._LoginHistoryRepository.create({
+                    UserId: this.UserId,
+                    SystemCode: systemCode,
+                    OriginIp: ipAddress,
+                    LoginStatus: login_status_enum_1.LoginStatusEnum.FAILURE,
+                    CreatedAt: new Date(),
+                    dbTransaction,
+                });
                 throw error;
             }
         });
@@ -581,11 +601,11 @@ class LoginUser extends general_1.LoginUserBase {
                 let privileges = [];
                 const groupPrivileges = [];
                 for (const groupPrivilege of group.GroupPrivileges) {
-                    groupPrivileges.push(groupPrivilege.Privilege.Name);
+                    groupPrivileges.push(groupPrivilege.Privilege.PrivilegeCode);
                 }
                 const ops = [];
                 for (const objectPrivilege of objectPrivileges) {
-                    ops.push(objectPrivilege.Privilege.Name);
+                    ops.push(objectPrivilege.Privilege.PrivilegeCode);
                 }
                 privileges = [...privileges, ...groupPrivileges, ...ops];
                 if (group.ParentGroupCode && group.InheritParentPrivilegeYN === 'Y') {
@@ -616,7 +636,7 @@ class LoginUser extends general_1.LoginUserBase {
                     },
                     transaction: dbTransaction,
                 });
-                const privileges = userPrivileges.map((u) => u.Privilege.Name);
+                const privileges = userPrivileges.map((u) => u.Privilege.PrivilegeCode);
                 return privileges;
             }
             catch (error) {
@@ -640,7 +660,7 @@ class LoginUser extends general_1.LoginUserBase {
                     },
                     transaction: dbTransaction,
                 });
-                const privilegesCodes = userObjectPrivileges.map((u) => u.Privilege.Name);
+                const privilegesCodes = userObjectPrivileges.map((u) => u.Privilege.PrivilegeCode);
                 return privilegesCodes;
             }
             catch (error) {
@@ -709,13 +729,16 @@ class LoginUser extends general_1.LoginUserBase {
     static checkUserInfoDuplicated(dbTransaction, query) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const { Email, IdType, IdNo, ContactNo } = query;
+                const { Email, UserName, IdType, IdNo, ContactNo } = query;
                 const where = {
                     [sequelize_1.Op.or]: {},
                 };
                 if (Email) {
                     where[sequelize_1.Op.or]['Email'] = Email;
                 }
+                if (UserName) {
+                    where[sequelize_1.Op.or]['UserName'] = UserName;
+                }
                 if (IdType && IdNo) {
                     where[sequelize_1.Op.or]['IdType'] = IdType;
                     where[sequelize_1.Op.or]['IdNo'] = IdNo;
@@ -876,11 +899,12 @@ class LoginUser extends general_1.LoginUserBase {
                 if (!isPrivileged) {
                     throw new general_1.ClassError('LoginUser', 'LoginUserErrMsg0X', 'You do not have the privilege to create user');
                 }
-                if (!user.Email) {
-                    throw new general_1.ClassError('LoginUser', 'LoginUserErrMsg0X', 'Email is required');
+                if (!user.Email && !user.UserName) {
+                    throw new general_1.ClassError('LoginUser', 'LoginUserErrMsg0X', 'Email and Username is required');
                 }
                 yield LoginUser.checkUserInfoDuplicated(dbTransaction, {
                     Email: user.Email,
+                    UserName: user.UserName,
                     IdType: user.IDType,
                     IdNo: user.IDNo,
                     ContactNo: user.ContactNo,
@@ -888,6 +912,7 @@ class LoginUser extends general_1.LoginUserBase {
                 const defaultPassword = LoginUser.generateDefaultPassword();
                 user = yield LoginUser.setPassword(dbTransaction, user, defaultPassword);
                 const userInfo = {
+                    UserName: user.UserName,
                     FullName: user.FullName,
                     IDNo: user.IDNo,
                     Email: user.Email,
@@ -912,6 +937,7 @@ class LoginUser extends general_1.LoginUserBase {
                 };
                 const newUser = yield LoginUser._Repository.create({
                     Email: userInfo.Email,
+                    UserName: userInfo.UserName,
                     Password: userInfo.Password,
                     Status: userInfo.Status,
                     DefaultPasswordChangedYN: userInfo.DefaultPasswordChangedYN,