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

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

@@ -57,6 +57,44 @@ declare class mdContent extends Model<mdContentAttributes, mdContentAttributes>
     mdContentGroup?: mdContentGroup;
 }
 
+interface authRoleChildAttributes {
+    roleId: number;
+    keyName: string;
+    permission?: object;
+}
+declare class authRoleChild extends Model<authRoleChildAttributes, authRoleChildAttributes> implements authRoleChildAttributes {
+    roleId: number;
+    keyName: string;
+    permission?: object;
+    authRole?: authRole;
+}
+
+interface authRoleAttributes {
+    id?: number;
+    uuid: string;
+    name: string;
+    display?: string;
+    status?: number;
+    createdBy?: string;
+    createdDate?: Date;
+    updatedBy?: string;
+    updatedDate?: Date;
+}
+declare class authRole extends Model<authRoleAttributes, authRoleAttributes> implements authRoleAttributes {
+    id?: number;
+    uuid: string;
+    name: string;
+    display?: string;
+    status?: number;
+    createdBy?: string;
+    createdDate?: Date;
+    updatedBy?: string;
+    updatedDate?: Date;
+    authAssignments?: authAssignment[];
+    authRoleChildren?: authRoleChild[];
+    user: users;
+}
+
 interface usersAttributes {
     id?: number;
     uuid: string;
@@ -79,6 +117,8 @@ interface usersAttributes {
     createdDate?: Date;
     updatedBy?: string;
     updatedDate?: Date;
+    secretKey?: string;
+    is2fa?: number;
 }
 declare class users extends Model<usersAttributes, usersAttributes> implements usersAttributes {
     id?: number;
@@ -89,6 +129,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,36 +139,14 @@ declare class users extends Model<usersAttributes, usersAttributes> implements u
     lastName?: string;
     phone?: string;
     status?: number;
+    is2fa: number;
     createdBy?: string;
     createdDate?: Date;
     updatedBy?: string;
     updatedDate?: Date;
     authAssignments?: authAssignment[];
     mdContents?: mdContent[];
-}
-
-interface authRoleAttributes {
-    id?: number;
-    uuid: string;
-    name: string;
-    display?: string;
-    status?: number;
-    createdBy?: string;
-    createdDate?: Date;
-    updatedBy?: string;
-    updatedDate?: Date;
-}
-declare class authRole extends Model<authRoleAttributes, authRoleAttributes> implements authRoleAttributes {
-    id?: number;
-    uuid: string;
-    name: string;
-    display?: string;
-    status?: number;
-    createdBy?: string;
-    createdDate?: Date;
-    updatedBy?: string;
-    updatedDate?: Date;
-    authAssignments?: authAssignment[];
+    authRoles?: authRole[];
 }
 
 interface authAssignmentAttributes {
@@ -149,4 +168,4 @@ declare class authAssignment extends Model<authAssignmentAttributes, authAssignm
     authRole?: authRole;
 }
 
-export { type authAssignmentAttributes as a, authAssignment as b, type authRoleAttributes as c, authRole as d, mdContent as e, type mdContentGroupAttributes as f, mdContentGroup as g, users as h, type mdContentAttributes as m, type usersAttributes as u };
+export { type authAssignmentAttributes as a, authAssignment as b, type authRoleAttributes as c, authRole as d, type authRoleChildAttributes as e, authRoleChild as f, mdContent as g, type mdContentGroupAttributes as h, mdContentGroup as i, users as j, type mdContentAttributes as m, type usersAttributes as u };

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/authRole.ts

@@ -1,86 +1,98 @@
-import {
-	Model, Table, Column, DataType, Index, Sequelize, ForeignKey, HasMany 
-} from "sequelize-typescript";
-import { authAssignment } from "./authAssignment";
-
-export interface authRoleAttributes {
-    id?: number;
-    uuid: string;
-    name: string;
-    display?: string;
-    status?: number;
-    createdBy?: string;
-    createdDate?: Date;
-    updatedBy?: string;
-    updatedDate?: Date;
-}
-
-@Table({
-	tableName: "auth_role",
-	timestamps: false 
-})
-export class authRole extends Model<authRoleAttributes, authRoleAttributes> implements authRoleAttributes {
-
-    @Column({
-    	primaryKey: true,
-    	autoIncrement: true,
-    	type: DataType.INTEGER 
-    })
-    	declare id?: number;
-
-    @Column({
-    	type: DataType.STRING(60) 
-    })
-    	declare uuid: string;
-
-    @Column({
-    	type: DataType.STRING(100) 
-    })
-    	declare name: string;
-
-    @Column({
-    	allowNull: true,
-    	type: DataType.STRING(255) 
-    })
-    	declare display?: string;
-
-    @Column({
-    	allowNull: true,
-    	type: DataType.INTEGER 
-    })
-    	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;
-
-    @HasMany(() => authAssignment, {
-    	sourceKey: "id" 
-    })
-    	declare authAssignments?: authAssignment[];
-
+import {
+	Model, Table, Column, DataType, Index, Sequelize, ForeignKey, HasMany, BelongsTo
+} from "sequelize-typescript";
+import { authAssignment } from "./authAssignment";
+import { authRoleChild } from "./authRoleChild";
+import { users } from "./users";
+
+export interface authRoleAttributes {
+    id?: number;
+    uuid: string;
+    name: string;
+    display?: string;
+    status?: number;
+    createdBy?: string;
+    createdDate?: Date;
+    updatedBy?: string;
+    updatedDate?: Date;
+}
+
+@Table({
+	tableName: "auth_role",
+	timestamps: false 
+})
+export class authRole extends Model<authRoleAttributes, authRoleAttributes> implements authRoleAttributes {
+
+    @Column({
+    	primaryKey: true,
+    	autoIncrement: true,
+    	type: DataType.INTEGER 
+    })
+    	declare id?: number;
+
+    @Column({
+    	type: DataType.STRING(60) 
+    })
+    	declare uuid: string;
+
+    @Column({
+    	type: DataType.STRING(100) 
+    })
+    	declare name: string;
+
+    @Column({
+    	allowNull: true,
+    	type: DataType.STRING(255) 
+    })
+    	declare display?: string;
+
+    @Column({
+    	allowNull: true,
+    	type: DataType.INTEGER 
+    })
+    	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;
+
+    @HasMany(() => authAssignment, {
+    	sourceKey: "id" 
+    })
+    	declare authAssignments?: authAssignment[];
+
+	@HasMany(() => authRoleChild, {
+		sourceKey: "id" 
+	})
+		declare authRoleChildren?: authRoleChild[];
+
+	@BelongsTo(() => users, {
+		foreignKey: "created_by",
+		targetKey: "uuid"
+	})
+	declare user: users;
 }