@admc-go-th/admc-library 1.0.21 → 1.0.23

package/{authAssignment-zERupLM6.d.ts → authAssignment-DnWdDS8c.d.ts}

@@ -66,6 +66,7 @@ interface usersAttributes {
     verificationToken?: string;
     email?: string;
     authKey?: string;
+    secretKey?: string;
     accessToken?: string;
     userLevel?: number;
     userAuthen?: string;
@@ -75,6 +76,7 @@ interface usersAttributes {
     lastName?: string;
     phone?: string;
     status?: number;
+    is_2fa?: number;
     createdBy?: string;
     createdDate?: Date;
     updatedBy?: string;
@@ -89,6 +91,7 @@ declare class users extends Model<usersAttributes, usersAttributes> implements u
     verificationToken?: string;
     email?: string;
     authKey?: string;
+    secretKey?: string;
     accessToken?: string;
     userLevel?: number;
     userAuthen?: string;
@@ -98,6 +101,7 @@ declare class users extends Model<usersAttributes, usersAttributes> implements u
     lastName?: string;
     phone?: string;
     status?: number;
+    is_2fa?: number;
     createdBy?: string;
     createdDate?: Date;
     updatedBy?: string;

package/{authItem-Daiko8gP.d.ts → authItem-BglqcLa8.d.ts}

@@ -28,6 +28,7 @@ interface menuAttributes {
     display?: string;
     description?: string;
     moduleId?: number;
+    sort?: number;
     status?: number;
     createdBy?: string;
     createdDate?: Date;
@@ -42,6 +43,7 @@ declare class menu extends Model<menuAttributes, menuAttributes> implements menu
     display?: string;
     description?: string;
     moduleId?: number;
+    sort?: number;
     status?: number;
     createdBy?: string;
     createdDate?: Date;

package/databases/models/authItem.ts

@@ -0,0 +1,14 @@
+import { FindOptions } from "sequelize/types/model";
+import { authItem as AuthItem } from "../tables";
+
+export class authItem extends AuthItem {
+    static async findByUUID(
+        keyName: string, 
+        options?: Omit<FindOptions, 'where'>
+    ): Promise<AuthItem | null> {
+        return await this.findOne({ 
+            where: { keyName: keyName }, 
+            ...options, 
+        });
+    }
+}

package/databases/models/authRole.ts

@@ -1,5 +1,6 @@
 import { FindOptions } from "sequelize/types/model";
 import { authRole as AuthRole } from "../tables";
+import { formatDate } from "../../utils/date";
 
 export class authRole extends AuthRole {
     static async findByUUID(
@@ -11,4 +12,12 @@ export class authRole extends AuthRole {
             ...options, 
         });
     }
+
+    toJSON() {
+        const values = super.toJSON() as any;
+        values.createdDate = formatDate(values.createdDate);
+        values.updatedDate = formatDate(values.updatedDate);
+        delete values.id;
+        return values;
+    }
 }

package/databases/models/index.ts

@@ -1,4 +1,7 @@
 export * from "./menu";
 export * from "./users";
 export * from "./authRole";
-export * from "./authRoleChlid";
+export * from "./authRoleChlid";
+export * from "./oauthAccessToken";
+export * from "./oauthRefreshToken";
+export * from "./authItem";

package/databases/models/oauthAccessToken.ts

@@ -0,0 +1,16 @@
+import { FindOptions } from "sequelize/types/model";
+import { oauthAccessToken as OauthAccessToken } from "../tables";
+
+export class oauthAccessToken extends OauthAccessToken {
+    static async findByAccessToken(
+        accessToken: string, 
+        clientId: string = "",
+        userId: number = 0,
+        options?: Omit<FindOptions, 'where'>
+    ): Promise<OauthAccessToken | null> {
+        return await this.findOne({ 
+            where: { accessToken, clientId, userId }, 
+            ...options, 
+        });
+    }
+}

package/databases/models/oauthRefreshToken.ts

@@ -0,0 +1,16 @@
+import { FindOptions } from "sequelize/types/model";
+import { oauthRefreshToken as OauthRefreshToken } from "../tables";
+
+export class oauthRefreshToken extends OauthRefreshToken {
+    static async findByRefreshToken(
+        refreshToken: string, 
+        clientId: string = "",
+        userId: number = 0,
+        options?: Omit<FindOptions, 'where'>
+    ): Promise<OauthRefreshToken | null> {
+        return await this.findOne({ 
+            where: { refreshToken, clientId, userId }, 
+            ...options, 
+        });
+    }
+}

package/databases/models/users.ts

@@ -1,4 +1,4 @@
-import { users as Users} from "../tables";
+import { users as Users, authAssignment as AuthAssignment, authRole as AuthRole, authRoleChild as AuthRoleChild } from "../tables";
 import { formatDate } from "../../utils/date";
 
 export class users extends Users {
@@ -12,4 +12,23 @@ export class users extends Users {
     values.created_date = formatDate(new Date());
     return values;
   }
+
+  static async findRoleByJoin(id: number) {
+    const model = await AuthAssignment.findOne({
+      where: {
+        userId: id
+      },
+      include: [
+        {
+          model: AuthRole,
+          include: [
+            {
+              model: AuthRoleChild,
+            }
+          ]
+        }
+      ]
+    });
+    return model;
+  }
 }

package/databases/schema/authItem.ts

@@ -1,92 +1,93 @@
-import {
-	Model, Table, Column, DataType, Index, Sequelize, ForeignKey, HasOne, HasMany 
-} from "sequelize-typescript";
-import { menu } from "./menu";
-import { authItemChild } from "./authItemChild";
-
-export interface authItemAttributes {
-    keyName: string;
-    type: number;
-    display: string;
-    description?: string;
-    status?: number;
-    createdBy?: string;
-    createdDate?: Date;
-    updatedBy?: string;
-    updatedDate?: Date;
-}
-
-@Table({
-	tableName: "auth_item",
-	timestamps: false 
-})
-export class authItem extends Model<authItemAttributes, authItemAttributes> implements authItemAttributes {
-
-    @Column({
-    	field: "key_name",
-    	primaryKey: true,
-    	type: DataType.STRING(100) 
-    })
-    	declare keyName: string;
-
-    @Column({
-    	type: DataType.SMALLINT 
-    })
-    	declare type: number;
-
-    @Column({
-    	type: DataType.STRING(255) 
-    })
-    	declare display: string;
-
-    @Column({
-    	allowNull: true,
-    	type: DataType.STRING 
-    })
-    	declare description?: string;
-
-    @Column({
-    	allowNull: true,
-    	type: DataType.INTEGER,
-    	defaultValue: "1" 
-    })
-    	declare status?: number;
-
-    @Column({
-    	field: "created_by",
-    	allowNull: true,
-    	type: DataType.STRING(60) 
-    })
-    	declare createdBy?: string;
-
-    @Column({
-    	field: "created_date",
-    	allowNull: true,
-    	type: DataType.DATE 
-    })
-    	declare createdDate?: Date;
-
-    @Column({
-    	field: "updated_by",
-    	allowNull: true,
-    	type: DataType.STRING(60) 
-    })
-    	declare updatedBy?: string;
-
-    @Column({
-    	field: "updated_date",
-    	allowNull: true,
-    	type: DataType.DATE 
-    })
-    	declare updatedDate?: Date;
-
-    @HasOne(() => menu, {
-    	sourceKey: "keyName" 
-    })
-    	declare menu?: menu;
-
-    @HasMany(() => authItemChild, {
-    	sourceKey: "keyName" 
-    })
-    	declare authItemChildren?: authItemChild[];
+import {
+	Model, Table, Column, DataType, Index, Sequelize, ForeignKey, HasOne, HasMany 
+} from "sequelize-typescript";
+import { menu } from "./menu";
+import { authItemChild } from "./authItemChild";
+
+export interface authItemAttributes {
+    keyName: string;
+    type: number;
+    display: string;
+    description?: string;
+    status?: number;
+    createdBy?: string;
+    createdDate?: Date;
+    updatedBy?: string;
+    updatedDate?: Date;
+}
+
+@Table({
+	tableName: "auth_item",
+	timestamps: false 
+})
+export class authItem extends Model<authItemAttributes, authItemAttributes> implements authItemAttributes {
+
+    @Column({
+    	field: "key_name",
+    	primaryKey: true,
+    	type: DataType.STRING(100) 
+    })
+    	declare keyName: string;
+
+    @Column({
+    	type: DataType.SMALLINT 
+    })
+    	declare type: number;
+
+    @Column({
+    	type: DataType.STRING(255) 
+    })
+    	declare display: string;
+
+    @Column({
+    	allowNull: true,
+    	type: DataType.STRING 
+    })
+    	declare description?: string;
+
+    @Column({
+    	allowNull: true,
+    	type: DataType.INTEGER,
+    	defaultValue: "1" 
+    })
+    	declare status?: number;
+
+    @Column({
+    	field: "created_by",
+    	allowNull: true,
+    	type: DataType.STRING(60) 
+    })
+    	declare createdBy?: string;
+
+    @Column({
+    	field: "created_date",
+    	allowNull: true,
+    	type: DataType.DATE 
+    })
+    	declare createdDate?: Date;
+
+    @Column({
+    	field: "updated_by",
+    	allowNull: true,
+    	type: DataType.STRING(60) 
+    })
+    	declare updatedBy?: string;
+
+    @Column({
+    	field: "updated_date",
+    	allowNull: true,
+    	type: DataType.DATE 
+    })
+    	declare updatedDate?: Date;
+
+    @HasOne(() => menu, {
+    	sourceKey: "keyName" 
+    })
+    	declare menu?: menu;
+
+    @HasMany(() => authItemChild, {
+    	sourceKey: "keyName" 
+    })
+    	declare authItemChildren?: authItemChild[];
+
 }

package/databases/schema/authItemChild.ts

@@ -1,33 +1,34 @@
-import {
-	Model, Table, Column, DataType, Index, Sequelize, ForeignKey, BelongsTo 
-} from "sequelize-typescript";
-import { authItem } from "./authItem";
-
-export interface authItemChildAttributes {
-    parent: string;
-    child: string;
-}
-
-@Table({
-	tableName: "auth_item_child",
-	timestamps: false 
-})
-export class authItemChild extends Model<authItemChildAttributes, authItemChildAttributes> implements authItemChildAttributes {
-
-    @ForeignKey(() => authItem)
-    @Column({
-    	primaryKey: true,
-    	type: DataType.STRING(64) 
-    })
-    	declare parent: string;
-
-    @ForeignKey(() => authItem)
-    @Column({
-    	primaryKey: true,
-    	type: DataType.STRING(64) 
-    })
-    	declare child: string;
-
-    @BelongsTo(() => authItem)
-    	declare authItem?: authItem;
+import {
+	Model, Table, Column, DataType, Index, Sequelize, ForeignKey, BelongsTo 
+} from "sequelize-typescript";
+import { authItem } from "./authItem";
+
+export interface authItemChildAttributes {
+    parent: string;
+    child: string;
+}
+
+@Table({
+	tableName: "auth_item_child",
+	timestamps: false 
+})
+export class authItemChild extends Model<authItemChildAttributes, authItemChildAttributes> implements authItemChildAttributes {
+
+    @ForeignKey(() => authItem)
+    @Column({
+    	primaryKey: true,
+    	type: DataType.STRING(64) 
+    })
+    	declare parent: string;
+
+    @ForeignKey(() => authItem)
+    @Column({
+    	primaryKey: true,
+    	type: DataType.STRING(64) 
+    })
+    	declare child: string;
+
+    @BelongsTo(() => authItem)
+    	declare authItem?: authItem;
+
 }

package/databases/schema/index.ts

@@ -5,6 +5,10 @@ export * from "./authRole";
 export * from "./authRoleChild";
 export * from "./mdContent";
 export * from "./mdContentGroup";
+export * from "./mdLink";
 export * from "./menu";
 export * from "./msModule";
+export * from "./oauthAccessToken";
+export * from "./oauthRefreshToken";
+export * from "./userCenterV";
 export * from "./users";

package/databases/schema/mdLink.ts

@@ -0,0 +1,104 @@
+import {
+	Model, Table, Column, DataType, Index, Sequelize, ForeignKey 
+} from "sequelize-typescript";
+
+export interface mdLinkAttributes {
+    id?: number;
+    uuid: string;
+    keyName?: string;
+    name?: string;
+    url?: string;
+    target?: string;
+    sort?: number;
+    status?: number;
+    createdBy?: string;
+    createdDate?: Date;
+    updatedBy?: string;
+    updatedDate?: Date;
+}
+
+@Table({
+	tableName: "md_link",
+	timestamps: false 
+})
+export class mdLink extends Model<mdLinkAttributes, mdLinkAttributes> implements mdLinkAttributes {
+
+    @Column({
+    	primaryKey: true,
+    	autoIncrement: true,
+    	type: DataType.INTEGER 
+    })
+    	declare id?: number;
+
+    @Column({
+    	type: DataType.STRING(60) 
+    })
+    	declare uuid: string;
+
+    @Column({
+    	field: "key_name",
+    	allowNull: true,
+    	type: DataType.STRING(100) 
+    })
+    	declare keyName?: string;
+
+    @Column({
+    	allowNull: true,
+    	type: DataType.STRING(255) 
+    })
+    	declare name?: string;
+
+    @Column({
+    	allowNull: true,
+    	type: DataType.STRING(255) 
+    })
+    	declare url?: string;
+
+    @Column({
+    	allowNull: true,
+    	type: DataType.STRING(10) 
+    })
+    	declare target?: string;
+
+    @Column({
+    	allowNull: true,
+    	type: DataType.INTEGER 
+    })
+    	declare sort?: number;
+
+    @Column({
+    	allowNull: true,
+    	type: DataType.INTEGER,
+    	defaultValue: "1" 
+    })
+    	declare status?: number;
+
+    @Column({
+    	field: "created_by",
+    	allowNull: true,
+    	type: DataType.STRING(60) 
+    })
+    	declare createdBy?: string;
+
+    @Column({
+    	field: "created_date",
+    	allowNull: true,
+    	type: DataType.DATE 
+    })
+    	declare createdDate?: Date;
+
+    @Column({
+    	field: "updated_by",
+    	allowNull: true,
+    	type: DataType.STRING(60) 
+    })
+    	declare updatedBy?: string;
+
+    @Column({
+    	field: "updated_date",
+    	allowNull: true,
+    	type: DataType.DATE 
+    })
+    	declare updatedDate?: Date;
+
+}

package/databases/schema/menu.ts

@@ -12,6 +12,7 @@ export interface menuAttributes {
     display?: string;
     description?: string;
     moduleId?: number;
+    sort?: number;
     status?: number;
     createdBy?: string;
     createdDate?: Date;
@@ -71,6 +72,12 @@ export class menu extends Model<menuAttributes, menuAttributes> implements menuA
     })
     	declare moduleId?: number;
 
+    @Column({
+    	allowNull: true,
+    	type: DataType.INTEGER 
+    })
+    	declare sort?: number;
+
     @Column({
     	allowNull: true,
     	type: DataType.INTEGER 

package/databases/schema/oauthAccessToken.ts

@@ -0,0 +1,58 @@
+import {
+	Model, Table, Column, DataType, Index, Sequelize, ForeignKey 
+} from "sequelize-typescript";
+
+export interface oauthAccessTokenAttributes {
+    accessToken: string;
+    clientId: string;
+    userId?: number;
+    expires?: Date;
+    scope?: string;
+    createdDate?: Date;
+}
+
+@Table({
+	tableName: "oauth_access_token",
+	timestamps: false 
+})
+export class oauthAccessToken extends Model<oauthAccessTokenAttributes, oauthAccessTokenAttributes> implements oauthAccessTokenAttributes {
+
+    @Column({
+    	field: "access_token",
+    	type: DataType.STRING(1000) 
+    })
+    	declare accessToken: string;
+
+    @Column({
+    	field: "client_id",
+    	type: DataType.STRING(32) 
+    })
+    	declare clientId: string;
+
+    @Column({
+    	field: "user_id",
+    	allowNull: true,
+    	type: DataType.INTEGER 
+    })
+    	declare userId?: number;
+
+    @Column({
+    	type: DataType.DATE,
+    	defaultValue: DataType.NOW 
+    })
+    	declare expires?: Date;
+
+    @Column({
+    	allowNull: true,
+    	type: DataType.STRING(2000) 
+    })
+    	declare scope?: string;
+
+    @Column({
+    	field: "created_date",
+    	type: DataType.DATE,
+    	defaultValue: DataType.NOW 
+    })
+    	declare createdDate?: Date;
+
+}

package/databases/schema/oauthRefreshToken.ts

@@ -0,0 +1,58 @@
+import {
+	Model, Table, Column, DataType, Index, Sequelize, ForeignKey 
+} from "sequelize-typescript";
+
+export interface oauthRefreshTokenAttributes {
+    refreshToken: string;
+    clientId: string;
+    userId?: number;
+    expires?: Date;
+    scope?: string;
+    createdDate?: Date;
+}
+
+@Table({
+	tableName: "oauth_refresh_token",
+	timestamps: false 
+})
+export class oauthRefreshToken extends Model<oauthRefreshTokenAttributes, oauthRefreshTokenAttributes> implements oauthRefreshTokenAttributes {
+
+    @Column({
+    	field: "refresh_token",
+    	type: DataType.STRING(1000) 
+    })
+    	declare refreshToken: string;
+
+    @Column({
+    	field: "client_id",
+    	type: DataType.STRING(32) 
+    })
+    	declare clientId: string;
+
+    @Column({
+    	field: "user_id",
+    	allowNull: true,
+    	type: DataType.INTEGER 
+    })
+    	declare userId?: number;
+
+    @Column({
+    	type: DataType.DATE,
+    	defaultValue: DataType.NOW 
+    })
+    	declare expires?: Date;
+
+    @Column({
+    	allowNull: true,
+    	type: DataType.STRING(1000) 
+    })
+    	declare scope?: string;
+
+    @Column({
+    	field: "created_date",
+    	type: DataType.DATE,
+    	defaultValue: DataType.NOW 
+    })
+    	declare createdDate?: Date;
+
+}