@tomei/sso 0.15.10 → 0.16.1

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.10",
+  "version": "0.16.1",
   "description": "Tomei SSO Package",
   "main": "dist/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",
@@ -58,7 +59,7 @@
   },
   "peerDependencies": {
     "@tomei/config": "^0.3.9",
-    "@tomei/general": "^0.10.4",
+    "@tomei/general": "^0.10.6",
     "@tomei/mailer": "^0.5.11",
     "@types/jest": "^29.5.2",
     "argon2": "^0.30.3",

package/src/components/building/building.ts

@@ -1,14 +1,19 @@
 import { BuildingTypeRepository } from '../building-type/building-type.repository';
 import { BuildingRepository } from './building.repository';
-import { LoginUser } from '../../..';
+import { LoginUser } from '../login-user/login-user';
 import { ApplicationConfig } from '@tomei/config';
 import { Op } from 'sequelize';
 import BuildingType from '../../models/building-type.entity';
 import Country from '../../models/country.entity';
+import { ObjectBase } from '@tomei/general';
 
-export class Building {
+export class Building extends ObjectBase {
   // implement all attributes from sso_buildings table
-  id: number;
+  ObjectId: string;
+  ObjectName: string;
+  ObjectType = 'Building';
+  TableName = 'sso_buildings';
+  private _id: number;
   name: string;
   code: string;
   building_type_id: number;
@@ -39,7 +44,17 @@ export class Building {
   private static _Repo = new BuildingRepository();
   private _RepoBuildingType = new BuildingTypeRepository();
 
+  set id(id: number) {
+    this._id = id;
+    this.ObjectId = id.toString();
+  }
+
+  get id() {
+    return this._id;
+  }
+
   private constructor(buildingInfo) {
+    super();
     if (buildingInfo) {
       this.id = buildingInfo.id;
       this.name = buildingInfo.Name;

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/yn.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;
+}