@tomei/sso 0.34.5 → 0.34.7

package/migrations/20240314080602-create-user-table.js

@@ -10,6 +10,10 @@ module.exports = {
         allowNull: false,
         autoIncrement: true,
       },
+      UserName: {
+        type: Sequelize.STRING(50),
+        allowNull: true,
+      },
       Email: {
         type: Sequelize.STRING,
         allowNull: false,
@@ -19,6 +23,22 @@ module.exports = {
         type: Sequelize.STRING,
         allowNull: false,
       },
+      FullName: {
+        type: Sequelize.STRING(200),
+        allowNull: false,
+      },
+      IdNo: {
+        type: Sequelize.STRING(50),
+        allowNull: true,
+      },
+      IdType: {
+        type: Sequelize.STRING(20),
+        allowNull: true,
+      },
+      ContactNo: {
+        type: Sequelize.STRING(20),
+        allowNull: true,
+      },
       Status: {
         type: Sequelize.STRING,
         allowNull: false,
@@ -27,10 +47,6 @@ module.exports = {
         type: Sequelize.CHAR(1),
         allowNull: true,
       },
-      UserName: {
-        type: Sequelize.STRING(50),
-        allowNull: true,
-      },
       FirstLoginAt: {
         type: Sequelize.DATE,
         allowNull: true,
@@ -84,7 +100,9 @@ module.exports = {
       },
       UpdatedAt: {
         allowNull: false,
-        defaultValue: Sequelize.literal('CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3)'),
+        defaultValue: Sequelize.literal(
+          'CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3)',
+        ),
         type: Sequelize.DATE,
       },
       UpdatedById: {
@@ -97,12 +115,10 @@ module.exports = {
         onDelete: 'CASCADE',
         onUpdate: 'CASCADE',
       },
-
     });
   },
 
   async down(queryInterface, Sequelize) {
-     await queryInterface.dropTable('sso_User');
-
-  }
+    await queryInterface.dropTable('sso_User');
+  },
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tomei/sso",
-  "version": "0.34.5",
+  "version": "0.34.7",
   "description": "Tomei SSO Package",
   "main": "dist/index.js",
   "scripts": {

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

@@ -4,6 +4,7 @@ import { YN } from '../../../enum/yn.enum';
 export interface IUserInfo {
   FullName: string;
   IDNo: string;
+  IDType: string;
   Email: string;
   ContactNo: string;
   UserName: string;

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

@@ -43,9 +43,10 @@ export class LoginUser extends User implements ILoginUser {
         const userAttr: IUserAttr = {
           UserId: user.UserId,
           UserName: user.UserName,
-          FullName: user?.Staff?.FullName,
-          IDNo: user?.Staff?.IdNo,
-          ContactNo: user?.Staff?.Mobile,
+          FullName: user?.FullName || null,
+          IDNo: user?.IdNo || null,
+          IDType: user?.IdType || null,
+          ContactNo: user?.ContactNo || null,
           Email: user.Email,
           Password: user.Password,
           Status: user.Status,

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

@@ -313,9 +313,10 @@ export class User extends UserBase {
         const userAttr: IUserAttr = {
           UserId: user.UserId,
           UserName: user.UserName,
-          FullName: user?.Staff?.FullName,
-          IDNo: user?.Staff?.IdNo,
-          ContactNo: user?.Staff?.Mobile,
+          FullName: user?.FullName || null,
+          IDNo: user?.IdNo || null,
+          IDType: user?.IdType || null,
+          ContactNo: user?.ContactNo || null,
           Email: user.Email,
           Password: user.Password,
           Status: user.Status,
@@ -405,9 +406,10 @@ export class User extends UserBase {
           const userAttr: IUserAttr = {
             UserId: user.UserId,
             UserName: user.UserName,
-            FullName: user?.Staff?.FullName || null,
-            IDNo: user?.Staff?.IdNo || null,
-            ContactNo: user?.Staff?.Mobile || null,
+            FullName: user?.FullName || null,
+            IDNo: user?.IdNo || null,
+            IDType: user?.IdType || null,
+            ContactNo: user?.ContactNo || null,
             Email: user.Email,
             Password: user.Password,
             Status: user.Status,
@@ -1316,6 +1318,7 @@ export class User extends UserBase {
         UserName: user.UserName,
         FullName: user.FullName,
         IDNo: user.IDNo,
+        IDType: user.IDType,
         Email: user.Email,
         ContactNo: user.ContactNo,
         Password: user.Password,
@@ -2285,4 +2288,60 @@ export class User extends UserBase {
     //Return Updated User Instance
     return this;
   }
+
+  public static async findById(
+    loginUser: LoginUser,
+    dbTransaction: any,
+    UserId: string,
+  ) {
+    const systemCode = ApplicationConfig.getComponentConfigValue('system-code');
+    const isPrivileged = await loginUser.checkPrivileges(
+      systemCode,
+      'USER_VIEW',
+    );
+
+    //If user does not have privilege to update user, throw a ClassError
+    if (!isPrivileged) {
+      throw new ClassError(
+        'LoginUser',
+        'LoginUserErrMsg0X',
+        'You do not have the privilege to find user',
+      );
+    }
+
+    const user = await User._Repository.findOne({
+      where: {
+        UserId: UserId,
+        Status: 'Active',
+      },
+      transaction: dbTransaction,
+    });
+    const userAttr: IUserAttr = {
+      UserId: user.UserId,
+      UserName: user.UserName,
+      FullName: user?.FullName || null,
+      IDNo: user?.IdNo || null,
+      IDType: user?.IdType || null,
+      ContactNo: user?.ContactNo || null,
+      Email: user.Email,
+      Password: user.Password,
+      Status: user.Status,
+      DefaultPasswordChangedYN: user.DefaultPasswordChangedYN,
+      FirstLoginAt: user.FirstLoginAt,
+      LastLoginAt: user.LastLoginAt,
+      MFAEnabled: user.MFAEnabled,
+      MFAConfig: user.MFAConfig,
+      RecoveryEmail: user.RecoveryEmail,
+      FailedLoginAttemptCount: user.FailedLoginAttemptCount,
+      LastFailedLoginAt: user.LastFailedLoginAt,
+      LastPasswordChangedAt: user.LastPasswordChangedAt,
+      NeedToChangePasswordYN: user.NeedToChangePasswordYN,
+      CreatedById: user.CreatedById,
+      CreatedAt: user.CreatedAt,
+      UpdatedById: user.UpdatedById,
+      UpdatedAt: user.UpdatedAt,
+      staffs: user?.Staff || null,
+    };
+    return new User(null, dbTransaction, userAttr);
+  }
 }

package/src/models/user.entity.ts

@@ -34,6 +34,12 @@ export default class User extends Model {
   })
   UserId: number;
 
+  @Column({
+    allowNull: true,
+    type: DataType.STRING,
+  })
+  UserName: string;
+
   @Column({
     allowNull: false,
     type: DataType.STRING,
@@ -41,16 +47,34 @@ export default class User extends Model {
   Email: string;
 
   @Column({
-    allowNull: true,
+    allowNull: false,
     type: DataType.STRING,
   })
-  UserName: string;
+  Password: string;
 
   @Column({
     allowNull: false,
     type: DataType.STRING,
   })
-  Password: string;
+  FullName: string;
+
+  @Column({
+    allowNull: false,
+    type: DataType.STRING,
+  })
+  IdNo: string;
+
+  @Column({
+    allowNull: false,
+    type: DataType.STRING,
+  })
+  IdType: string;
+
+  @Column({
+    allowNull: false,
+    type: DataType.STRING,
+  })
+  ContactNo: string;
 
   @Column({
     allowNull: false,