Merge branch 'main' of github.com:nocobase/nocobase into fix-ci-build

.github/workflows/nocobase-test-backend.yml

@@ -5,38 +5,40 @@ concurrency:
   cancel-in-progress: true
 
 on:
-  push:
+  workflow_dispatch:
-    branches:
+
-      - main
+  # push:
-      - next
+  #   branches:
-      - develop
+  #     - main
-    paths:
+  #     - next
-      - 'package.json'
+  #     - develop
-      - '**/yarn.lock'
+  #   paths:
-      - 'packages/core/acl/**'
+  #     - 'package.json'
-      - 'packages/core/auth/**'
+  #     - '**/yarn.lock'
-      - 'packages/core/actions/**'
+  #     - 'packages/core/acl/**'
-      - 'packages/core/database/**'
+  #     - 'packages/core/auth/**'
-      - 'packages/core/resourcer/**'
+  #     - 'packages/core/actions/**'
-      - 'packages/core/data-source-manager/**'
+  #     - 'packages/core/database/**'
-      - 'packages/core/server/**'
+  #     - 'packages/core/resourcer/**'
-      - 'packages/core/utils/**'
+  #     - 'packages/core/data-source-manager/**'
-      - 'packages/plugins/**/src/server/**'
+  #     - 'packages/core/server/**'
-      - '.github/workflows/nocobase-test-backend.yml'
+  #     - 'packages/core/utils/**'
-  pull_request:
+  #     - 'packages/plugins/**/src/server/**'
-    paths:
+  #     - '.github/workflows/nocobase-test-backend.yml'
-      - 'package.json'
+  # pull_request:
-      - '**/yarn.lock'
+  #   paths:
-      - 'packages/core/acl/**'
+  #     - 'package.json'
-      - 'packages/core/auth/**'
+  #     - '**/yarn.lock'
-      - 'packages/core/actions/**'
+  #     - 'packages/core/acl/**'
-      - 'packages/core/database/**'
+  #     - 'packages/core/auth/**'
-      - 'packages/core/resourcer/**'
+  #     - 'packages/core/actions/**'
-      - 'packages/core/data-source-manager/**'
+  #     - 'packages/core/database/**'
-      - 'packages/core/server/**'
+  #     - 'packages/core/resourcer/**'
-      - 'packages/core/utils/**'
+  #     - 'packages/core/data-source-manager/**'
-      - 'packages/plugins/**/src/server/**'
+  #     - 'packages/core/server/**'
-      - '.github/workflows/nocobase-test-backend.yml'
+  #     - 'packages/core/utils/**'
+  #     - 'packages/plugins/**/src/server/**'
+  #     - '.github/workflows/nocobase-test-backend.yml'
 
 jobs:
   sqlite-test:

packages/plugins/@nocobase/plugin-auth/src/server/basic-auth.ts

@@ -47,7 +47,7 @@ export class BasicAuth extends BaseAuth {
     const valid = await field.verify(password, user.password);
     if (!valid) {
       ctx.throw(401, ctx.t('The username/email or password is incorrect, please re-enter', { ns: namespace }), {
-        code: 'INCORRECT_PASSWORD',
+        internalCode: 'INCORRECT_PASSWORD',
         user,
       });
     }