@tomei/sso 0.60.4-dev.1 → 0.60.4-dev.11

package/dist/src/components/login-history/login-history.repository.d.ts

@@ -1,5 +1,5 @@
-import LoginHistory from '../../models/login-history.entity';
+import LoginHistoryModel from '../../models/login-history.entity';
 import { RepositoryBase, IRepositoryBase } from '@tomei/general';
-export declare class LoginHistoryRepository extends RepositoryBase<LoginHistory> implements IRepositoryBase<LoginHistory> {
+export declare class LoginHistoryRepository extends RepositoryBase<LoginHistoryModel> implements IRepositoryBase<LoginHistoryModel> {
     constructor();
 }

package/dist/src/components/login-history/login-history.repository.js.map

@@ -1 +1 @@
-{"version":3,"file":"login-history.repository.js","sourceRoot":"","sources":["../../../../src/components/login-history/login-history.repository.ts"],"names":[],"mappings":";;;AAAA,4EAA6D;AAC7D,4CAAiE;AAEjE,MAAa,sBACX,SAAQ,wBAA4B;IAGpC;QACE,KAAK,CAAC,8BAAY,CAAC,CAAC;IACtB,CAAC;CACF;AAPD,wDAOC"}
+{"version":3,"file":"login-history.repository.js","sourceRoot":"","sources":["../../../../src/components/login-history/login-history.repository.ts"],"names":[],"mappings":";;;AAAA,4EAAkE;AAClE,4CAAiE;AAEjE,MAAa,sBACX,SAAQ,wBAAiC;IAGzC;QACE,KAAK,CAAC,8BAAiB,CAAC,CAAC;IAC3B,CAAC;CACF;AAPD,wDAOC"}

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

@@ -18,6 +18,7 @@ export interface IUserAttr extends IUserInfo {
     LastLoginAt: Date;
     MFAEnabled: number;
     MFAConfig: string;
+    MFABypassYN: string;
     RecoveryEmail: string;
     FailedLoginAttemptCount: number;
     LastFailedLoginAt: Date;

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

@@ -64,6 +64,7 @@ class LoginUser extends user_1.User {
                         LastLoginAt: user.LastLoginAt,
                         MFAEnabled: user.MFAEnabled,
                         MFAConfig: user.MFAConfig,
+                        MFABypassYN: user.MFABypassYN,
                         RecoveryEmail: user.RecoveryEmail,
                         FailedLoginAttemptCount: user.FailedLoginAttemptCount,
                         LastFailedLoginAt: user.LastFailedLoginAt,

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

@@ -1 +1 @@
-{"version":3,"file":"login-user.js","sourceRoot":"","sources":["../../../../src/components/login-user/login-user.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"login-user.js","sourceRoot":"","sources":["../../../../src/components/login-user/login-user.ts"],"names":[],"mappings":"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"}

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

@@ -25,6 +25,7 @@ export declare class User extends UserBase {
     private _LastLoginAt;
     private _MFAEnabled;
     private _MFAConfig;
+    private _MFABypassYN;
     private _RecoveryEmail;
     private _FailedLoginAttemptCount;
     private _LastFailedLoginAt;
@@ -74,6 +75,8 @@ export declare class User extends UserBase {
     private set MFAEnabled(value);
     get MFAConfig(): string;
     private set MFAConfig(value);
+    get MFABypassYN(): string;
+    private set MFABypassYN(value);
     get RecoveryEmail(): string;
     private set RecoveryEmail(value);
     get FailedLoginAttemptCount(): number;
@@ -133,9 +136,28 @@ export declare class User extends UserBase {
     protected static combineSystemAccess(loginUser: User, dbTransaction: any, groups: any): Promise<ISystemAccess[]>;
     private static check2FA;
     static setup2FA(userId: number, dbTransaction: any): Promise<any>;
-    verify2FASetup(userId: number, mfaToken: string, systemCode?: string, dbTransaction?: any): Promise<string | false>;
-    verify2FACode(userId: number, mfaToken: string, systemCode?: string, dbTransaction?: any): Promise<string | false>;
-    bypass2FA(systemCode: string, dbTransaction: any): Promise<string>;
+    verify2FASetup(userId: number, mfaToken: string, systemCode?: string, dbTransaction?: any): Promise<{
+        success: boolean;
+        reason: string;
+        sessionId?: undefined;
+    } | {
+        success: boolean;
+        sessionId: string;
+        reason?: undefined;
+    }>;
+    verify2FACode(userId: number, mfaToken: string, systemCode?: string, dbTransaction?: any): Promise<{
+        success: boolean;
+        reason: string;
+        sessionId?: undefined;
+    } | {
+        success: boolean;
+        sessionId: string;
+        reason?: undefined;
+    }>;
+    bypass2FA(systemCode: string, dbTransaction: any): Promise<{
+        success: boolean;
+        sessionId: string;
+    }>;
     addUserGroup(GroupCode: string, loginUser: User, dbTransaction: any): Promise<void>;
     update(data: {
         UserName: string;
@@ -169,4 +191,7 @@ export declare class User extends UserBase {
         Name: string;
         Rank: number;
     }[]>;
+    enable2FABypass(loginUser: LoginUser, dbTransaction: any): Promise<void>;
+    disable2FABypass(loginUser: LoginUser, dbTransaction: any): Promise<void>;
+    reset2FA(loginUser: LoginUser, dbTransaction: any): Promise<void>;
 }

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

@@ -100,6 +100,12 @@ class User extends general_1.UserBase {
     set MFAConfig(value) {
         this._MFAConfig = value;
     }
+    get MFABypassYN() {
+        return this._MFABypassYN;
+    }
+    set MFABypassYN(value) {
+        this._MFABypassYN = value;
+    }
     get RecoveryEmail() {
         return this._RecoveryEmail;
     }
@@ -203,6 +209,7 @@ class User extends general_1.UserBase {
             this.LastLoginAt = userInfo.LastLoginAt;
             this.MFAEnabled = userInfo.MFAEnabled;
             this.MFAConfig = userInfo.MFAConfig;
+            this.MFABypassYN = userInfo.MFABypassYN;
             this.RecoveryEmail = userInfo.RecoveryEmail;
             this.FailedLoginAttemptCount = userInfo.FailedLoginAttemptCount;
             this.LastFailedLoginAt = userInfo.LastFailedLoginAt;
@@ -253,6 +260,7 @@ class User extends general_1.UserBase {
                         LastLoginAt: user.LastLoginAt,
                         MFAEnabled: user.MFAEnabled,
                         MFAConfig: user.MFAConfig,
+                        MFABypassYN: user.MFABypassYN,
                         RecoveryEmail: user.RecoveryEmail,
                         FailedLoginAttemptCount: user.FailedLoginAttemptCount,
                         LastFailedLoginAt: user.LastFailedLoginAt,
@@ -312,6 +320,7 @@ class User extends general_1.UserBase {
                         LastLoginAt: user.LastLoginAt,
                         MFAEnabled: user.MFAEnabled,
                         MFAConfig: user.MFAConfig,
+                        MFABypassYN: user.MFABypassYN,
                         RecoveryEmail: user.RecoveryEmail,
                         FailedLoginAttemptCount: user.FailedLoginAttemptCount,
                         LastFailedLoginAt: user.LastFailedLoginAt,
@@ -389,6 +398,7 @@ class User extends general_1.UserBase {
                             LastLoginAt: user.LastLoginAt,
                             MFAEnabled: user.MFAEnabled,
                             MFAConfig: user.MFAConfig,
+                            MFABypassYN: user.MFABypassYN,
                             RecoveryEmail: user.RecoveryEmail,
                             FailedLoginAttemptCount: user.FailedLoginAttemptCount,
                             LastFailedLoginAt: user.LastFailedLoginAt,
@@ -441,7 +451,7 @@ class User extends general_1.UserBase {
                         },
                     });
                     if (!system) {
-                        throw new Error('Invalid credentials.');
+                        throw new Error('Access denied: invalid or unauthorized system.');
                     }
                     const passwordHashService = new password_hash_service_1.PasswordHashService();
                     const isPasswordValid = yield passwordHashService.verify(password, this.Password);
@@ -456,13 +466,13 @@ class User extends general_1.UserBase {
                             this.Status = enum_1.UserStatus.ACTIVE;
                         }
                         else {
-                            throw new Error('Invalid credentials.');
+                            throw new Error('Your account has been locked. Please contact the administrator for assistance.');
                         }
                     }
                 }
                 catch (error) {
                     yield this.incrementFailedLoginAttemptCount(dbTransaction);
-                    throw new Error('Invalid credentials.');
+                    throw error;
                 }
                 const system = yield User._SystemRepository.findOne({
                     where: {
@@ -1076,6 +1086,7 @@ class User extends general_1.UserBase {
                     LastLoginAt: null,
                     MFAEnabled: null,
                     MFAConfig: null,
+                    MFABypassYN: yn_enum_1.YN.No,
                     RecoveryEmail: null,
                     FailedLoginAttemptCount: 0,
                     LastFailedLoginAt: null,
@@ -1164,7 +1175,7 @@ class User extends general_1.UserBase {
                 throw new general_1.ClassError('LoginUser', 'LoginUserErrMsg0X', 'Your account has been locked due to too many failed login attempts, please contact IT Support for instructions on how to unlock your account');
             }
             if (this.Status == enum_1.UserStatus.LOCKED) {
-                throw new general_1.ClassError('LoginUser', 'LoginUserErrMsg0X', 'Invalid credentials.');
+                throw new general_1.ClassError('LoginUser', 'LoginUserErrMsg0X', 'Your account has been locked due to too many failed login attempts, please contact IT Support for instructions on how to unlock your account.');
             }
         });
     }
@@ -1212,7 +1223,7 @@ class User extends general_1.UserBase {
                 transaction: dbTransaction,
             });
             let systemAccesses = dataSystemAccesses;
-            if (group.InheritParentPrivilegeYN === 'Y' && group.ParentGroupCode) {
+            if (group.InheritParentSystemAccessYN === 'Y' && group.ParentGroupCode) {
                 const GroupCode = group.ParentGroupCode;
                 const parentGroup = yield User._GroupRepo.findByPk(GroupCode, dbTransaction);
                 const dataParentSystemAccesses = yield User.getInheritedSystemAccess(dbTransaction, parentGroup);
@@ -1337,13 +1348,31 @@ class User extends general_1.UserBase {
                     console.error('Invalid JSON string on MFAConfig:', error);
                 }
             }
-            const isVerified = yield speakeasy.totp.verify({
+            const isCurrentValid = yield speakeasy.totp.verify({
                 secret: userMFAConfig.totp.secret,
                 encoding: 'base32',
                 token: mfaToken,
+                window: 0,
             });
-            if (!isVerified) {
-                return false;
+            if (!isCurrentValid) {
+                const isExpired = yield speakeasy.totp.verify({
+                    secret: userMFAConfig.totp.secret,
+                    encoding: 'base32',
+                    token: mfaToken,
+                    window: 2,
+                });
+                if (isExpired) {
+                    return {
+                        success: false,
+                        reason: 'MFA token has expired. Please try again.',
+                    };
+                }
+                else {
+                    return {
+                        success: false,
+                        reason: 'Invalid MFA token. Check your authenticator app.',
+                    };
+                }
             }
             user.MFAEnabled = 1;
             yield user.save({ transaction: dbTransaction });
@@ -1356,7 +1385,7 @@ class User extends general_1.UserBase {
                 systemCode = config_1.ApplicationConfig.getComponentConfigValue('system-code');
             }
             const systemLogin = userSession.systemLogins.find((e) => e.code === systemCode);
-            return `${userId}:${systemLogin.sessionId}`;
+            return { success: true, sessionId: `${userId}:${systemLogin.sessionId}` };
         });
     }
     verify2FACode(userId, mfaToken, systemCode, dbTransaction) {
@@ -1379,13 +1408,31 @@ class User extends general_1.UserBase {
                     console.error('Invalid JSON string on MFAConfig:', error);
                 }
             }
-            const isVerified = yield speakeasy.totp.verify({
+            const isCurrentValid = yield speakeasy.totp.verify({
                 secret: userMFAConfig.totp.secret,
                 encoding: 'base32',
                 token: mfaToken,
+                window: 0,
             });
-            if (!isVerified) {
-                return false;
+            if (!isCurrentValid) {
+                const isExpired = yield speakeasy.totp.verify({
+                    secret: userMFAConfig.totp.secret,
+                    encoding: 'base32',
+                    token: mfaToken,
+                    window: 2,
+                });
+                if (isExpired) {
+                    return {
+                        success: false,
+                        reason: 'MFA token has expired. Please try again.',
+                    };
+                }
+                else {
+                    return {
+                        success: false,
+                        reason: 'Invalid MFA token. Check your authenticator app.',
+                    };
+                }
             }
             const sessionName = config_1.ApplicationConfig.getComponentConfigValue('sessionName');
             if (!sessionName) {
@@ -1396,7 +1443,7 @@ class User extends general_1.UserBase {
                 systemCode = config_1.ApplicationConfig.getComponentConfigValue('system-code');
             }
             const systemLogin = userSession.systemLogins.find((e) => e.code === systemCode);
-            return `${userId}:${systemLogin.sessionId}`;
+            return { success: true, sessionId: `${userId}:${systemLogin.sessionId}` };
         });
     }
     bypass2FA(systemCode, dbTransaction) {
@@ -1420,7 +1467,10 @@ class User extends general_1.UserBase {
                     systemCode = config_1.ApplicationConfig.getComponentConfigValue('system-code');
                 }
                 const systemLogin = userSession.systemLogins.find((e) => e.code === systemCode);
-                return `${this.UserId}:${systemLogin.sessionId}`;
+                return {
+                    success: true,
+                    sessionId: `${this.UserId}:${systemLogin.sessionId}`,
+                };
             }
             catch (error) {
                 throw error;
@@ -1750,6 +1800,7 @@ class User extends general_1.UserBase {
                 LastLoginAt: user.LastLoginAt,
                 MFAEnabled: user.MFAEnabled,
                 MFAConfig: user.MFAConfig,
+                MFABypassYN: user.MFABypassYN,
                 RecoveryEmail: user.RecoveryEmail,
                 FailedLoginAttemptCount: user.FailedLoginAttemptCount,
                 LastFailedLoginAt: user.LastFailedLoginAt,
@@ -1832,6 +1883,7 @@ class User extends general_1.UserBase {
                     LastLoginAt: user.LastLoginAt,
                     MFAEnabled: user.MFAEnabled,
                     MFAConfig: user.MFAConfig,
+                    MFABypassYN: user.MFABypassYN,
                     RecoveryEmail: user.RecoveryEmail,
                     FailedLoginAttemptCount: user.FailedLoginAttemptCount,
                     LastFailedLoginAt: user.LastFailedLoginAt,
@@ -1877,6 +1929,7 @@ class User extends general_1.UserBase {
                     LastLoginAt: this.LastLoginAt,
                     MFAEnabled: this.MFAEnabled,
                     MFAConfig: this.MFAConfig,
+                    MFABypassYN: this.MFABypassYN,
                     RecoveryEmail: this.RecoveryEmail,
                     FailedLoginAttemptCount: this.FailedLoginAttemptCount,
                     LastFailedLoginAt: this.LastFailedLoginAt,
@@ -1906,6 +1959,7 @@ class User extends general_1.UserBase {
                     LastLoginAt: this.LastLoginAt,
                     MFAEnabled: this.MFAEnabled,
                     MFAConfig: this.MFAConfig,
+                    MFABypassYN: this.MFABypassYN,
                     RecoveryEmail: this.RecoveryEmail,
                     FailedLoginAttemptCount: this.FailedLoginAttemptCount,
                     LastFailedLoginAt: this.LastFailedLoginAt,
@@ -1967,6 +2021,7 @@ class User extends general_1.UserBase {
                     LastLoginAt: this.LastLoginAt,
                     MFAEnabled: this.MFAEnabled,
                     MFAConfig: this.MFAConfig,
+                    MFABypassYN: this.MFABypassYN,
                     RecoveryEmail: this.RecoveryEmail,
                     FailedLoginAttemptCount: this.FailedLoginAttemptCount,
                     LastFailedLoginAt: this.LastFailedLoginAt,
@@ -1996,6 +2051,7 @@ class User extends general_1.UserBase {
                     LastLoginAt: this.LastLoginAt,
                     MFAEnabled: this.MFAEnabled,
                     MFAConfig: this.MFAConfig,
+                    MFABypassYN: this.MFABypassYN,
                     RecoveryEmail: this.RecoveryEmail,
                     FailedLoginAttemptCount: this.FailedLoginAttemptCount,
                     LastFailedLoginAt: this.LastFailedLoginAt,
@@ -2122,6 +2178,293 @@ class User extends general_1.UserBase {
             }
         });
     }
+    enable2FABypass(loginUser, dbTransaction) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                if (this.MFABypassYN === yn_enum_1.YN.Yes) {
+                    throw new general_1.ClassError('User', 'UserErrMsg0X', 'Bypass already enabled.', 'enable2FABypass');
+                }
+                const systemCode = config_1.ApplicationConfig.getComponentConfigValue('system-code');
+                const isPrivileged = yield loginUser.checkPrivileges(systemCode, 'MANAGE_MFA');
+                if (!isPrivileged) {
+                    throw new general_1.ClassError('LoginUser', 'LoginUserErrMsg0X', 'You do not have permission to enable MFA bypass.');
+                }
+                const entityValueBefore = {
+                    UserId: this.UserId,
+                    UserName: this.UserName,
+                    FullName: this.FullName,
+                    IDNo: this.IDNo,
+                    IDType: this.IDType,
+                    ContactNo: this.ContactNo,
+                    Email: this.Email,
+                    Password: this.Password,
+                    Status: this.Status,
+                    DefaultPasswordChangedYN: this.DefaultPasswordChangedYN,
+                    FirstLoginAt: this.FirstLoginAt,
+                    LastLoginAt: this.LastLoginAt,
+                    MFAEnabled: this.MFAEnabled,
+                    MFAConfig: this.MFAConfig,
+                    MFABypassYN: this.MFABypassYN,
+                    RecoveryEmail: this.RecoveryEmail,
+                    FailedLoginAttemptCount: this.FailedLoginAttemptCount,
+                    LastFailedLoginAt: this.LastFailedLoginAt,
+                    LastPasswordChangedAt: this.LastPasswordChangedAt,
+                    NeedToChangePasswordYN: this.NeedToChangePasswordYN,
+                    CreatedById: this.CreatedById,
+                    CreatedAt: this.CreatedAt,
+                    UpdatedById: this.UpdatedById,
+                    UpdatedAt: this.UpdatedAt,
+                    PasscodeHash: this.PasscodeHash,
+                    PasscodeUpdatedAt: this.PasscodeUpdatedAt,
+                };
+                this.MFABypassYN = yn_enum_1.YN.Yes;
+                this.UpdatedAt = new Date();
+                this.UpdatedById = loginUser.UserId;
+                yield User._Repository.update({
+                    MFABypassYN: this.MFABypassYN,
+                    UpdatedAt: this.UpdatedAt,
+                    UpdatedById: this.UpdatedById,
+                }, {
+                    where: {
+                        UserId: this.UserId,
+                    },
+                    transaction: dbTransaction,
+                });
+                const entityValueAfter = {
+                    UserId: this.UserId,
+                    UserName: this.UserName,
+                    FullName: this.FullName,
+                    IDNo: this.IDNo,
+                    IDType: this.IDType,
+                    ContactNo: this.ContactNo,
+                    Email: this.Email,
+                    Password: this.Password,
+                    Status: this.Status,
+                    DefaultPasswordChangedYN: this.DefaultPasswordChangedYN,
+                    FirstLoginAt: this.FirstLoginAt,
+                    LastLoginAt: this.LastLoginAt,
+                    MFAEnabled: this.MFAEnabled,
+                    MFAConfig: this.MFAConfig,
+                    MFABypassYN: this.MFABypassYN,
+                    RecoveryEmail: this.RecoveryEmail,
+                    FailedLoginAttemptCount: this.FailedLoginAttemptCount,
+                    LastFailedLoginAt: this.LastFailedLoginAt,
+                    LastPasswordChangedAt: this.LastPasswordChangedAt,
+                    NeedToChangePasswordYN: this.NeedToChangePasswordYN,
+                    CreatedById: this.CreatedById,
+                    CreatedAt: this.CreatedAt,
+                    UpdatedById: this.UpdatedById,
+                    UpdatedAt: this.UpdatedAt,
+                    PasscodeHash: this.PasscodeHash,
+                    PasscodeUpdatedAt: this.PasscodeUpdatedAt,
+                };
+                const activity = new activity_history_1.Activity();
+                activity.ActivityId = activity.createId();
+                activity.Action = activity_history_1.ActionEnum.UPDATE;
+                activity.Description = `Enable 2FA Bypass For User ${this.Email}`;
+                activity.EntityType = this.ObjectType;
+                activity.EntityId = this.UserId.toString();
+                activity.EntityValueBefore = JSON.stringify(entityValueBefore);
+                activity.EntityValueAfter = JSON.stringify(entityValueAfter);
+                yield activity.create(loginUser.ObjectId, dbTransaction);
+            }
+            catch (error) {
+                throw error;
+            }
+        });
+    }
+    disable2FABypass(loginUser, dbTransaction) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                if (this.MFABypassYN === yn_enum_1.YN.No) {
+                    throw new general_1.ClassError('User', 'UserErrMsg0X', 'Bypass already disabled.', 'disable2FABypass');
+                }
+                const systemCode = config_1.ApplicationConfig.getComponentConfigValue('system-code');
+                const isPrivileged = yield loginUser.checkPrivileges(systemCode, 'MANAGE_MFA');
+                if (!isPrivileged) {
+                    throw new general_1.ClassError('LoginUser', 'LoginUserErrMsg0X', 'You do not have permission to enable MFA bypass.');
+                }
+                const entityValueBefore = {
+                    UserId: this.UserId,
+                    UserName: this.UserName,
+                    FullName: this.FullName,
+                    IDNo: this.IDNo,
+                    IDType: this.IDType,
+                    ContactNo: this.ContactNo,
+                    Email: this.Email,
+                    Password: this.Password,
+                    Status: this.Status,
+                    DefaultPasswordChangedYN: this.DefaultPasswordChangedYN,
+                    FirstLoginAt: this.FirstLoginAt,
+                    LastLoginAt: this.LastLoginAt,
+                    MFAEnabled: this.MFAEnabled,
+                    MFAConfig: this.MFAConfig,
+                    MFABypassYN: this.MFABypassYN,
+                    RecoveryEmail: this.RecoveryEmail,
+                    FailedLoginAttemptCount: this.FailedLoginAttemptCount,
+                    LastFailedLoginAt: this.LastFailedLoginAt,
+                    LastPasswordChangedAt: this.LastPasswordChangedAt,
+                    NeedToChangePasswordYN: this.NeedToChangePasswordYN,
+                    CreatedById: this.CreatedById,
+                    CreatedAt: this.CreatedAt,
+                    UpdatedById: this.UpdatedById,
+                    UpdatedAt: this.UpdatedAt,
+                    PasscodeHash: this.PasscodeHash,
+                    PasscodeUpdatedAt: this.PasscodeUpdatedAt,
+                };
+                this.MFABypassYN = yn_enum_1.YN.No;
+                this.UpdatedAt = new Date();
+                this.UpdatedById = loginUser.UserId;
+                yield User._Repository.update({
+                    MFABypassYN: this.MFABypassYN,
+                    UpdatedAt: this.UpdatedAt,
+                    UpdatedById: this.UpdatedById,
+                }, {
+                    where: {
+                        UserId: this.UserId,
+                    },
+                    transaction: dbTransaction,
+                });
+                const entityValueAfter = {
+                    UserId: this.UserId,
+                    UserName: this.UserName,
+                    FullName: this.FullName,
+                    IDNo: this.IDNo,
+                    IDType: this.IDType,
+                    ContactNo: this.ContactNo,
+                    Email: this.Email,
+                    Password: this.Password,
+                    Status: this.Status,
+                    DefaultPasswordChangedYN: this.DefaultPasswordChangedYN,
+                    FirstLoginAt: this.FirstLoginAt,
+                    LastLoginAt: this.LastLoginAt,
+                    MFAEnabled: this.MFAEnabled,
+                    MFAConfig: this.MFAConfig,
+                    MFABypassYN: this.MFABypassYN,
+                    RecoveryEmail: this.RecoveryEmail,
+                    FailedLoginAttemptCount: this.FailedLoginAttemptCount,
+                    LastFailedLoginAt: this.LastFailedLoginAt,
+                    LastPasswordChangedAt: this.LastPasswordChangedAt,
+                    NeedToChangePasswordYN: this.NeedToChangePasswordYN,
+                    CreatedById: this.CreatedById,
+                    CreatedAt: this.CreatedAt,
+                    UpdatedById: this.UpdatedById,
+                    UpdatedAt: this.UpdatedAt,
+                    PasscodeHash: this.PasscodeHash,
+                    PasscodeUpdatedAt: this.PasscodeUpdatedAt,
+                };
+                const activity = new activity_history_1.Activity();
+                activity.ActivityId = activity.createId();
+                activity.Action = activity_history_1.ActionEnum.UPDATE;
+                activity.Description = `Disable 2FA Bypass For User ${this.Email}`;
+                activity.EntityType = this.ObjectType;
+                activity.EntityId = this.UserId.toString();
+                activity.EntityValueBefore = JSON.stringify(entityValueBefore);
+                activity.EntityValueAfter = JSON.stringify(entityValueAfter);
+                yield activity.create(loginUser.ObjectId, dbTransaction);
+            }
+            catch (error) {
+                throw error;
+            }
+        });
+    }
+    reset2FA(loginUser, dbTransaction) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                if (this.MFAEnabled === 0) {
+                    throw new general_1.ClassError('User', 'UserErrMsg0X', 'User not yet setup 2FA.', 'reset2FA');
+                }
+                const systemCode = config_1.ApplicationConfig.getComponentConfigValue('system-code');
+                const isPrivileged = yield loginUser.checkPrivileges(systemCode, 'MANAGE_MFA');
+                if (!isPrivileged) {
+                    throw new general_1.ClassError('LoginUser', 'LoginUserErrMsg0X', 'You do not have permission to reset 2FA.');
+                }
+                const entityValueBefore = {
+                    UserId: this.UserId,
+                    UserName: this.UserName,
+                    FullName: this.FullName,
+                    IDNo: this.IDNo,
+                    IDType: this.IDType,
+                    ContactNo: this.ContactNo,
+                    Email: this.Email,
+                    Password: this.Password,
+                    Status: this.Status,
+                    DefaultPasswordChangedYN: this.DefaultPasswordChangedYN,
+                    FirstLoginAt: this.FirstLoginAt,
+                    LastLoginAt: this.LastLoginAt,
+                    MFAEnabled: this.MFAEnabled,
+                    MFAConfig: this.MFAConfig,
+                    MFABypassYN: this.MFABypassYN,
+                    RecoveryEmail: this.RecoveryEmail,
+                    FailedLoginAttemptCount: this.FailedLoginAttemptCount,
+                    LastFailedLoginAt: this.LastFailedLoginAt,
+                    LastPasswordChangedAt: this.LastPasswordChangedAt,
+                    NeedToChangePasswordYN: this.NeedToChangePasswordYN,
+                    CreatedById: this.CreatedById,
+                    CreatedAt: this.CreatedAt,
+                    UpdatedById: this.UpdatedById,
+                    UpdatedAt: this.UpdatedAt,
+                    PasscodeHash: this.PasscodeHash,
+                    PasscodeUpdatedAt: this.PasscodeUpdatedAt,
+                };
+                this.MFAEnabled = 0;
+                this.MFABypassYN = yn_enum_1.YN.No;
+                this.UpdatedAt = new Date();
+                this.UpdatedById = loginUser.UserId;
+                yield User._Repository.update({
+                    MFAEnabled: this.MFAEnabled,
+                    MFABypassYN: this.MFABypassYN,
+                    UpdatedAt: this.UpdatedAt,
+                    UpdatedById: this.UpdatedById,
+                }, {
+                    where: {
+                        UserId: this.UserId,
+                    },
+                    transaction: dbTransaction,
+                });
+                const entityValueAfter = {
+                    UserId: this.UserId,
+                    UserName: this.UserName,
+                    FullName: this.FullName,
+                    IDNo: this.IDNo,
+                    IDType: this.IDType,
+                    ContactNo: this.ContactNo,
+                    Email: this.Email,
+                    Password: this.Password,
+                    Status: this.Status,
+                    DefaultPasswordChangedYN: this.DefaultPasswordChangedYN,
+                    FirstLoginAt: this.FirstLoginAt,
+                    LastLoginAt: this.LastLoginAt,
+                    MFAEnabled: this.MFAEnabled,
+                    MFAConfig: this.MFAConfig,
+                    MFABypassYN: this.MFABypassYN,
+                    RecoveryEmail: this.RecoveryEmail,
+                    FailedLoginAttemptCount: this.FailedLoginAttemptCount,
+                    LastFailedLoginAt: this.LastFailedLoginAt,
+                    LastPasswordChangedAt: this.LastPasswordChangedAt,
+                    NeedToChangePasswordYN: this.NeedToChangePasswordYN,
+                    CreatedById: this.CreatedById,
+                    CreatedAt: this.CreatedAt,
+                    UpdatedById: this.UpdatedById,
+                    UpdatedAt: this.UpdatedAt,
+                    PasscodeHash: this.PasscodeHash,
+                    PasscodeUpdatedAt: this.PasscodeUpdatedAt,
+                };
+                const activity = new activity_history_1.Activity();
+                activity.ActivityId = activity.createId();
+                activity.Action = activity_history_1.ActionEnum.UPDATE;
+                activity.Description = `Reset 2FA for User ${this.Email}`;
+                activity.EntityType = this.ObjectType;
+                activity.EntityId = this.UserId.toString();
+                activity.EntityValueBefore = JSON.stringify(entityValueBefore);
+                activity.EntityValueAfter = JSON.stringify(entityValueAfter);
+                yield activity.create(loginUser.ObjectId, dbTransaction);
+            }
+            catch (error) {
+                throw error;
+            }
+        });
+    }
 }
 exports.User = User;
 User._Repository = new user_repository_1.UserRepository();