@nocobase/sdk 2.0.31 → 2.0.33

package/lib/Auth.js

@@ -30,6 +30,7 @@ __export(Auth_exports, {
   Auth: () => Auth
 });
 module.exports = __toCommonJS(Auth_exports);
+var import_headers = require("./headers");
 const _Auth = class _Auth {
   api;
   get storagePrefix() {
@@ -150,10 +151,10 @@ const _Auth = class _Auth {
     if (this.role) {
       config.headers["X-Role"] = this.role;
     }
-    if (this.authenticator && !config.headers["X-Authenticator"]) {
+    if (this.authenticator && !(0, import_headers.hasHeaderValue)(config.headers, "X-Authenticator")) {
       config.headers["X-Authenticator"] = this.authenticator;
     }
-    if (this.token) {
+    if (this.token && !(0, import_headers.hasHeaderValue)(config.headers, "Authorization")) {
       config.headers["Authorization"] = `Bearer ${this.token}`;
     }
     return config;

package/lib/headers.d.ts

@@ -0,0 +1,9 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+export declare const hasHeaderValue: (headers: any, headerName: string) => boolean;

package/lib/headers.js

@@ -0,0 +1,48 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var headers_exports = {};
+__export(headers_exports, {
+  hasHeaderValue: () => hasHeaderValue
+});
+module.exports = __toCommonJS(headers_exports);
+const getHeaderValue = /* @__PURE__ */ __name((headers, headerName) => {
+  if (!headers) {
+    return void 0;
+  }
+  const source = typeof headers.toJSON === "function" ? headers.toJSON() : headers;
+  const matchedKey = Object.keys(source || {}).find((key) => key.toLowerCase() === headerName.toLowerCase());
+  return matchedKey ? source[matchedKey] : void 0;
+}, "getHeaderValue");
+const hasHeaderValue = /* @__PURE__ */ __name((headers, headerName) => {
+  const value = getHeaderValue(headers, headerName);
+  return value !== void 0 && value !== null && value !== "";
+}, "hasHeaderValue");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  hasHeaderValue
+});

package/lib/index.d.ts

@@ -8,5 +8,6 @@
  */
 export * from './APIClient';
 export * from './Auth';
+export * from './headers';
 export * from './Storage';
 export { default as getSubAppName } from './getSubAppName';

package/lib/index.js

@@ -42,6 +42,7 @@ __export(src_exports, {
 module.exports = __toCommonJS(src_exports);
 __reExport(src_exports, require("./APIClient"), module.exports);
 __reExport(src_exports, require("./Auth"), module.exports);
+__reExport(src_exports, require("./headers"), module.exports);
 __reExport(src_exports, require("./Storage"), module.exports);
 var import_getSubAppName = __toESM(require("./getSubAppName"));
 // Annotate the CommonJS export names for ESM import in node:
@@ -49,5 +50,6 @@ var import_getSubAppName = __toESM(require("./getSubAppName"));
   getSubAppName,
   ...require("./APIClient"),
   ...require("./Auth"),
+  ...require("./headers"),
   ...require("./Storage")
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/sdk",
-  "version": "2.0.31",
+  "version": "2.0.33",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -11,5 +11,5 @@
   "devDependencies": {
     "axios-mock-adapter": "^1.20.0"
   },
-  "gitHead": "085eec006c7be5fbc98dabfdab98ff358eab9d95"
+  "gitHead": "718994b7979f35ad7ab0ad86f49592b19048f948"
 }