@nocobase/server 1.6.0-alpha.4 → 1.6.0-alpha.6

package/lib/application.d.ts

@@ -15,8 +15,8 @@ import Database, { CollectionOptions, IDatabaseOptions } from '@nocobase/databas
 import { Logger, LoggerOptions, RequestLoggerOptions, SystemLogger, SystemLoggerOptions } from '@nocobase/logger';
 import { ResourceOptions, Resourcer } from '@nocobase/resourcer';
 import { Telemetry, TelemetryOptions } from '@nocobase/telemetry';
-import { AsyncEmitter, ToposortOptions } from '@nocobase/utils';
 import { LockManager, LockManagerOptions } from '@nocobase/lock-manager';
+import { AsyncEmitter, ToposortOptions } from '@nocobase/utils';
 import { Command, CommandOptions, ParseOptions } from 'commander';
 import { IncomingMessage, ServerResponse } from 'http';
 import { i18n, InitOptions } from 'i18next';

package/lib/application.js

@@ -49,8 +49,8 @@ var import_data_source_manager = require("@nocobase/data-source-manager");
 var import_database = __toESM(require("@nocobase/database"));
 var import_logger = require("@nocobase/logger");
 var import_telemetry = require("@nocobase/telemetry");
-var import_utils = require("@nocobase/utils");
 var import_lock_manager = require("@nocobase/lock-manager");
+var import_utils = require("@nocobase/utils");
 var import_crypto = require("crypto");
 var import_glob = __toESM(require("glob"));
 var import_koa = __toESM(require("koa"));
@@ -76,6 +76,7 @@ var import_plugin_manager = require("./plugin-manager");
 var import_pub_sub_manager = require("./pub-sub-manager");
 var import_sync_message_manager = require("./sync-message-manager");
 var import_package = __toESM(require("../package.json"));
+var import_available_action = require("./acl/available-action");
 var import_audit_manager = require("./audit-manager");
 const _Application = class _Application extends import_koa.default {
   constructor(options) {
@@ -863,6 +864,13 @@ const _Application = class _Application extends import_koa.default {
       name: "auth",
       actions: import_auth.actions
     });
+    this._dataSourceManager.afterAddDataSource((dataSource) => {
+      if (dataSource.collectionManager instanceof import_data_source_manager.SequelizeCollectionManager) {
+        for (const [actionName, actionParams] of Object.entries(import_available_action.availableActions)) {
+          dataSource.acl.setAvailableAction(actionName, actionParams);
+        }
+      }
+    });
     this._dataSourceManager.use(this._authManager.middleware(), { tag: "auth" });
     this._dataSourceManager.use(import_validate_filter_params.default, { tag: "validate-filter-params", before: ["auth"] });
     this._dataSourceManager.use(import_middlewares.parseVariables, {

package/lib/audit-manager/index.js

@@ -260,6 +260,8 @@ const _AuditManager = class _AuditManager {
       const auditLog = this.formatAuditData(ctx);
       auditLog.uuid = reqId;
       auditLog.status = ctx.status;
+      const defaultMetaData = await this.getDefaultMetaData(ctx);
+      auditLog.metadata = { ...metadata, ...defaultMetaData };
       if (typeof action !== "string") {
         if (action.getUserInfo) {
           const userInfo = await action.getUserInfo(ctx);
@@ -274,10 +276,15 @@ const _AuditManager = class _AuditManager {
         }
         if (action.getMetaData) {
           const extra = await action.getMetaData(ctx);
-          auditLog.metadata = { ...metadata, ...extra };
-        } else {
-          const defaultMetaData = await this.getDefaultMetaData(ctx);
-          auditLog.metadata = { ...metadata, ...defaultMetaData };
+          if (extra) {
+            if (extra.request) {
+              auditLog.metadata.request = { ...auditLog.metadata.request, ...extra.request };
+            }
+            if (extra.response) {
+              auditLog.metadata.response = { ...auditLog.metadata.response, ...extra.response };
+            }
+            auditLog.metadata = { ...extra, ...auditLog.metadata };
+          }
         }
         if (action.getSourceAndTarget) {
           const sourceAndTarget = await action.getSourceAndTarget(ctx);
@@ -288,9 +295,6 @@ const _AuditManager = class _AuditManager {
             auditLog.targetRecordUK = sourceAndTarget.targetRecordUK;
           }
         }
-      } else {
-        const defaultMetaData = await this.getDefaultMetaData(ctx);
-        auditLog.metadata = { ...metadata, ...defaultMetaData };
       }
       this.logger.log(auditLog);
     } catch (err) {

package/lib/middlewares/data-template.js

@@ -32,12 +32,12 @@ __export(data_template_exports, {
 module.exports = __toCommonJS(data_template_exports);
 async function dataTemplate(ctx, next) {
   const { resourceName, actionName } = ctx.action;
-  const { isTemplate, fields } = ctx.action.params;
+  const { isTemplate, fields, appends } = ctx.action.params;
   await next();
-  if (isTemplate && actionName === "get" && fields.length > 0) {
+  if (isTemplate && actionName === "get") {
     ctx.body = traverseJSON(JSON.parse(JSON.stringify(ctx.body)), {
-      collection: ctx.db.getCollection(resourceName),
-      include: fields
+      collection: ctx.getCurrentRepository().collection,
+      include: [...fields || [], ...appends || []]
     });
   }
 }
@@ -101,7 +101,7 @@ const traverseJSON = /* @__PURE__ */ __name((data, options) => {
       result[key] = data[key];
       continue;
     }
-    if (field.options.primaryKey && excludePk) {
+    if (field.options.primaryKey && excludePk && !collection.isMultiFilterTargetKey()) {
       continue;
     }
     if (field.options.isForeignKey) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nocobase/server",
-    "version": "1.6.0-alpha.4",
+    "version": "1.6.0-alpha.6",
     "main": "lib/index.js",
     "types": "./lib/index.d.ts",
     "license": "AGPL-3.0",
@@ -10,19 +10,19 @@
         "@koa/cors": "^3.1.0",
         "@koa/multer": "^3.0.2",
         "@koa/router": "^9.4.0",
-        "@nocobase/acl": "1.6.0-alpha.4",
-        "@nocobase/actions": "1.6.0-alpha.4",
-        "@nocobase/auth": "1.6.0-alpha.4",
-        "@nocobase/cache": "1.6.0-alpha.4",
-        "@nocobase/data-source-manager": "1.6.0-alpha.4",
-        "@nocobase/database": "1.6.0-alpha.4",
-        "@nocobase/evaluators": "1.6.0-alpha.4",
-        "@nocobase/lock-manager": "1.6.0-alpha.4",
-        "@nocobase/logger": "1.6.0-alpha.4",
-        "@nocobase/resourcer": "1.6.0-alpha.4",
-        "@nocobase/sdk": "1.6.0-alpha.4",
-        "@nocobase/telemetry": "1.6.0-alpha.4",
-        "@nocobase/utils": "1.6.0-alpha.4",
+        "@nocobase/acl": "1.6.0-alpha.6",
+        "@nocobase/actions": "1.6.0-alpha.6",
+        "@nocobase/auth": "1.6.0-alpha.6",
+        "@nocobase/cache": "1.6.0-alpha.6",
+        "@nocobase/data-source-manager": "1.6.0-alpha.6",
+        "@nocobase/database": "1.6.0-alpha.6",
+        "@nocobase/evaluators": "1.6.0-alpha.6",
+        "@nocobase/lock-manager": "1.6.0-alpha.6",
+        "@nocobase/logger": "1.6.0-alpha.6",
+        "@nocobase/resourcer": "1.6.0-alpha.6",
+        "@nocobase/sdk": "1.6.0-alpha.6",
+        "@nocobase/telemetry": "1.6.0-alpha.6",
+        "@nocobase/utils": "1.6.0-alpha.6",
         "@types/decompress": "4.2.7",
         "@types/ini": "^1.3.31",
         "@types/koa-send": "^4.1.3",
@@ -56,5 +56,5 @@
         "@types/serve-handler": "^6.1.1",
         "@types/ws": "^8.5.5"
     },
-    "gitHead": "595d5236feda9258791dac76270494721813b7e1"
+    "gitHead": "485580ad30e5164ead7e15f3b4d219f2bce2caf4"
 }