@nocobase/plugin-action-custom-request 2.2.0-beta.7 → 2.2.0-beta.9

package/dist/externalVersion.js

@@ -8,23 +8,23 @@
  */
 
 module.exports = {
-  "@nocobase/client": "2.2.0-beta.7",
+  "@nocobase/client": "2.2.0-beta.9",
   "react": "18.2.0",
   "react-i18next": "11.18.6",
   "@formily/react": "2.3.7",
-  "@nocobase/client-v2": "2.2.0-beta.7",
-  "@nocobase/flow-engine": "2.2.0-beta.7",
+  "@nocobase/client-v2": "2.2.0-beta.9",
+  "@nocobase/flow-engine": "2.2.0-beta.9",
   "antd": "5.24.2",
   "@emotion/css": "11.13.0",
-  "@nocobase/utils": "2.2.0-beta.7",
-  "@nocobase/logger": "2.2.0-beta.7",
-  "@nocobase/server": "2.2.0-beta.7",
-  "@nocobase/test": "2.2.0-beta.7",
+  "@nocobase/utils": "2.2.0-beta.9",
+  "@nocobase/logger": "2.2.0-beta.9",
+  "@nocobase/server": "2.2.0-beta.9",
+  "@nocobase/test": "2.2.0-beta.9",
   "@formily/antd-v5": "1.2.3",
   "lodash": "4.18.1",
   "@formily/shared": "2.3.7",
-  "@nocobase/actions": "2.2.0-beta.7",
-  "@nocobase/evaluators": "2.2.0-beta.7",
+  "@nocobase/actions": "2.2.0-beta.9",
+  "@nocobase/evaluators": "2.2.0-beta.9",
   "axios": "1.7.7",
-  "@nocobase/database": "2.2.0-beta.7"
+  "@nocobase/database": "2.2.0-beta.9"
 };

package/dist/locale/en-US.json

@@ -24,6 +24,7 @@
   "Request settings": "Request settings",
   "Response type": "Response type",
   "Roles": "Roles",
+  "Runtime request options cannot override the request target": "Runtime request options cannot override the request target",
   "Stream": "Stream",
   "Timeout config": "Timeout config",
   "Title": "Title",

package/dist/locale/zh-CN.json

@@ -24,6 +24,7 @@
   "Request settings": "请求设置",
   "Response type": "响应类型",
   "Roles": "角色",
+  "Runtime request options cannot override the request target": "运行时请求选项不能覆盖请求目标",
   "Stream": "流",
   "Timeout config": "超时设置",
   "Title": "标题",

package/dist/server/actions/send.js

@@ -91,6 +91,21 @@ const omitNullAndUndefined = (obj) => {
     return acc;
   }, {});
 };
+const RuntimeTargetOptionKeys = /* @__PURE__ */ new Set([
+  "url",
+  "baseURL",
+  "proxy",
+  "socketPath",
+  "transport",
+  "httpAgent",
+  "httpsAgent"
+]);
+const getForbiddenRuntimeTargetOptionKeys = (runtimeOptions) => {
+  if (!runtimeOptions || typeof runtimeOptions !== "object" || Array.isArray(runtimeOptions)) {
+    return [];
+  }
+  return Object.keys(runtimeOptions).filter((key) => RuntimeTargetOptionKeys.has(key));
+};
 const CurrentUserVariableRegExp = /{{\s*(?:ctx\.)?(currentUser[^}]+)\s*}}/g;
 const getCurrentUserAppends = (str, user) => {
   const matched = str.matchAll(CurrentUserVariableRegExp);
@@ -165,6 +180,13 @@ async function send(ctx, next) {
   if (!requestConfig) {
     ctx.throw(404, "request config not found");
   }
+  const forbiddenRuntimeOptionKeys = getForbiddenRuntimeTargetOptionKeys(runtimeOptions);
+  if (forbiddenRuntimeOptionKeys.length) {
+    return ctx.throw(
+      400,
+      ctx.t("Runtime request options cannot override the request target", { ns: "action-custom-request" })
+    );
+  }
   ctx.withoutDataWrapping = true;
   const mergedOptions = {
     ...requestConfig.options || {},

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-action-custom-request",
-  "version": "2.2.0-beta.7",
+  "version": "2.2.0-beta.9",
   "main": "dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/action-custom-request",
   "homepage.ru-RU": "https://docs-ru.nocobase.com/handbook/action-custom-request",
@@ -34,7 +34,7 @@
     "@nocobase/server": "2.x",
     "@nocobase/test": "2.x"
   },
-  "gitHead": "e6a3fa8963a73cd9ddfc1273d71b0012483e1ad8",
+  "gitHead": "60e3d7abbaa0c7cead76f71a4f3d5eedb6b8acdb",
   "keywords": [
     "Actions"
   ]