@tomei/sso 0.15.2 → 0.15.3

package/migrations/02-alter-user-group-table.js

@@ -1,78 +1,78 @@
-'use strict';
-
-module.exports = {
-  up: async (queryInterface, Sequelize) => {
-    return queryInterface.sequelize.transaction(async (t) => {
-      return await Promise.all([
-        queryInterface.addColumn(
-          'sso_usergroup',
-          'AllowInheritFromParentYN',
-          {
-            type: Sequelize.ENUM(['Y', 'N']),
-            defaultValue: 'N',
-          },
-          { transaction: t },
-        ),
-        queryInterface.addColumn(
-            'sso_usergroup',
-            'FullPath',
-            {
-                type: Sequelize.STRING(1000),
-                allowNull: true,
-            },
-            { transaction: t },
-        ),
-        queryInterface.addColumn(
-            'sso_usergroup',
-            'GroupLevel',
-            {
-                type: Sequelize.INTEGER,
-                allowNull: false,
-                defaultValue: 0,
-            },
-            { transaction: t },
-        ),
-        queryInterface.addColumn(
-            'sso_usergroup',
-            'GroupType',
-            {
-                type: Sequelize.STRING(10),
-                allowNull: true,
-            },
-            { transaction: t },
-        ),
-        queryInterface.addColumn(
-            'sso_usergroup',
-            'ParentGroupCode',
-            {
-                type: Sequelize.STRING(10),
-                allowNull: true,
-            },
-            { transaction: t },
-        ),
-        queryInterface.addColumn(
-            'sso_usergroup',
-            'PersonInCharge',
-            {
-                type: Sequelize.STRING(100),
-                allowNull: true,
-            },
-            { transaction: t },
-        ),
-      ]);
-    });
-  },
-
-  down: async (queryInterface) => {
-    return queryInterface.sequelize.transaction(async (t) => {
-      return await Promise.all([
-        queryInterface.removeColumn('sso_usergroup', 'AllowInheritFromParentYN', { transaction: t }),
-        queryInterface.removeColumn('sso_usergroup', 'FullPath', { transaction: t }),
-        queryInterface.removeColumn('sso_usergroup', 'GroupLevel', { transaction: t }),
-        queryInterface.removeColumn('sso_usergroup', 'GroupType', { transaction: t }),
-        queryInterface.removeColumn('sso_usergroup', 'ParentGroupCode', { transaction: t }),
-        queryInterface.removeColumn('sso_usergroup', 'PersonInCharge', { transaction: t }),
-      ]);
-    });
-  },
-};
+'use strict';
+
+module.exports = {
+  up: async (queryInterface, Sequelize) => {
+    return queryInterface.sequelize.transaction(async (t) => {
+      return await Promise.all([
+        queryInterface.addColumn(
+          'sso_usergroup',
+          'AllowInheritFromParentYN',
+          {
+            type: Sequelize.ENUM(['Y', 'N']),
+            defaultValue: 'N',
+          },
+          { transaction: t },
+        ),
+        queryInterface.addColumn(
+            'sso_usergroup',
+            'FullPath',
+            {
+                type: Sequelize.STRING(1000),
+                allowNull: true,
+            },
+            { transaction: t },
+        ),
+        queryInterface.addColumn(
+            'sso_usergroup',
+            'GroupLevel',
+            {
+                type: Sequelize.INTEGER,
+                allowNull: false,
+                defaultValue: 0,
+            },
+            { transaction: t },
+        ),
+        queryInterface.addColumn(
+            'sso_usergroup',
+            'GroupType',
+            {
+                type: Sequelize.STRING(10),
+                allowNull: true,
+            },
+            { transaction: t },
+        ),
+        queryInterface.addColumn(
+            'sso_usergroup',
+            'ParentGroupCode',
+            {
+                type: Sequelize.STRING(10),
+                allowNull: true,
+            },
+            { transaction: t },
+        ),
+        queryInterface.addColumn(
+            'sso_usergroup',
+            'PersonInCharge',
+            {
+                type: Sequelize.STRING(100),
+                allowNull: true,
+            },
+            { transaction: t },
+        ),
+      ]);
+    });
+  },
+
+  down: async (queryInterface) => {
+    return queryInterface.sequelize.transaction(async (t) => {
+      return await Promise.all([
+        queryInterface.removeColumn('sso_usergroup', 'AllowInheritFromParentYN', { transaction: t }),
+        queryInterface.removeColumn('sso_usergroup', 'FullPath', { transaction: t }),
+        queryInterface.removeColumn('sso_usergroup', 'GroupLevel', { transaction: t }),
+        queryInterface.removeColumn('sso_usergroup', 'GroupType', { transaction: t }),
+        queryInterface.removeColumn('sso_usergroup', 'ParentGroupCode', { transaction: t }),
+        queryInterface.removeColumn('sso_usergroup', 'PersonInCharge', { transaction: t }),
+      ]);
+    });
+  },
+};

package/migrations/03-alter-user-system-privilege-table.js

@@ -1,38 +1,38 @@
-'use strict';
-
-module.exports = {
-  up: async (queryInterface, Sequelize) => {
-    return queryInterface.sequelize.transaction(async (t) => {
-      return await Promise.all([
-        queryInterface.addColumn(
-            'sso_usersystemprivilege',
-            'IsInheritedYN',
-            {
-                type: Sequelize.ENUM(['Y', 'N']),
-                defaultValue: 'N',
-            },
-            { transaction: t },
-        ),
-        queryInterface.addColumn(
-            'sso_usersystemprivilege',
-            'IsRevokedYN',
-            {
-                type: Sequelize.ENUM(['Y', 'N']),
-                defaultValue: 'N',
-            },
-            { transaction: t },
-        ),
-      ]);
-    });
-  },
-
-  down: async (queryInterface) => {
-    return queryInterface.sequelize.transaction(async (t) => {
-      return await Promise.all([
-        queryInterface.removeColumn('sso_usersystemprivilege', 'IsInheritedYN', { transaction: t }),
-        queryInterface.removeColumn('sso_usersystemprivilege', 'IsRevokedYN', { transaction: t }),
-      ]);
-    });
-  },
-};
-'use strict';
+'use strict';
+
+module.exports = {
+  up: async (queryInterface, Sequelize) => {
+    return queryInterface.sequelize.transaction(async (t) => {
+      return await Promise.all([
+        queryInterface.addColumn(
+            'sso_usersystemprivilege',
+            'IsInheritedYN',
+            {
+                type: Sequelize.ENUM(['Y', 'N']),
+                defaultValue: 'N',
+            },
+            { transaction: t },
+        ),
+        queryInterface.addColumn(
+            'sso_usersystemprivilege',
+            'IsRevokedYN',
+            {
+                type: Sequelize.ENUM(['Y', 'N']),
+                defaultValue: 'N',
+            },
+            { transaction: t },
+        ),
+      ]);
+    });
+  },
+
+  down: async (queryInterface) => {
+    return queryInterface.sequelize.transaction(async (t) => {
+      return await Promise.all([
+        queryInterface.removeColumn('sso_usersystemprivilege', 'IsInheritedYN', { transaction: t }),
+        queryInterface.removeColumn('sso_usersystemprivilege', 'IsRevokedYN', { transaction: t }),
+      ]);
+    });
+  },
+};
+'use strict';

package/migrations/04-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_users',
-                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_users',
+                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/05-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_users',
-                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_users',
+                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,79 +1,79 @@
-{
-  "name": "@tomei/sso",
-  "version": "0.15.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",
-    "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.5",
-    "@tomei/general": "^0.5.1",
-    "@tomei/mailer": "^0.5.6",
-    "@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.15.3",
+  "description": "Tomei SSO Package",
+  "main": "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",
+    "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.8",
+    "@tomei/general": "^0.7.1",
+    "@tomei/mailer": "^0.5.9",
+    "@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/login-user.ts

@@ -28,6 +28,7 @@ export class LoginUser extends LoginUserBase {
   ObjectId: string;
   ObjectName = 'User';
   TableName = 'sso_users';
+  ObjectType = 'User';
   staffs: any;
 
   private _OriginIP: string;

package/src/components/staff/staff.ts

@@ -12,6 +12,7 @@ export class Staff extends ObjectBase implements IPerson {
   ObjectId: string;
   ObjectName: string;
   TableName: 'sso_Staff';
+  ObjectType: 'Staff';
 
   FullName: string;
   IDNo: string;

package/tsconfig.build.json

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