@tomei/sso 0.15.3 → 0.15.5

package/__tests__/unit/components/login-user/login-user.spec.ts

@@ -430,7 +430,7 @@ describe('login-user', () => {
     .spyOn(SystemRepository.prototype, 'findOne')
     .mockResolvedValue(system as any);
 
-  jest.spyOn(SMTPMailer.prototype, 'send').mockImplementation(async () => {});
+  jest.spyOn(SMTPMailer.prototype, 'send').mockImplementation(async () => { });
 
   const getUserGroupFromDBMock = jest.spyOn(
     LoginUser.prototype as any,
@@ -503,7 +503,7 @@ describe('login-user', () => {
 
     it('should able to do login process when no session is already available', async () => {
       const sessionService = await SessionService.init();
-      const loginUser = await LoginUser.init(sessionService, '755');
+      const loginUser = await LoginUser.init(sessionService, 755);
       const result = await loginUser.login(
         'EZC',
         'ezcash+florence@tomei.com.my',
@@ -515,7 +515,7 @@ describe('login-user', () => {
 
     it('should able to do login process when session is already available', async () => {
       const sessionService = await SessionService.init();
-      const loginUser = await LoginUser.init(sessionService, '755');
+      const loginUser = await LoginUser.init(sessionService, 755);
       const result = await loginUser.login(
         'EZC',
         'ezcash+florence@tomei.com.my',
@@ -533,7 +533,7 @@ describe('login-user', () => {
 
     it('should be able to login when user only have one user group with level 1 or higher', async () => {
       const sessionService = await SessionService.init();
-      const loginUser = await LoginUser.init(sessionService, '755');
+      const loginUser = await LoginUser.init(sessionService, 755);
       const result = await loginUser['getPrivileges']('EZC');
       expect(getUserGroupFromDBMock).toBeCalledTimes(2);
       expect(result).toEqual([
@@ -556,7 +556,7 @@ describe('login-user', () => {
       userUserGroups.push(userUserGroups[0]);
 
       const sessionService = await SessionService.init();
-      const loginUser = await LoginUser.init(sessionService, '755');
+      const loginUser = await LoginUser.init(sessionService, 755);
       const result = await loginUser['getPrivileges']('EZC');
       expect(getUserUserGroupFromDBMock).toBeCalledTimes(1);
       expect(getUserGroupFromDBMock).toBeCalledTimes(4);
@@ -582,7 +582,7 @@ describe('login-user', () => {
       userUserGroups = [];
 
       const sessionService = await SessionService.init();
-      const loginUser = await LoginUser.init(sessionService, '755');
+      const loginUser = await LoginUser.init(sessionService, 755);
       const result = await loginUser['getPrivileges']('EZC');
       expect(getUserGroupFromDBMock).toBeCalledTimes(0);
       expect(result).toEqual(['Terminate Data']);
@@ -597,7 +597,7 @@ describe('login-user', () => {
       user.SystemPrivileges = [];
 
       const sessionService = await SessionService.init();
-      const loginUser = await LoginUser.init(sessionService, '755');
+      const loginUser = await LoginUser.init(sessionService, 755);
       const result = await loginUser['getPrivileges']('EZC');
       expect(getUserGroupFromDBMock).toBeCalledTimes(0);
       expect(result).toEqual([
@@ -619,7 +619,7 @@ describe('login-user', () => {
       user.SystemPrivileges = [];
 
       const sessionService = await SessionService.init();
-      const loginUser = await LoginUser.init(sessionService, '755');
+      const loginUser = await LoginUser.init(sessionService, 755);
       const result = await loginUser['getPrivileges']('EZC');
       expect(getUserGroupFromDBMock).toBeCalledTimes(0);
       expect(result).toEqual([
@@ -640,7 +640,7 @@ describe('login-user', () => {
       userUserGroups = [];
 
       const sessionService = await SessionService.init();
-      const loginUser = await LoginUser.init(sessionService, '755');
+      const loginUser = await LoginUser.init(sessionService, 755);
       const result = await loginUser['getPrivileges']('EZC');
       expect(getUserGroupFromDBMock).toBeCalledTimes(0);
       expect(result).toEqual([]);
@@ -658,7 +658,7 @@ describe('login-user', () => {
     it('should return false if user session not found', async () => {
       isSessionExist = false;
       const sessionService = await SessionService.init();
-      const loginUser = await LoginUser.init(sessionService, '755');
+      const loginUser = await LoginUser.init(sessionService, 755);
       const result = await loginUser.checkPrivileges('EZC', 'Terminate');
       expect(result).toEqual(false);
     });
@@ -666,7 +666,7 @@ describe('login-user', () => {
     it('should return false if system login not found', async () => {
       isSessionExist = false;
       const sessionService = await SessionService.init();
-      const loginUser = await LoginUser.init(sessionService, '755');
+      const loginUser = await LoginUser.init(sessionService, 755);
       const result = await loginUser.checkPrivileges('EZC', 'Terminate');
       expect(result).toEqual(false);
     });
@@ -674,14 +674,14 @@ describe('login-user', () => {
     it('should return false if privilege not found', async () => {
       isSessionExist = false;
       const sessionService = await SessionService.init();
-      const loginUser = await LoginUser.init(sessionService, '755');
+      const loginUser = await LoginUser.init(sessionService, 755);
       const result = await loginUser.checkPrivileges('EZC', 'Not Terminate');
       expect(result).toEqual(false);
     });
 
     it('should return true if privilege found', async () => {
       const sessionService = await SessionService.init();
-      const loginUser = await LoginUser.init(sessionService, '755');
+      const loginUser = await LoginUser.init(sessionService, 755);
       const result = await loginUser.checkPrivileges('EZC', 'Terminate');
       expect(result).toEqual(true);
     });
@@ -696,7 +696,7 @@ describe('login-user', () => {
       try {
         isSessionExist = false;
         const sessionService = await SessionService.init();
-        const loginUser = await LoginUser.init(sessionService, '755');
+        const loginUser = await LoginUser.init(sessionService, 755);
         await loginUser.checkSession(
           'EZC',
           session.systemLogins[0].sessionId,
@@ -710,7 +710,7 @@ describe('login-user', () => {
     it('it should returns session expired if sessionId not matched', async () => {
       try {
         const sessionService = await SessionService.init();
-        const loginUser = await LoginUser.init(sessionService, '755');
+        const loginUser = await LoginUser.init(sessionService, 755);
         await loginUser.checkSession(
           'NOTEZC',
           session.systemLogins[0].sessionId,
@@ -730,7 +730,7 @@ describe('login-user', () => {
           }
         });
       const sessionService = await SessionService.init();
-      const loginUser = await LoginUser.init(sessionService, '755');
+      const loginUser = await LoginUser.init(sessionService, 755);
       const result = await loginUser.checkSession(
         'EZC',
         session.systemLogins[0].sessionId,

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

@@ -0,0 +1,108 @@
+'use strict';
+
+/** @type {import('sequelize-cli').Migration} */
+module.exports = {
+  async up(queryInterface, Sequelize) {
+    await queryInterface.createTable('sso_User', {
+      UserId: {
+        primaryKey: true,
+        type: Sequelize.INTEGER,
+        allowNull: false,
+        autoIncrement: true,
+      },
+      Email: {
+        type: Sequelize.STRING,
+        allowNull: false,
+        unique: true,
+      },
+      Password: {
+        type: Sequelize.STRING,
+        allowNull: false,
+      },
+      Status: {
+        type: Sequelize.STRING,
+        allowNull: false,
+      },
+      DefaultPasswordChangedYN: {
+        type: Sequelize.CHAR(1),
+        allowNull: true,
+      },
+      FirstLoginAt: {
+        type: Sequelize.DATE,
+        allowNull: true,
+      },
+      LastLoginAt: {
+        type: Sequelize.DATE,
+        allowNull: true,
+      },
+      MFAEnabled: {
+        type: Sequelize.TINYINT,
+        allowNull: true,
+      },
+      MFAConfig: {
+        type: Sequelize.TEXT,
+        allowNull: true,
+      },
+      RecoveryEmail: {
+        type: Sequelize.STRING,
+        allowNull: true,
+      },
+      FailedLoginAttemptCount: {
+        type: Sequelize.INTEGER,
+        allowNull: false,
+      },
+      LastFailedLoginAt: {
+        type: Sequelize.DATE,
+        allowNull: true,
+      },
+      LastPasswordChangedAt: {
+        type: Sequelize.DATE,
+        allowNull: true,
+      },
+      NeedToChangePasswordYN: {
+        type: Sequelize.CHAR(1),
+        allowNull: true,
+      },
+      CreatedAt: {
+        allowNull: false,
+        defaultValue: Sequelize.literal('CURRENT_TIMESTAMP(3)'),
+        type: Sequelize.DATE,
+      },
+      CreatedById: {
+        type: Sequelize.INTEGER,
+        allowNull: true,
+        references: {
+          model: 'sso_User',
+          key: 'UserId',
+        },
+        onDelete: 'CASCADE',
+        onUpdate: 'CASCADE',
+      },
+      UpdatedAt: {
+        allowNull: false,
+        defaultValue: Sequelize.literal('CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3)'),
+        type: Sequelize.DATE,
+      },
+      UpdatedById: {
+        type: Sequelize.INTEGER,
+        allowNull: true,
+        references: {
+          model: 'sso_User',
+          key: 'UserId',
+        },
+        onDelete: 'CASCADE',
+        onUpdate: 'CASCADE',
+      },
+
+    });
+  },
+
+  async down(queryInterface, Sequelize) {
+    /**
+     * Add reverting commands here.
+     *
+     * Example:
+     * await queryInterface.dropTable('users');
+     */
+  }
+};

package/migrations/{04-create-user-user-group-table.js → 20240314080604-create-user-user-group-table.js}

@@ -8,7 +8,7 @@ module.exports = {
             type: Sequelize.INTEGER,
             allowNull: false,
             references: {
-                model: 'sso_users',
+                model: 'sso_User',
                 key: 'id',
             },
             onDelete: 'CASCADE',

package/migrations/{05-create-login-history-table.js → 20240314080605-create-login-history-table.js}

@@ -14,7 +14,7 @@ module.exports = {
             type: Sequelize.INTEGER,
             allowNull: false,
             references: {
-                model: 'sso_users',
+                model: 'sso_User',
                 key: 'id',
             },
             onDelete: 'CASCADE',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tomei/sso",
-  "version": "0.15.3",
+  "version": "0.15.5",
   "description": "Tomei SSO Package",
   "main": "index.js",
   "scripts": {
@@ -46,6 +46,7 @@
     "prettier": "^2.7.1",
     "prisma": "^4.14.0",
     "redis-mock": "^0.56.3",
+    "sequelize-cli": "^6.6.2",
     "ts-jest": "^29.1.0",
     "ts-node": "^10.9.1",
     "tsc-watch": "^5.0.3",

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

@@ -1,9 +1,29 @@
-export interface IUserInfo {
-  FullName: string;
-  IDNo: string;
-  Email: string;
-  ContactNo: string;
-  ObjectId: string;
-  Password: string;
-  staffs?: any;
-}
+import { YN } from '../../../enum';
+
+export interface IUserInfo {
+  FullName: string;
+  IDNo: string;
+  Email: string;
+  ContactNo: string;
+  UserId: number;
+  Password: string;
+  staffs?: any;
+}
+
+export interface IUserAttr extends IUserInfo {
+  Status: string;
+  DefaultPasswordChangedYN: YN;
+  FirstLoginAt: Date;
+  LastLoginAt: Date;
+  MFAEnabled: number;
+  MFAConfig: string;
+  RecoveryEmail: string;
+  FailedLoginAttemptCount: number;
+  LastFailedLoginAt: Date;
+  LastPasswordChangedAt: Date;
+  NeedToChangePasswordYN: YN;
+  CreatedById: number;
+  CreatedAt: Date;
+  UpdatedById: number;
+  UpdatedAt: Date;
+}