@tomei/sso 0.16.2 → 0.16.3

package/jest.config.js

@@ -1,14 +1,14 @@
-/** @type {import('ts-jest').JestConfigWithTsJest} */
-module.exports = {
-  clearMocks: true,
-  preset: 'ts-jest',
-  testTimeout: 20000,
-  coverageDirectory: "coverage",
-  testEnvironment: 'node',
-  "modulePathIgnorePatterns": [
-    "<rootDir>/dist"
-  ],
-  setupFilesAfterEnv: [
-    '<rootDir>/src/redis-client/__mocks__/jest-initial-setup.ts',
-  ]   
+/** @type {import('ts-jest').JestConfigWithTsJest} */
+module.exports = {
+  clearMocks: true,
+  preset: 'ts-jest',
+  testTimeout: 20000,
+  coverageDirectory: "coverage",
+  testEnvironment: 'node',
+  "modulePathIgnorePatterns": [
+    "<rootDir>/dist"
+  ],
+  setupFilesAfterEnv: [
+    '<rootDir>/src/redis-client/__mocks__/jest-initial-setup.ts',
+  ]   
 };

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

@@ -1,108 +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');
-     */
-  }
-};
+'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/20240314080604-create-user-user-group-table.js

@@ -1,55 +1,55 @@
-'use strict';
-
-module.exports = {
-  up: async (queryInterface, Sequelize) => {
-    queryInterface.createTable('sso_UserUserGroup', {
-        UserId: {
-            primaryKey: true,
-            type: Sequelize.INTEGER,
-            allowNull: false,
-            references: {
-                model: 'sso_User',
-                key: 'id',
-            },
-            onDelete: 'CASCADE',
-            onUpdate: 'CASCADE',
-        },
-        GroupCode: {
-            primaryKey: true,
-            type: Sequelize.STRING(191),
-            allowNull: false,
-            references: {
-                model: 'sso_usergroup',
-                key: 'GroupCode',
-            },
-            onDelete: 'CASCADE',
-            onUpdate: 'CASCADE',
-        },
-        SystemId: {
-            type: Sequelize.INTEGER,
-            allowNull: true,
-            references: {
-                model: 'sso_systems',
-                key: 'id',
-            },
-            onDelete: 'CASCADE',
-            onUpdate: 'CASCADE',
-        },
-        CreatedAt: {
-            allowNull: false,
-            defaultValue: Sequelize.literal('CURRENT_TIMESTAMP(3)'),
-            type: Sequelize.DATE,
-        },
-        UpdatedAt: {
-            allowNull: false,
-            defaultValue: Sequelize.literal('CURRENT_TIMESTAMP(3)'),
-            type: Sequelize.DATE,
-        },
-    });
-
-  },
-
-  down: async (queryInterface) => {
-    await queryInterface.dropTable('sso_UserUserGroup');
-  },
-};
+'use strict';
+
+module.exports = {
+  up: async (queryInterface, Sequelize) => {
+    queryInterface.createTable('sso_UserUserGroup', {
+        UserId: {
+            primaryKey: true,
+            type: Sequelize.INTEGER,
+            allowNull: false,
+            references: {
+                model: 'sso_User',
+                key: 'id',
+            },
+            onDelete: 'CASCADE',
+            onUpdate: 'CASCADE',
+        },
+        GroupCode: {
+            primaryKey: true,
+            type: Sequelize.STRING(191),
+            allowNull: false,
+            references: {
+                model: 'sso_usergroup',
+                key: 'GroupCode',
+            },
+            onDelete: 'CASCADE',
+            onUpdate: 'CASCADE',
+        },
+        SystemId: {
+            type: Sequelize.INTEGER,
+            allowNull: true,
+            references: {
+                model: 'sso_systems',
+                key: 'id',
+            },
+            onDelete: 'CASCADE',
+            onUpdate: 'CASCADE',
+        },
+        CreatedAt: {
+            allowNull: false,
+            defaultValue: Sequelize.literal('CURRENT_TIMESTAMP(3)'),
+            type: Sequelize.DATE,
+        },
+        UpdatedAt: {
+            allowNull: false,
+            defaultValue: Sequelize.literal('CURRENT_TIMESTAMP(3)'),
+            type: Sequelize.DATE,
+        },
+    });
+
+  },
+
+  down: async (queryInterface) => {
+    await queryInterface.dropTable('sso_UserUserGroup');
+  },
+};

package/migrations/20240314080605-create-login-history-table.js

@@ -1,49 +1,49 @@
-'use strict';
-
-
-module.exports = {
-  up: async (queryInterface, Sequelize) => {
-    queryInterface.createTable('sso_LoginHistories', {
-        Id: {
-            primaryKey: true,
-            autoIncrement: true,
-            type: Sequelize.INTEGER,
-            allowNull: false,
-        },
-        UserId: {
-            type: Sequelize.INTEGER,
-            allowNull: false,
-            references: {
-                model: 'sso_User',
-                key: 'id',
-            },
-            onDelete: 'CASCADE',
-            onUpdate: 'CASCADE',
-        },
-        SystemId: {
-            type: Sequelize.INTEGER,
-            allowNull: false,
-            references: {
-                model: 'sso_systems',
-                key: 'id',
-            },
-            onDelete: 'CASCADE',
-            onUpdate: 'CASCADE',
-        },
-        OriginIP: {
-            type: Sequelize.STRING(191),
-            allowNull: false,
-        },
-        CreatedAt: {
-            type: Sequelize.DATE(3),
-            allowNull: false,
-            defaultValue: Sequelize.literal('CURRENT_TIMESTAMP(3)'),
-        },
-    });
-
-  },
-
-  down: async (queryInterface) => {
-    await queryInterface.dropTable('sso_LoginHistories');
-  },
-};
+'use strict';
+
+
+module.exports = {
+  up: async (queryInterface, Sequelize) => {
+    queryInterface.createTable('sso_LoginHistories', {
+        Id: {
+            primaryKey: true,
+            autoIncrement: true,
+            type: Sequelize.INTEGER,
+            allowNull: false,
+        },
+        UserId: {
+            type: Sequelize.INTEGER,
+            allowNull: false,
+            references: {
+                model: 'sso_User',
+                key: 'id',
+            },
+            onDelete: 'CASCADE',
+            onUpdate: 'CASCADE',
+        },
+        SystemId: {
+            type: Sequelize.INTEGER,
+            allowNull: false,
+            references: {
+                model: 'sso_systems',
+                key: 'id',
+            },
+            onDelete: 'CASCADE',
+            onUpdate: 'CASCADE',
+        },
+        OriginIP: {
+            type: Sequelize.STRING(191),
+            allowNull: false,
+        },
+        CreatedAt: {
+            type: Sequelize.DATE(3),
+            allowNull: false,
+            defaultValue: Sequelize.literal('CURRENT_TIMESTAMP(3)'),
+        },
+    });
+
+  },
+
+  down: async (queryInterface) => {
+    await queryInterface.dropTable('sso_LoginHistories');
+  },
+};

package/package.json

@@ -1,80 +1,80 @@
-{
-  "name": "@tomei/sso",
-  "version": "0.16.2",
-  "description": "Tomei SSO Package",
-  "main": "dist/index.js",
-  "scripts": {
-    "start:dev": "tsc -w",
-    "build": "tsc",
-    "prepare": "husky install",
-    "format": "prettier --write \"src/**/*.ts\"",
-    "lint": "npx eslint . --fix",
-    "test": "jest --forceExit --detectOpenHandles"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+ssh://git@gitlab.com/tomei-package/sso.git"
-  },
-  "keywords": [
-    "tomei",
-    "sso"
-  ],
-  "author": "Tomei",
-  "license": "ISC",
-  "bugs": {
-    "url": "https://gitlab.com/tomei-package/sso/issues"
-  },
-  "homepage": "https://gitlab.com/tomei-package/sso#readme",
-  "devDependencies": {
-    "@commitlint/cli": "^17.6.3",
-    "@commitlint/config-conventional": "^17.6.3",
-    "@tsconfig/node18": "^2.0.1",
-    "@types/bcrypt": "^5.0.0",
-    "@types/jest": "^29.5.2",
-    "@types/node": "^18.17.5",
-    "@types/redis": "^4.0.11",
-    "@types/validator": "^13.11.1",
-    "@typescript-eslint/eslint-plugin": "^5.33.0",
-    "dotenv": "^16.1.4",
-    "eslint": "^8.40.0",
-    "eslint-config-prettier": "^8.5.0",
-    "eslint-plugin-prettier": "^4.2.1",
-    "husky": "^8.0.3",
-    "jest": "^29.5.0",
-    "jest-mock-extended": "^3.0.4",
-    "lint-staged": "^13.2.2",
-    "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",
-    "tsconfig-paths": "^4.0.0",
-    "tslint": "^6.1.3",
-    "typescript": "^4.7.4"
-  },
-  "publishConfig": {
-    "access": "public"
-  },
-  "peerDependencies": {
-    "@tomei/config": "^0.3.9",
-    "@tomei/general": "^0.10.6",
-    "@tomei/mailer": "^0.5.11",
-    "@types/jest": "^29.5.2",
-    "argon2": "^0.30.3",
-    "cls-hooked": "^4.2.2",
-    "cuid": "^3.0.0",
-    "nodemailer": "^6.9.3",
-    "redis": "^4.6.7",
-    "reflect-metadata": "^0.1.13",
-    "sequelize": "^6.32.1",
-    "sequelize-typescript": "^2.1.5"
-  },
-  "lint-staged": {
-    "*/**/*.{js,ts,tsx}": [
-      "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
-      "eslint \"{src,apps,libs,test}/**/*.ts\" --fix"
-    ]
-  }
-}
+{
+  "name": "@tomei/sso",
+  "version": "0.16.3",
+  "description": "Tomei SSO Package",
+  "main": "dist/index.js",
+  "scripts": {
+    "start:dev": "tsc -w",
+    "build": "tsc",
+    "prepare": "husky install",
+    "format": "prettier --write \"src/**/*.ts\"",
+    "lint": "npx eslint . --fix",
+    "test": "jest --forceExit --detectOpenHandles"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+ssh://git@gitlab.com/tomei-package/sso.git"
+  },
+  "keywords": [
+    "tomei",
+    "sso"
+  ],
+  "author": "Tomei",
+  "license": "ISC",
+  "bugs": {
+    "url": "https://gitlab.com/tomei-package/sso/issues"
+  },
+  "homepage": "https://gitlab.com/tomei-package/sso#readme",
+  "devDependencies": {
+    "@commitlint/cli": "^17.6.3",
+    "@commitlint/config-conventional": "^17.6.3",
+    "@tsconfig/node18": "^2.0.1",
+    "@types/bcrypt": "^5.0.0",
+    "@types/jest": "^29.5.2",
+    "@types/node": "^18.17.5",
+    "@types/redis": "^4.0.11",
+    "@types/validator": "^13.11.1",
+    "@typescript-eslint/eslint-plugin": "^5.33.0",
+    "dotenv": "^16.1.4",
+    "eslint": "^8.40.0",
+    "eslint-config-prettier": "^8.5.0",
+    "eslint-plugin-prettier": "^4.2.1",
+    "husky": "^8.0.3",
+    "jest": "^29.5.0",
+    "jest-mock-extended": "^3.0.4",
+    "lint-staged": "^13.2.2",
+    "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",
+    "tsconfig-paths": "^4.0.0",
+    "tslint": "^6.1.3",
+    "typescript": "^4.7.4"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "peerDependencies": {
+    "@tomei/config": "^0.3.9",
+    "@tomei/general": "^0.10.6",
+    "@tomei/mailer": "^0.5.11",
+    "@types/jest": "^29.5.2",
+    "argon2": "^0.30.3",
+    "cls-hooked": "^4.2.2",
+    "cuid": "^3.0.0",
+    "nodemailer": "^6.9.3",
+    "redis": "^4.6.7",
+    "reflect-metadata": "^0.1.13",
+    "sequelize": "^6.32.1",
+    "sequelize-typescript": "^2.1.5"
+  },
+  "lint-staged": {
+    "*/**/*.{js,ts,tsx}": [
+      "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
+      "eslint \"{src,apps,libs,test}/**/*.ts\" --fix"
+    ]
+  }
+}

package/sampledotenv

@@ -1,8 +1,8 @@
-DATABASE_URL=
-SHADOW_DATABASE_URL=
-REDIS_URL=
-REDIS_PASSWORD=
-SMTP_HOST=
-SMTP_PORT=
-EMAIL_SENDER=
+DATABASE_URL=
+SHADOW_DATABASE_URL=
+REDIS_URL=
+REDIS_PASSWORD=
+SMTP_HOST=
+SMTP_PORT=
+EMAIL_SENDER=
 EMAIL_PASSWORD=

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

@@ -1,3 +1,4 @@
+import { UserStatus } from '../../../enum/user-status.enum';
 import { YN } from '../../../enum/yn.enum';
 
 export interface IUserInfo {
@@ -11,7 +12,7 @@ export interface IUserInfo {
 }
 
 export interface IUserAttr extends IUserInfo {
-  Status: string;
+  Status: UserStatus;
   DefaultPasswordChangedYN: YN;
   FirstLoginAt: Date;
   LastLoginAt: Date;

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

@@ -17,12 +17,13 @@ import GroupSystemPrivilege from '../../models/group-system-privilege.entity';
 import GroupRolePrivilege from '../../models/group-role-privilege.entity';
 import UserGroup from '../../models/user-group.entity';
 import { YN } from '../../enum/yn.enum';
+import { UserStatus } from '../../enum';
 
 export class LoginUser extends LoginUserBase {
   ObjectId: string;
   Email: string;
   private _Password: string;
-  private _Status: string;
+  private _Status: UserStatus;
   private _DefaultPasswordChangedYN: YN;
   private _FirstLoginAt: Date;
   private _LastLoginAt: Date;
@@ -69,11 +70,11 @@ export class LoginUser extends LoginUserBase {
     this._Password = value;
   }
 
-  get Status(): string {
+  get Status(): UserStatus {
     return this._Status;
   }
 
-  private set Status(value: string) {
+  private set Status(value: UserStatus) {
     this._Status = value;
   }