@tomei/sso 0.16.2 → 0.16.3

package/src/components/staff/staff.ts

@@ -64,9 +64,7 @@ export class Staff extends ObjectBase implements IPerson {
   private constructor(staffInfo) {
     super();
     if (staffInfo) {
-      // needed to implement objectBase
-      this.ObjectId = staffInfo.staff_id;
-
+      this.ObjectId = staffInfo.id;
       this.UserId = staffInfo.user_id;
       this.StaffId = staffInfo.staff_id;
       this.FullName = staffInfo.full_name;

package/src/enum/index.ts

@@ -1 +1,2 @@
 export * from './yn.enum';
+export * from './user-status.enum';

package/src/enum/user-status.enum.ts

@@ -0,0 +1,7 @@
+export enum UserStatus {
+  ACTIVE = 'Active',
+  INACTIVE = 'Inactive',
+  LOCKED = 'Locked',
+  SUSPENDED = 'Suspended',
+  DELETED = 'Deleted',
+}

package/src/models/user.entity.ts

@@ -11,7 +11,6 @@ import {
   Table,
   UpdatedAt,
 } from 'sequelize-typescript';
-import UserGroup from './user-group.entity';
 import Staff from './staff.entity';
 import BearerToken from './bearer-token.entity';
 import OAuthToken from './oauth-token.entity';
@@ -24,6 +23,7 @@ import UserSystemRole from './user-system-role.entity';
 import SystemPrivilege from './system-privilege.entity';
 import UserSystemPrivileges from './user-system-privileges.entity';
 import { YN } from '../enum/yn.enum';
+import { UserStatus } from '../enum/user-status.enum';
 
 @Table({
   tableName: 'sso_User',
@@ -55,7 +55,7 @@ export default class User extends Model {
     allowNull: false,
     type: DataType.STRING,
   })
-  Status: string;
+  Status: UserStatus;
 
   @Column({
     allowNull: false,

package/tsconfig.build.json

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

package/tsconfig.json

@@ -1,23 +1,23 @@
-{
-  "compilerOptions": {
-    "module": "commonjs",
-    "declaration": true,
-    "removeComments": true,
-    "emitDecoratorMetadata": true,
-    "experimentalDecorators": true,
-    "allowSyntheticDefaultImports": true,
-    "moduleResolution": "node",
-    "target": "es6",
-    "sourceMap": true,
-    "outDir": "./dist",
-    "baseUrl": "./src",
-    "rootDir": "./",
-    "incremental": true,
-    "skipLibCheck": true,
-    "noImplicitAny": false,
-    "strictBindCallApply": false,
-    "forceConsistentCasingInFileNames": false,
-    "noFallthroughCasesInSwitch": false,
-    "strictNullChecks": true,
-  },
-}
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "declaration": true,
+    "removeComments": true,
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "allowSyntheticDefaultImports": true,
+    "moduleResolution": "node",
+    "target": "es6",
+    "sourceMap": true,
+    "outDir": "./dist",
+    "baseUrl": "./src",
+    "rootDir": "./",
+    "incremental": true,
+    "skipLibCheck": true,
+    "noImplicitAny": false,
+    "strictBindCallApply": false,
+    "forceConsistentCasingInFileNames": false,
+    "noFallthroughCasesInSwitch": false,
+    "strictNullChecks": true,
+  },
+}

package/migrations/01-alter-system-privilege-table.js

@@ -1,13 +0,0 @@
-'use strict';
-
-module.exports = {
-  async up(queryInterface, Sequelize) {
-    await queryInterface.addColumn('sso_systemPrivilege','Module', {
-        type: Sequelize.STRING(200),
-    })
-  },
-
-  async down(queryInterface) {
-    queryInterface.removeColumn('sso_systemPrivilege','Module')
-  },
-};

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

@@ -1,78 +0,0 @@
-'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 +0,0 @@
-'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';