@tomei/sso 0.54.1 → 0.55.0

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

@@ -51,6 +51,8 @@ export class User extends UserBase {
   private _LastFailedLoginAt: Date;
   private _LastPasswordChangedAt: Date;
   private _NeedToChangePasswordYN: YN;
+  private _PasscodeHash: string;
+  private _PasscodeUpdatedAt: Date;
   private _CreatedById: number;
   private _CreatedAt: Date;
   private _UpdatedById: number;
@@ -227,6 +229,22 @@ export class User extends UserBase {
     this._UpdatedAt = value;
   }
 
+  get PasscodeHash(): string {
+    return this._PasscodeHash;
+  }
+
+  private set PasscodeHash(value: string) {
+    this._PasscodeHash = value;
+  }
+
+  get PasscodeUpdatedAt(): Date {
+    return this._PasscodeUpdatedAt;
+  }
+
+  private set PasscodeUpdatedAt(value: Date) {
+    this._PasscodeUpdatedAt = value;
+  }
+
   async getDetails(): Promise<{
     FullName: string;
     UserName: string;
@@ -278,6 +296,8 @@ export class User extends UserBase {
       this.LastFailedLoginAt = userInfo.LastFailedLoginAt;
       this.LastPasswordChangedAt = userInfo.LastPasswordChangedAt;
       this.NeedToChangePasswordYN = userInfo.NeedToChangePasswordYN;
+      this.PasscodeHash = userInfo.PasscodeHash;
+      this.PasscodeUpdatedAt = userInfo.PasscodeUpdatedAt;
       this.CreatedById = userInfo.CreatedById;
       this.CreatedAt = userInfo.CreatedAt;
       this.UpdatedById = userInfo.UpdatedById;
@@ -332,6 +352,8 @@ export class User extends UserBase {
           LastFailedLoginAt: user.LastFailedLoginAt,
           LastPasswordChangedAt: user.LastPasswordChangedAt,
           NeedToChangePasswordYN: user.NeedToChangePasswordYN,
+          PasscodeHash: user.PasscodeHash,
+          PasscodeUpdatedAt: user.PasscodeUpdatedAt,
           CreatedById: user.CreatedById,
           CreatedAt: user.CreatedAt,
           UpdatedById: user.UpdatedById,
@@ -394,6 +416,8 @@ export class User extends UserBase {
           LastFailedLoginAt: user.LastFailedLoginAt,
           LastPasswordChangedAt: user.LastPasswordChangedAt,
           NeedToChangePasswordYN: user.NeedToChangePasswordYN,
+          PasscodeHash: user.PasscodeHash,
+          PasscodeUpdatedAt: user.PasscodeUpdatedAt,
           CreatedById: user.CreatedById,
           CreatedAt: user.CreatedAt,
           UpdatedById: user.UpdatedById,
@@ -486,6 +510,8 @@ export class User extends UserBase {
             LastFailedLoginAt: user.LastFailedLoginAt,
             LastPasswordChangedAt: user.LastPasswordChangedAt,
             NeedToChangePasswordYN: user.NeedToChangePasswordYN,
+            PasscodeHash: user.PasscodeHash,
+            PasscodeUpdatedAt: user.PasscodeUpdatedAt,
             CreatedById: user.CreatedById,
             CreatedAt: user.CreatedAt,
             UpdatedById: user.UpdatedById,
@@ -575,6 +601,7 @@ export class User extends UserBase {
         }
       } catch (error) {
         await this.incrementFailedLoginAttemptCount(dbTransaction);
+        throw new Error('Invalid credentials.');
       }
 
       // 2.1:  Call alertNewLogin to check whether the ip used is new ip and alert the user if it's new.
@@ -735,7 +762,7 @@ export class User extends UserBase {
         const userGroups = await User._UserGroupRepo.findAll({
           where: {
             UserId: userId,
-            InheritGroupAccessYN: 'Y',
+            InheritGroupSystemAccessYN: 'Y',
             Status: 'Active',
           },
           include: [
@@ -1508,6 +1535,8 @@ export class User extends UserBase {
         LastPasswordChangedAt: null,
         DefaultPasswordChangedYN: YN.No,
         NeedToChangePasswordYN: YN.Yes,
+        PasscodeHash: null,
+        PasscodeUpdatedAt: null,
         CreatedById: loginUser.UserId,
         CreatedAt: new Date(),
         UpdatedById: loginUser.UserId,
@@ -2583,6 +2612,8 @@ export class User extends UserBase {
       LastFailedLoginAt: user.LastFailedLoginAt,
       LastPasswordChangedAt: user.LastPasswordChangedAt,
       NeedToChangePasswordYN: user.NeedToChangePasswordYN,
+      PasscodeHash: user.PasscodeHash,
+      PasscodeUpdatedAt: user.PasscodeUpdatedAt,
       CreatedById: user.CreatedById,
       CreatedAt: user.CreatedAt,
       UpdatedById: user.UpdatedById,
@@ -2707,6 +2738,8 @@ export class User extends UserBase {
         LastFailedLoginAt: user.LastFailedLoginAt,
         LastPasswordChangedAt: user.LastPasswordChangedAt,
         NeedToChangePasswordYN: user.NeedToChangePasswordYN,
+        PasscodeHash: user.PasscodeHash,
+        PasscodeUpdatedAt: user.PasscodeUpdatedAt,
         CreatedById: user.CreatedById,
         CreatedAt: user.CreatedAt,
         UpdatedById: user.UpdatedById,
@@ -2722,4 +2755,117 @@ export class User extends UserBase {
       throw error;
     }
   }
+
+  async updatePasscode(loginUser: User, passcode: string, dbTransaction: any) {
+    try {
+      // Part 1: Validate Passcode
+      // Make sure passcode is numeric and 6 digit length, if not throw new ClassError by passing:
+      // ClassName: “User”
+      // MessageCode: “UserErrMsg0X”
+      // Message: “Passcode must be 6-digit number.”
+      if (!/^\d{6}$/.test(passcode)) {
+        throw new ClassError(
+          'User',
+          'UserErrMsg0X',
+          'Passcode must be 6-digit number.',
+        );
+      }
+
+      // Part 2: Hash Passcode
+      // Instantiate new PasswordHashService and hash the Params.passcode.
+      const passwordHashService = new PasswordHashService();
+      const passcodeHash = await passwordHashService.hashPassword(passcode);
+
+      // Part 3: Update User Record
+      // Call _repo update method to update:
+      // PasscodeHash: hash from Part 2
+      // PasscodeUpdatedAt: new Date()
+      // where: UserId: loginUser.ObjectId
+      const entityValueBefore: IUserAttr = {
+        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,
+        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.PasscodeHash = passcodeHash;
+      this.PasscodeUpdatedAt = new Date();
+
+      const entityValueAfter: IUserAttr = {
+        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,
+        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,
+      };
+
+      await User._Repository.update(
+        {
+          PasscodeHash: this.PasscodeHash,
+          PasscodeUpdatedAt: this.PasscodeUpdatedAt,
+        },
+        {
+          where: {
+            UserId: this.UserId,
+          },
+          transaction: dbTransaction,
+        },
+      );
+
+      // Record update activity using Activity class create method.
+      const activity = new Activity();
+      activity.ActivityId = activity.createId();
+      activity.Action = ActionEnum.UPDATE;
+      activity.Description = 'Update Passcode';
+      activity.EntityType = 'LoginUser';
+      activity.EntityId = this.UserId.toString();
+      activity.EntityValueBefore = JSON.stringify(entityValueBefore);
+      activity.EntityValueAfter = JSON.stringify(entityValueAfter);
+
+      await activity.create(loginUser.ObjectId, dbTransaction);
+    } catch (error) {
+      throw error;
+    }
+  }
 }

package/src/models/user.entity.ts

@@ -135,6 +135,17 @@ export default class User extends Model {
   })
   NeedToChangePasswordYN: YN;
 
+  @Column({
+    allowNull: true,
+    type: DataType.STRING,
+  })
+  PasscodeHash: string;
+
+  @Column({
+    type: DataType.DATE,
+  })
+  PasscodeUpdatedAt: Date;
+
   @ForeignKey(() => User)
   @Column({
     type: DataType.INTEGER,

package/tsconfig.build.json

@@ -1,6 +1,6 @@
-{
-  "extends": "./tsconfig.json",
-  "include": ["**/*.ts"],
-  "exclude": ["node_modules", "__tests__", "dist", "**/*spec.ts"]
-}
+{
+  "extends": "./tsconfig.json",
+  "include": ["**/*.ts"],
+  "exclude": ["node_modules", "__tests__", "dist", "**/*spec.ts"]
+}
   

package/tsconfig.json

@@ -1,24 +1,24 @@
-{
-  "compilerOptions": {
-    "module": "commonjs",
-    "declaration": true,
-    "removeComments": true,
-    "emitDecoratorMetadata": true,
-    "experimentalDecorators": true,
-    "allowSyntheticDefaultImports": true,
-    "moduleResolution": "node",
-    "target": "es6",
-    "sourceMap": true,
-    "outDir": "./dist",
-    "baseUrl": "./src",
-    "rootDir": "./",
-    "incremental": true,
-    "skipLibCheck": true,
-    "noImplicitAny": false,
-    "strictBindCallApply": false,
-    "forceConsistentCasingInFileNames": false,
-    "noFallthroughCasesInSwitch": false,
-    "strictNullChecks": false,
-  },
-  "exclude": ["node_modules", "dist"]
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "declaration": true,
+    "removeComments": true,
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "allowSyntheticDefaultImports": true,
+    "moduleResolution": "node",
+    "target": "es6",
+    "sourceMap": true,
+    "outDir": "./dist",
+    "baseUrl": "./src",
+    "rootDir": "./",
+    "incremental": true,
+    "skipLibCheck": true,
+    "noImplicitAny": false,
+    "strictBindCallApply": false,
+    "forceConsistentCasingInFileNames": false,
+    "noFallthroughCasesInSwitch": false,
+    "strictNullChecks": false,
+  },
+  "exclude": ["node_modules", "dist"]
 }