@tomei/sso 0.15.6 → 0.15.7

package/src/models/user.entity.ts

@@ -1,160 +1,110 @@
-import {
-  BelongsTo,
-  BelongsToMany,
-  Column,
-  CreatedAt,
-  DataType,
-  ForeignKey,
-  HasMany,
-  HasOne,
-  Model,
-  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';
-import UserRole from './user-role.entity';
-import System from './system.entity';
-import SystemAccess from './system-accesss.entity';
-import Role from './role.entity';
-import SystemRole from './system-role.entity';
-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';
-
-@Table({
-  tableName: 'sso_User',
-  timestamps: true,
-  createdAt: 'CreatedAt',
-  updatedAt: 'UpdatedAt',
-})
-export default class User extends Model {
-  @Column({
-    primaryKey: true,
-    allowNull: false,
-    type: DataType.INTEGER,
-  })
-  UserId: number;
-
-  @Column({
-    allowNull: false,
-    type: DataType.STRING,
-  })
-  Email: string;
-
-  @Column({
-    allowNull: false,
-    type: DataType.STRING,
-  })
-  Password: string;
-
-  @Column({
-    allowNull: false,
-    type: DataType.STRING,
-  })
-  Status: string;
-
-  @Column({
-    allowNull: false,
-    type: DataType.CHAR(1),
-  })
-  DefaultPasswordChangedYN: YN;
-
-  @Column({
-    type: DataType.DATE,
-  })
-  FirstLoginAt: Date;
-
-  @Column({
-    type: DataType.DATE,
-  })
-  LastLoginAt: Date;
-
-  @Column({
-    type: DataType.TINYINT,
-  })
-  MFAEnabled: number;
-
-  @Column({
-    type: DataType.TEXT,
-  })
-  MFAConfig: string;
-
-  @Column({
-    type: DataType.STRING,
-  })
-  RecoveryEmail: string;
-
-  @Column({
-    allowNull: false,
-    type: DataType.INTEGER,
-  })
-  FailedLoginAttemptCount: number;
-
-  @Column({
-    type: DataType.DATE,
-  })
-  LastFailedLoginAt: Date;
-
-  @Column({
-    type: DataType.DATE,
-  })
-  LastPasswordChangedAt: Date;
-
-  @Column({
-    allowNull: false,
-    type: DataType.CHAR(1),
-  })
-  NeedToChangePasswordYN: YN;
-
-  @ForeignKey(() => User)
-  @Column({
-    type: DataType.INTEGER,
-  })
-  CreatedById: number;
-
-  @CreatedAt
-  CreatedAt: Date;
-
-  @ForeignKey(() => User)
-  @Column({
-    type: DataType.INTEGER,
-  })
-  UpdatedById: number;
-
-  @UpdatedAt
-  UpdatedAt: Date;
-
-  @HasOne(() => Staff)
-  Staff: Staff;
-
-  @HasMany(() => BearerToken)
-  BearerTokens: BearerToken[];
-
-  @HasMany(() => OAuthToken)
-  OAuthTokens: OAuthToken[];
-
-  @HasMany(() => UserRole)
-  UserRoles: UserRole[];
-
-  @BelongsToMany(() => System, () => SystemAccess)
-  Systems: System[];
-
-  @BelongsToMany(() => Role, () => UserRole)
-  Roles: Role[];
-
-  @BelongsToMany(() => SystemRole, () => UserSystemRole)
-  SystemRoles: SystemRole[];
-
-  @BelongsToMany(() => SystemPrivilege, () => UserSystemPrivileges)
-  SystemPrivileges: SystemPrivilege[];
-
-  @BelongsTo(() => User, 'CreatedById')
-  CreatedBy: User;
-
-  @BelongsTo(() => User, 'UpdatedById')
-  UpdatedBy: User;
-}
+import {
+  BelongsTo,
+  BelongsToMany,
+  Column,
+  CreatedAt,
+  DataType,
+  ForeignKey,
+  HasMany,
+  HasOne,
+  Model,
+  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';
+import UserRole from './user-role.entity';
+import System from './system.entity';
+import SystemAccess from './system-accesss.entity';
+import Role from './role.entity';
+import SystemRole from './system-role.entity';
+import UserSystemRole from './user-system-role.entity';
+import SystemPrivilege from './system-privilege.entity';
+import UserSystemPrivileges from './user-system-privileges.entity';
+
+@Table({
+  tableName: 'sso_users',
+  timestamps: true,
+  createdAt: 'created_at',
+  updatedAt: 'updated_at',
+})
+export default class User extends Model {
+  @Column({
+    primaryKey: true,
+    type: DataType.INTEGER,
+  })
+  id: number;
+
+  @Column({
+    type: DataType.STRING,
+    field: 'email',
+  })
+  Email: string;
+
+  @Column({
+    type: DataType.STRING,
+    field: 'password',
+  })
+  Password: string;
+
+  @Column({
+    type: DataType.STRING,
+    field: 'status',
+  })
+  Status: string;
+
+  @Column({
+    type: DataType.BOOLEAN,
+    field: 'default_password_changed',
+  })
+  DefaultPasswordChanged: boolean;
+
+  @Column({
+    type: DataType.DATE,
+    field: 'first_login_at',
+  })
+  FirstLoginAt: boolean;
+
+  @ForeignKey(() => UserGroup)
+  @Column({
+    allowNull: true,
+    type: DataType.STRING(10),
+    field: 'GroupCode',
+  })
+  GroupCode: boolean;
+
+  @CreatedAt
+  CreatedAt: Date;
+
+  @UpdatedAt
+  UpdatedAt: Date;
+
+  @HasOne(() => Staff)
+  Staff: Staff;
+
+  @HasMany(() => BearerToken)
+  BearerTokens: BearerToken[];
+
+  @HasMany(() => OAuthToken)
+  OAuthTokens: OAuthToken[];
+
+  @HasMany(() => UserRole)
+  UserRoles: UserRole[];
+
+  @BelongsToMany(() => System, () => SystemAccess)
+  Systems: System[];
+
+  @BelongsToMany(() => Role, () => UserRole)
+  Roles: Role[];
+
+  @BelongsToMany(() => SystemRole, () => UserSystemRole)
+  SystemRoles: SystemRole[];
+
+  @BelongsToMany(() => SystemPrivilege, () => UserSystemPrivileges)
+  SystemPrivileges: SystemPrivilege[];
+
+  @BelongsTo(() => UserGroup)
+  UserGroup: UserGroup;
+}

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

@@ -1,108 +0,0 @@
-'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/src/enum/index.ts

@@ -1 +0,0 @@
-export * from './yn.enum';

package/src/enum/yn.enum.ts

@@ -1,4 +0,0 @@
-export enum YN {
-  Yes = 'Y',
-  No = 'N',
-}