@ruiapp/rapid-core 0.8.14 → 0.8.16

package/dist/index.js

@@ -5466,13 +5466,16 @@ class MetaService {
             for (const index of model.indexes) {
                 const sqlCreateIndex = generateTableIndexDDL(queryBuilder, server, model, index);
                 try {
-                    await server.queryDatabaseObject(sqlCreateIndex, [], null);
+                    await server.queryDatabaseObject(sqlCreateIndex, [], null, true);
                 }
                 catch (err) {
                     const logger = this.#server.getLogger();
                     if (err.message.includes("already exists")) {
                         logger.warn("Failed to create index.", { errorMessage: err.message, sqlCreateIndex });
                     }
+                    else {
+                        logger.error("Failed to create index.", { errorMessage: err.message, sqlCreateIndex });
+                    }
                 }
             }
         }
@@ -6824,11 +6827,18 @@ async function handler$d(plugin, ctx, options) {
                 field: "login",
                 value: account,
             },
+            {
+                operator: "null",
+                field: "deletedAt",
+            },
         ],
     }, routeContext?.getDbTransactionClient());
     if (!user) {
         throw new Error("用户名或密码错误。");
     }
+    if (user.state !== "enabled") {
+        throw new Error("用户已被禁用，不允许登录。");
+    }
     const isMatch = await bcrypt__default["default"].compare(password, user.password);
     if (!isMatch) {
         throw new Error("用户名或密码错误。");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ruiapp/rapid-core",
-  "version": "0.8.14",
+  "version": "0.8.16",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/plugins/auth/actionHandlers/createSession.ts

@@ -26,6 +26,10 @@ export async function handler(plugin: RapidPlugin, ctx: ActionHandlerContext, op
           field: "login",
           value: account,
         },
+        {
+          operator: "null",
+          field: "deletedAt",
+        },
       ],
     },
     routeContext?.getDbTransactionClient(),
@@ -35,6 +39,10 @@ export async function handler(plugin: RapidPlugin, ctx: ActionHandlerContext, op
     throw new Error("用户名或密码错误。");
   }
 
+  if (user.state !== "enabled") {
+    throw new Error("用户已被禁用，不允许登录。");
+  }
+
   const isMatch = await bcrypt.compare(password, user.password);
   if (!isMatch) {
     throw new Error("用户名或密码错误。");

package/src/plugins/metaManage/services/MetaService.ts

@@ -361,11 +361,13 @@ export default class MetaService {
       for (const index of model.indexes) {
         const sqlCreateIndex = generateTableIndexDDL(queryBuilder, server, model, index);
         try {
-          await server.queryDatabaseObject(sqlCreateIndex, [], null);
+          await server.queryDatabaseObject(sqlCreateIndex, [], null, true);
         } catch (err: any) {
           const logger = this.#server.getLogger();
           if ((err as Error).message.includes("already exists")) {
             logger.warn("Failed to create index.", { errorMessage: err.message, sqlCreateIndex });
+          } else {
+            logger.error("Failed to create index.", { errorMessage: err.message, sqlCreateIndex });
           }
         }
       }