@nocobase/sdk 2.2.0-beta.13 → 2.2.0-beta.14

package/lib/APIClient.d.ts

@@ -44,6 +44,7 @@ export declare class APIClient {
     storagePrefix: string;
     baseStoragePrefix: string;
     shareToken: boolean;
+    appName?: string;
     toErrMessages(error: any): any;
     getHeaders(): {};
     constructor(options?: APIClientOptions);

package/lib/APIClient.js

@@ -52,6 +52,7 @@ const _APIClient = class _APIClient {
   storagePrefix = "NOCOBASE_";
   baseStoragePrefix = "NOCOBASE_";
   shareToken = false;
+  appName;
   toErrMessages(error) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
     if (typeof document !== "undefined" && typeof ((_a = error == null ? void 0 : error.response) == null ? void 0 : _a.data) === "string") {
@@ -103,6 +104,7 @@ const _APIClient = class _APIClient {
         shareToken = false,
         ...others
       } = options || {};
+      this.appName = appName;
       this.shareToken = shareToken;
       this.baseStoragePrefix = storagePrefix;
       this.storagePrefix = appName ? `${storagePrefix}${appName.toUpperCase()}_` : storagePrefix;

package/lib/Auth.d.ts

@@ -18,6 +18,7 @@ export declare class Auth {
         token: any;
     };
     constructor(api: APIClient);
+    protected getCookieAppName(): string;
     get locale(): string;
     set locale(value: string);
     get role(): string;
@@ -77,6 +78,7 @@ export declare class Auth {
     middleware(config: AxiosRequestConfig): AxiosRequestConfig<any>;
     signIn(values: any, authenticator?: string): Promise<AxiosResponse<any>>;
     signUp(values: any, authenticator?: string): Promise<AxiosResponse<any>>;
+    syncCookies(): Promise<AxiosResponse<unknown> | undefined>;
     signOut(): Promise<AxiosResponse<any, any>>;
     lostPassword(values: any): Promise<AxiosResponse<any>>;
     resetPassword(values: any): Promise<AxiosResponse<any>>;

package/lib/Auth.js

@@ -30,7 +30,9 @@ __export(Auth_exports, {
   Auth: () => Auth
 });
 module.exports = __toCommonJS(Auth_exports);
+var import_auth_cookie = require("./auth-cookie");
 var import_headers = require("./headers");
+const SAFE_METHODS = /* @__PURE__ */ new Set(["get", "head", "options"]);
 const _Auth = class _Auth {
   api;
   get storagePrefix() {
@@ -46,6 +48,10 @@ const _Auth = class _Auth {
     this.api = api;
     this.api.axios.interceptors.request.use(this.middleware.bind(this));
   }
+  getCookieAppName() {
+    var _a;
+    return typeof this.api.options !== "function" && ((_a = this.api.options) == null ? void 0 : _a.appName) || this.api.appName || "main";
+  }
   get locale() {
     return this.getLocale();
   }
@@ -110,6 +116,7 @@ const _Auth = class _Auth {
    */
   setRole(role) {
     this.setOption("role", role);
+    (0, import_auth_cookie.setRoleCookie)(this.getCookieAppName(), role);
   }
   /**
    * @internal
@@ -157,6 +164,11 @@ const _Auth = class _Auth {
     if (this.token && !(0, import_headers.hasHeaderValue)(config.headers, "Authorization") && config.headers) {
       config.headers["Authorization"] = `Bearer ${this.token}`;
     }
+    const method = (config.method || "get").toLowerCase();
+    const csrfToken = (0, import_auth_cookie.getAuthCookieValue)("csrfToken", this.getCookieAppName());
+    if (!SAFE_METHODS.has(method) && csrfToken && !(0, import_headers.hasHeaderValue)(config.headers, "X-CSRF-Token") && config.headers) {
+      config.headers["X-CSRF-Token"] = csrfToken;
+    }
     return config;
   }
   async signIn(values, authenticator) {
@@ -184,6 +196,16 @@ const _Auth = class _Auth {
       }
     });
   }
+  async syncCookies() {
+    if (!this.token) {
+      return void 0;
+    }
+    return await this.api.request({
+      method: "post",
+      url: "auth:syncCookies",
+      skipNotify: true
+    });
+  }
   async signOut() {
     const response = await this.api.request({
       method: "post",

package/lib/auth-cookie.d.ts

@@ -0,0 +1,11 @@
+/**
+ * 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.
+ */
+import type { AuthCookieType } from '@nocobase/utils/client';
+export declare function setRoleCookie(appName: string | undefined, role?: string | null): void;
+export declare function getAuthCookieValue(type: AuthCookieType, appName: string | undefined): string;

package/lib/auth-cookie.js

@@ -0,0 +1,61 @@
+/**
+ * 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 auth_cookie_exports = {};
+__export(auth_cookie_exports, {
+  getAuthCookieValue: () => getAuthCookieValue,
+  setRoleCookie: () => setRoleCookie
+});
+module.exports = __toCommonJS(auth_cookie_exports);
+var import_client = require("@nocobase/utils/client");
+function setRoleCookie(appName, role) {
+  var _a, _b;
+  if (typeof document === "undefined") {
+    return;
+  }
+  const name = (0, import_client.getAuthCookieName)("role", appName);
+  const expires = role ? "" : "; Max-Age=0";
+  const value = role ? encodeURIComponent(role) : "";
+  const secure = ((_a = globalThis.location) == null ? void 0 : _a.protocol) === "https:" ? "; Secure" : "";
+  const publicPath = ((_b = window.__nocobase_public_path__) == null ? void 0 : _b.replace(/\/+$/g, "")) || "/";
+  document.cookie = `${name}=${value}; Path=${publicPath || "/"}; SameSite=Lax${secure}${expires}`;
+}
+__name(setRoleCookie, "setRoleCookie");
+function getAuthCookieValue(type, appName) {
+  var _a;
+  if (typeof document === "undefined") {
+    return;
+  }
+  const name = `${(0, import_client.getAuthCookieName)(type, appName)}=`;
+  return (_a = document.cookie.split(";").map((item) => item.trim()).find((item) => item.startsWith(name))) == null ? void 0 : _a.slice(name.length);
+}
+__name(getAuthCookieValue, "getAuthCookieValue");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getAuthCookieValue,
+  setRoleCookie
+});

package/lib/index.d.ts

@@ -7,6 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 export * from './APIClient';
+export * from './auth-cookie';
 export * from './Auth';
 export * from './headers';
 export * from './Storage';

package/lib/index.js

@@ -41,6 +41,7 @@ __export(src_exports, {
 });
 module.exports = __toCommonJS(src_exports);
 __reExport(src_exports, require("./APIClient"), module.exports);
+__reExport(src_exports, require("./auth-cookie"), module.exports);
 __reExport(src_exports, require("./Auth"), module.exports);
 __reExport(src_exports, require("./headers"), module.exports);
 __reExport(src_exports, require("./Storage"), module.exports);
@@ -49,6 +50,7 @@ var import_getSubAppName = __toESM(require("./getSubAppName"));
 0 && (module.exports = {
   getSubAppName,
   ...require("./APIClient"),
+  ...require("./auth-cookie"),
   ...require("./Auth"),
   ...require("./headers"),
   ...require("./Storage")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/sdk",
-  "version": "2.2.0-beta.13",
+  "version": "2.2.0-beta.14",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -9,7 +9,8 @@
     "qs": "^6.10.1"
   },
   "devDependencies": {
+    "@nocobase/utils": "2.x",
     "axios-mock-adapter": "^1.20.0"
   },
-  "gitHead": "8fff12b34f41f4336075cdafcc700ec694f9b78a"
+  "gitHead": "1ef021f3ce0a84469e40f181a19551a50b6f850c"
 }