@nocobase/sdk 2.0.0-alpha.61 → 2.0.0-alpha.63

package/lib/APIClient.d.ts

@@ -29,6 +29,7 @@ interface ExtendedOptions {
     storageClass?: any;
     storagePrefix?: string;
     appName?: string;
+    shareToken?: boolean;
 }
 export type APIClientOptions = AxiosInstance | (AxiosRequestConfig & ExtendedOptions);
 export declare class APIClient {
@@ -38,6 +39,7 @@ export declare class APIClient {
     storage: BaseStorage;
     storagePrefix: string;
     baseStoragePrefix: string;
+    shareToken: boolean;
     toErrMessages(error: any): any;
     getHeaders(): {};
     constructor(options?: APIClientOptions);

package/lib/APIClient.js

@@ -51,6 +51,7 @@ const _APIClient = class _APIClient {
   storage;
   storagePrefix = "NOCOBASE_";
   baseStoragePrefix = "NOCOBASE_";
+  shareToken = false;
   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") {
@@ -93,7 +94,16 @@ const _APIClient = class _APIClient {
     if (typeof options === "function") {
       this.axios = options;
     } else {
-      const { appName, authClass, storageType, storageClass, storagePrefix = "NOCOBASE_", ...others } = options || {};
+      const {
+        appName,
+        authClass,
+        storageType,
+        storageClass,
+        storagePrefix = "NOCOBASE_",
+        shareToken = false,
+        ...others
+      } = options || {};
+      this.shareToken = shareToken;
       this.baseStoragePrefix = storagePrefix;
       this.storagePrefix = appName ? `${storagePrefix}${appName.toUpperCase()}_` : storagePrefix;
       this.axios = import_axios.default.create(others);
@@ -112,10 +122,10 @@ const _APIClient = class _APIClient {
   }
   createStorage(storageType) {
     if (storageType === "localStorage" && typeof localStorage !== "undefined") {
-      return new import_Storage.LocalStorage(this.storagePrefix, this.baseStoragePrefix);
+      return new import_Storage.LocalStorage(this.storagePrefix, this.baseStoragePrefix, this.shareToken);
     }
     if (storageType === "sessionStorage" && typeof sessionStorage !== "undefined") {
-      return new import_Storage.SessionStorage(this.storagePrefix, this.baseStoragePrefix);
+      return new import_Storage.SessionStorage(this.storagePrefix, this.baseStoragePrefix, this.shareToken);
     }
     return new import_Storage.MemoryStorage();
   }
@@ -124,15 +134,7 @@ const _APIClient = class _APIClient {
       this.storage = new storage(this);
       return;
     }
-    if (storageType === "localStorage" && typeof localStorage !== "undefined") {
-      this.storage = new import_Storage.LocalStorage(this.storagePrefix, this.baseStoragePrefix);
-      return;
-    }
-    if (storageType === "sessionStorage" && typeof sessionStorage !== "undefined") {
-      this.storage = new import_Storage.SessionStorage(this.storagePrefix, this.baseStoragePrefix);
-      return;
-    }
-    this.storage = new import_Storage.MemoryStorage();
+    this.storage = this.createStorage(storageType);
   }
   interceptors() {
     this.axios.interceptors.request.use((config) => {

package/lib/Storage.d.ts

@@ -24,8 +24,9 @@ export declare class MemoryStorage extends BaseStorage {
 export declare class LocalStorage extends BaseStorage {
     storagePrefix: string;
     baseStoragePrefix: string;
+    shareToken: boolean;
     items: Storage;
-    constructor(storagePrefix: string, baseStoragePrefix?: string);
+    constructor(storagePrefix: string, baseStoragePrefix?: string, shareToken?: boolean);
     clear(): void;
     getItem(key: string): string;
     setItem(key: string, value: string): void;
@@ -34,5 +35,6 @@ export declare class LocalStorage extends BaseStorage {
 export declare class SessionStorage extends LocalStorage {
     storagePrefix: string;
     baseStoragePrefix: string;
-    constructor(storagePrefix: string, baseStoragePrefix?: string);
+    shareToken: boolean;
+    constructor(storagePrefix: string, baseStoragePrefix?: string, shareToken?: boolean);
 }

package/lib/Storage.js

@@ -59,10 +59,11 @@ const _MemoryStorage = class _MemoryStorage extends BaseStorage {
 __name(_MemoryStorage, "MemoryStorage");
 let MemoryStorage = _MemoryStorage;
 const _LocalStorage = class _LocalStorage extends BaseStorage {
-  constructor(storagePrefix, baseStoragePrefix = "") {
+  constructor(storagePrefix, baseStoragePrefix = "", shareToken = false) {
     super();
     this.storagePrefix = storagePrefix;
     this.baseStoragePrefix = baseStoragePrefix;
+    this.shareToken = shareToken;
     this.items = window.localStorage;
   }
   items;
@@ -70,27 +71,32 @@ const _LocalStorage = class _LocalStorage extends BaseStorage {
     return this.items.clear();
   }
   getItem(key) {
-    const value = this.items.getItem(this.toUpperCase(this.storagePrefix, key));
-    if (key === "token" && this.baseStoragePrefix) {
-      return value || this.items.getItem(this.toUpperCase(this.baseStoragePrefix, key));
+    if (this.shareToken && key === "token" && this.baseStoragePrefix) {
+      return this.items.getItem(this.toUpperCase(this.baseStoragePrefix, key));
     }
-    return value;
+    return this.items.getItem(this.toUpperCase(this.storagePrefix, key));
   }
   setItem(key, value) {
-    console.log("setItem", this.toUpperCase(this.storagePrefix, key), value);
+    if (this.shareToken && key === "token" && this.baseStoragePrefix) {
+      return this.items.setItem(this.toUpperCase(this.baseStoragePrefix, key), value);
+    }
     return this.items.setItem(this.toUpperCase(this.storagePrefix, key), value);
   }
   removeItem(key) {
+    if (this.shareToken && key === "token" && this.baseStoragePrefix) {
+      return this.items.removeItem(this.toUpperCase(this.baseStoragePrefix, key));
+    }
     return this.items.removeItem(this.toUpperCase(this.storagePrefix, key));
   }
 };
 __name(_LocalStorage, "LocalStorage");
 let LocalStorage = _LocalStorage;
 const _SessionStorage = class _SessionStorage extends LocalStorage {
-  constructor(storagePrefix, baseStoragePrefix = "") {
-    super(storagePrefix, baseStoragePrefix);
+  constructor(storagePrefix, baseStoragePrefix = "", shareToken = false) {
+    super(storagePrefix, baseStoragePrefix, shareToken);
     this.storagePrefix = storagePrefix;
     this.baseStoragePrefix = baseStoragePrefix;
+    this.shareToken = shareToken;
     this.items = window.sessionStorage;
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/sdk",
-  "version": "2.0.0-alpha.61",
+  "version": "2.0.0-alpha.63",
   "license": "AGPL-3.0",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -11,5 +11,5 @@
   "devDependencies": {
     "axios-mock-adapter": "^1.20.0"
   },
-  "gitHead": "f48b11fd3842abbbbc7bbeb751943d80bc5134bb"
+  "gitHead": "0d5e9eb45e4d0f3ba70d7561a0d296d12a4d8bf8"
 }