Refactor app management to use Drizzle ORM

- Replaced Sequelize models with Drizzle ORM for app and app list management. - Updated routes in app-manager to utilize new database queries. - Removed obsolete Sequelize model files for app, app list, and app domain. - Introduced new helper functions for app and app domain management. - Enhanced user app management with improved file handling and user migration. - Adjusted public API routes to align with new database structure. - Implemented caching mechanisms for domain management.
2026-02-07 01:26:16 +08:00
parent d62a75842f
commit 7dfa96d165
40 changed files with 1066 additions and 1171 deletions
--- a/src/auth/models/user.ts
+++ b/src/auth/models/user.ts
@@ -1,45 +1,62 @@
-import { DataTypes, Model, Op, Sequelize } from 'sequelize';
 import { nanoid, customAlphabet } from 'nanoid';
 import { CustomError } from '@kevisual/router';
-import { Org } from './org.ts';
-
 import { useContextKey } from '@kevisual/context';
 import { Redis } from 'ioredis';
 import { oauth } from '../oauth/auth.ts';
 import { cryptPwd } from '../oauth/salt.ts';
 import { OauthUser } from '../oauth/oauth.ts';
-export const redis = useContextKey<Redis>('redis');
-import { UserSecret } from './user-secret.ts';
-type UserData = {
+import { db } from '../../modules/db.ts';
+import { cfUser, cfOrgs, cfUserSecrets } from '../../db/drizzle/schema.ts';
+import { eq, sql, InferSelectModel, InferInsertModel } from 'drizzle-orm';
+
+// 类型定义
+export type UserData = {
  orgs?: string[];
  wxUnionId?: string;
  phone?: string;
  canChangeUsername?: boolean;
 };
+
 export enum UserTypes {
-  'user' = 'user',
-  'org' = 'org',
-  'visitor' = 'visitor',
+  user = 'user',
+  org = 'org',
+  visitor = 'visitor',
 }
+
+export type UserSelect = InferSelectModel<typeof cfUser>;
+export type UserInsert = InferInsertModel<typeof cfUser>;
+export type OrgSelect = InferSelectModel<typeof cfOrgs>;
+
+const usersTable = cfUser;
+const orgsTable = cfOrgs;
+const userSecretsTable = cfUserSecrets;
+
+export const redis = useContextKey<Redis>('redis');
+
 /**
- * 用户模型,在sequelize和Org之后初始化
+ * 用户模型,使用 Drizzle ORM
 */
-export class User extends Model {
+export class User {
  static oauth = oauth;
-  declare id: string;
-  declare username: string;
-  declare nickname: string; // 昵称
-  declare password: string;
-  declare salt: string;
-  declare needChangePassword: boolean;
-  declare description: string;
-  declare data: UserData;
-  declare type: string; // user | org | visitor
-  declare owner: string;
-  declare orgId: string;
-  declare email: string;
-  declare avatar: string;
+  id: string;
+  username: string;
+  nickname: string;
+  password: string;
+  salt: string;
+  needChangePassword: boolean;
+  description: string;
+  data: UserData;
+  type: string;
+  owner: string;
+  orgId: string;
+  email: string;
+  avatar: string;
  tokenUser: any;
+
+  constructor(data: UserSelect) {
+    Object.assign(this, data);
+  }
+
  setTokenUser(tokenUser: any) {
    this.tokenUser = tokenUser;
  }
@@ -76,6 +93,7 @@ export class User extends Model {
   * @returns
   */
  static async verifyToken(token: string) {
+    const { UserSecret } = await import('./user-secret.ts');
    return await UserSecret.verifyToken(token);
  }
  /**
@@ -88,6 +106,7 @@ export class User extends Model {
    return { accessToken: token.accessToken, refreshToken: token.refreshToken, token: token.accessToken };
  }
  static async getOauthUser(token: string) {
+    const { UserSecret } = await import('./user-secret.ts');
    return await UserSecret.verifyToken(token);
  }
  /**
@@ -105,12 +124,16 @@ export class User extends Model {
   * @returns
   */
  static async getUserByToken(token: string) {
+    const { UserSecret } = await import('./user-secret.ts');
    const oauthUser = await UserSecret.verifyToken(token);
    if (!oauthUser) {
      throw new CustomError('Token is invalid. get UserByToken');
    }
    const userId = oauthUser?.uid || oauthUser.id;
    const user = await User.findByPk(userId);
+    if (!user) {
+      throw new CustomError('User not found');
+    }
    user.setTokenUser(oauthUser);
    return user;
  }
@@ -130,8 +153,33 @@ export class User extends Model {
    }
    return allUsers.includes(username);
  }
+
+  /**
+   * 根据主键查找用户
+   */
+  static async findByPk(id: string): Promise<User | null> {
+    const users = await db.select().from(usersTable).where(eq(usersTable.id, id)).limit(1);
+    return users.length > 0 ? new User(users[0]) : null;
+  }
+
+  /**
+   * 根据条件查找一个用户
+   */
+  static async findOne(where: { username?: string; id?: string }): Promise<User | null> {
+    let query = db.select().from(usersTable);
+    
+    if (where.username) {
+      query = query.where(eq(usersTable.username, where.username)) as any;
+    } else if (where.id) {
+      query = query.where(eq(usersTable.id, where.id)) as any;
+    }
+    
+    const users = await query.limit(1);
+    return users.length > 0 ? new User(users[0]) : null;
+  }
+
  static async createUser(username: string, password?: string, description?: string) {
-    const user = await User.findOne({ where: { username } });
+    const user = await User.findOne({ username });
    if (user) {
      throw new CustomError('User already exists');
    }
@@ -139,10 +187,20 @@ export class User extends Model {
    let needChangePassword = !password;
    password = password || '123456';
    const cPassword = cryptPwd(password, salt);
-    return await User.create({ username, password: cPassword, description, salt, needChangePassword });
+    
+    const inserted = await db.insert(usersTable).values({
+      username,
+      password: cPassword,
+      description,
+      salt,
+      needChangePassword,
+    }).returning();
+    
+    return new User(inserted[0]);
  }
+  
  static async createOrg(username: string, owner: string, description?: string) {
-    const user = await User.findOne({ where: { username } });
+    const user = await User.findOne({ username });
    if (user) {
      throw new CustomError('User already exists');
    }
@@ -153,24 +211,64 @@ export class User extends Model {
    if (me.type !== 'user') {
      throw new CustomError('Owner type is not user');
    }
+    
+    const { Org } = await import('./org.ts');
    const org = await Org.create({ username, description, users: [{ uid: owner, role: 'owner' }] });
-    const newUser = await User.create({ username, password: '', description, type: 'org', owner, orgId: org.id });
+    const inserted = await db.insert(usersTable).values({
+      username,
+      password: '',
+      description,
+      type: 'org',
+      owner,
+      orgId: org.id,
+    }).returning();
+    
    // owner add
    await redis.del(`user:${me.id}:orgs`);
-    return newUser;
+    return new User(inserted[0]);
  }
  async createPassword(password: string) {
    const salt = this.salt;
    const cPassword = cryptPwd(password, salt);
    this.password = cPassword;
-    await this.update({ password: cPassword });
+    await db.update(usersTable).set({ password: cPassword }).where(eq(usersTable.id, this.id));
    return cPassword;
  }
+  
  checkPassword(password: string) {
    const salt = this.salt;
    const cPassword = cryptPwd(password, salt);
    return this.password === cPassword;
  }
+
+  /**
+   * 更新用户
+   */
+  async update(data: Partial<UserInsert>) {
+    await db.update(usersTable).set(data).where(eq(usersTable.id, this.id));
+    Object.assign(this, data);
+  }
+
+  /**
+   * 保存用户
+   */
+  async save() {
+    await db.update(usersTable).set({
+      username: this.username,
+      nickname: this.nickname,
+      password: this.password,
+      email: this.email,
+      avatar: this.avatar,
+      salt: this.salt,
+      description: this.description,
+      type: this.type,
+      owner: this.owner,
+      orgId: this.orgId,
+      needChangePassword: this.needChangePassword,
+      data: this.data,
+      updatedAt: new Date().toISOString(),
+    }).where(eq(usersTable.id, this.id));
+  }
  /**
   * 获取用户信息, 需要先设置 tokenUser 或者设置 uid
   * @param uid 如果存在，则表示是组织，其中uid为真实用户
@@ -217,18 +315,14 @@ export class User extends Model {
    if (cache) {
      return JSON.parse(cache) as string[];
    }
-    const orgs = await Org.findAll({
-      order: [['updatedAt', 'DESC']],
-      where: {
-        users: {
-          [Op.contains]: [
-            {
-              uid: id,
-            },
-          ],
-        },
-      },
-    });
+    
+    // 使用 Drizzle 的 SQL 查询来检查 JSONB 数组
+    const orgs = await db
+      .select()
+      .from(orgsTable)
+      .where(sql`${orgsTable.users} @> ${JSON.stringify([{ uid: id }])}::jsonb`)
+      .orderBy(sql`${orgsTable.updatedAt} DESC`);
+    
    const orgNames = orgs.map((org) => org.username);
    if (orgNames.length > 0) {
      await redis.set(`user:${id}:orgs`, JSON.stringify(orgNames), 'EX', 60 * 60); // 1 hour
@@ -249,93 +343,27 @@ export class User extends Model {
    }
    return user?.username;
  }
-}
-export type SyncOpts = {
-  alter?: boolean;
-  logging?: any;
-  force?: boolean;
-};
-export const UserInit = async (newSequelize?: any, tableName?: string, sync?: SyncOpts) => {
-  const sequelize = useContextKey<Sequelize>('sequelize');
-  User.init(
-    {
-      id: {
-        type: DataTypes.UUID,
-        primaryKey: true,
-        defaultValue: DataTypes.UUIDV4,
-      },
-      username: {
-        type: DataTypes.STRING,
-        allowNull: false,
-        unique: true,
-        // 用户名或者手机号
-        // 创建后避免修改的字段，当注册用户后，用户名注册则默认不能用手机号
-      },
-      nickname: {
-        type: DataTypes.TEXT,
-        allowNull: true,
-      },

-      password: {
-        type: DataTypes.STRING,
-        allowNull: true,
-      },
-      email: {
-        type: DataTypes.STRING,
-        allowNull: true,
-      },
-      avatar: {
-        type: DataTypes.TEXT,
-        allowNull: true,
-      },
-      salt: {
-        type: DataTypes.STRING,
-        allowNull: true,
-      },
-      description: {
-        type: DataTypes.TEXT,
-      },
-      type: {
-        type: DataTypes.STRING,
-        defaultValue: 'user',
-      },
-      owner: {
-        type: DataTypes.UUID,
-      },
-      orgId: {
-        type: DataTypes.UUID,
-      },
-      needChangePassword: {
-        type: DataTypes.BOOLEAN,
-        defaultValue: false,
-      },
-      data: {
-        type: DataTypes.JSONB,
-        defaultValue: {},
-      },
-    },
-    {
-      sequelize: newSequelize || sequelize,
-      tableName: tableName || 'cf_user', // codeflow user
-      paranoid: true,
-    },
-  );
-  if (sync) {
-    await User.sync({ alter: true, logging: true, ...sync })
-      .then((res) => {
-        initializeUser();
-      })
-      .catch((err) => {
-        console.error('Sync User error', err);
-      });
-    return User;
+  /**
+   * 查找所有符合条件的用户
+   */
+  static async findAll(options: { where?: any; attributes?: string[] }) {
+    let query = db.select().from(usersTable);
+    
+    if (options.where?.id?.in) {
+      query = query.where(sql`${usersTable.id} = ANY(${options.where.id.in})`) as any;
+    }
+    
+    const users = await query;
+    return users.map(u => new User(u));
  }
-  return User;
-};
+}
+
 const letter = 'abcdefghijklmnopqrstuvwxyz';
 const custom = customAlphabet(letter, 6);
+
 export const initializeUser = async (pwd = custom()) => {
-  const w = await User.findOne({ where: { username: 'root' }, logging: false });
+  const w = await User.findOne({ username: 'root' });
  if (!w) {
    const root = await User.createUser('root', pwd, '系统管理员');
    const org = await User.createOrg('admin', root.id, '管理员');
@@ -354,8 +382,9 @@ export const initializeUser = async (pwd = custom()) => {
    };
  }
 };
+
 export const createDemoUser = async (username = 'demo', pwd = custom()) => {
-  const u = await User.findOne({ where: { username }, logging: false });
+  const u = await User.findOne({ username });
  if (!u) {
    const user = await User.createUser(username, pwd, 'demo');
    console.info('new Users name', user.username, pwd);
@@ -371,11 +400,10 @@ export const createDemoUser = async (username = 'demo', pwd = custom()) => {
    };
  }
 };
-// initializeUser();

 export class UserServices extends User {
  static async loginByPhone(phone: string) {
-    let user = await User.findOne({ where: { username: phone } });
+    let user = await User.findOne({ username: phone });
    let isNew = false;
    if (!user) {
      user = await User.createUser(phone, phone.slice(-6));