@nocobase/sdk 0.9.1-alpha.2 → 0.9.2-alpha.2

package/es/APIClient.d.ts

@@ -19,12 +19,15 @@ export interface IResource {
 }
 export declare class Auth {
     protected api: APIClient;
+    protected NOCOBASE_LOCALE_KEY: string;
+    protected NOCOBASE_ROLE_KEY: string;
     protected options: {
         token: any;
         locale: any;
         role: any;
     };
     constructor(api: APIClient);
+    initKeys(): void;
     get locale(): string;
     get role(): string;
     get token(): string;

package/es/APIClient.js

@@ -1,114 +1,105 @@
 const _excluded = ["authClass", "storageClass"],
-      _excluded2 = ["values", "filter"];
-
+  _excluded2 = ["values", "filter"];
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
-
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-
 import axios from 'axios';
 import qs from 'qs';
 export class Auth {
   constructor(api) {
     this.api = void 0;
+    this.NOCOBASE_LOCALE_KEY = 'NOCOBASE_LOCALE';
+    this.NOCOBASE_ROLE_KEY = 'NOCOBASE_ROLE';
     this.options = {
       token: null,
       locale: null,
       role: null
     };
     this.api = api;
+    this.initKeys();
     this.locale = this.getLocale();
     this.role = this.getRole();
     this.token = this.getToken();
     this.api.axios.interceptors.request.use(this.middleware.bind(this));
   }
-
+  initKeys() {
+    if (!window) {
+      return;
+    }
+    const match = window.location.pathname.match(/^\/apps\/([^/]*)\//);
+    if (!match) {
+      return;
+    }
+    const appName = match[1];
+    this.NOCOBASE_LOCALE_KEY = `${appName.toUpperCase()}_NOCOBASE_LOCALE`;
+    this.NOCOBASE_ROLE_KEY = `${appName.toUpperCase()}_NOCOBASE_ROLE`;
+  }
   get locale() {
     return this.getLocale();
   }
-
   get role() {
     return this.getRole();
   }
-
   get token() {
     return this.getToken();
   }
-
   set locale(value) {
     this.setLocale(value);
   }
-
   set role(value) {
     this.setRole(value);
   }
-
   set token(value) {
     this.setToken(value);
   }
-
   middleware(config) {
     if (this.locale) {
       config.headers['X-Locale'] = this.locale;
     }
-
     if (this.role) {
       config.headers['X-Role'] = this.role;
     }
-
     if (this.token) {
       config.headers['Authorization'] = `Bearer ${this.token}`;
     }
-
     return config;
   }
-
   getLocale() {
-    return this.api.storage.getItem('NOCOBASE_LOCALE');
+    return this.api.storage.getItem(this.NOCOBASE_LOCALE_KEY);
   }
-
   setLocale(locale) {
     this.options.locale = locale;
-    this.api.storage.setItem('NOCOBASE_LOCALE', locale || '');
+    this.api.storage.setItem(this.NOCOBASE_LOCALE_KEY, locale || '');
   }
-
   getToken() {
     return this.api.storage.getItem('NOCOBASE_TOKEN');
   }
-
   setToken(token) {
     this.options.token = token;
     this.api.storage.setItem('NOCOBASE_TOKEN', token || '');
-
     if (!token) {
-      this.setRole(null); // this.setLocale(null);
+      this.setRole(null);
+      // this.setLocale(null);
     }
   }
 
   getRole() {
-    return this.api.storage.getItem('NOCOBASE_ROLE');
+    return this.api.storage.getItem(this.NOCOBASE_ROLE_KEY);
   }
-
   setRole(role) {
     this.options.role = role;
-    this.api.storage.setItem('NOCOBASE_ROLE', role || '');
+    this.api.storage.setItem(this.NOCOBASE_ROLE_KEY, role || '');
   }
-
   signIn(values, authenticator = 'password') {
     var _this = this;
-
     return _asyncToGenerator(function* () {
       var _response$data;
-
       const response = yield _this.api.request({
         method: 'post',
         url: 'users:signin',
@@ -118,26 +109,20 @@ export class Auth {
         }
       });
       const data = response === null || response === void 0 ? void 0 : (_response$data = response.data) === null || _response$data === void 0 ? void 0 : _response$data.data;
-
       _this.setToken(data === null || data === void 0 ? void 0 : data.token);
-
       return response;
     })();
   }
-
   signOut() {
     var _this2 = this;
-
     return _asyncToGenerator(function* () {
       yield _this2.api.request({
         method: 'post',
         url: 'users:signout'
       });
-
       _this2.setToken(null);
     })();
   }
-
 }
 export class Storage {}
 export class MemoryStorage extends Storage {
@@ -145,57 +130,45 @@ export class MemoryStorage extends Storage {
     super(...args);
     this.items = new Map();
   }
-
   clear() {
     this.items.clear();
   }
-
   getItem(key) {
     return this.items.get(key);
   }
-
   setItem(key, value) {
     return this.items.set(key, value);
   }
-
   removeItem(key) {
     return this.items.delete(key);
   }
-
 }
 export class APIClient {
   constructor(instance) {
     this.axios = void 0;
     this.auth = void 0;
     this.storage = void 0;
-
     if (typeof instance === 'function') {
       this.axios = instance;
     } else {
       const _ref = instance || {},
-            authClass = _ref.authClass,
-            storageClass = _ref.storageClass,
-            others = _objectWithoutProperties(_ref, _excluded);
-
+        authClass = _ref.authClass,
+        storageClass = _ref.storageClass,
+        others = _objectWithoutProperties(_ref, _excluded);
       this.axios = axios.create(others);
       this.initStorage(storageClass);
-
       if (authClass) {
         this.auth = new authClass(this);
       }
     }
-
     if (!this.storage) {
       this.initStorage();
     }
-
     if (!this.auth) {
       this.auth = new Auth(this);
     }
-
     this.interceptors();
   }
-
   initStorage(storage) {
     if (storage) {
       this.storage = new storage(this);
@@ -205,7 +178,6 @@ export class APIClient {
       this.storage = new MemoryStorage();
     }
   }
-
   interceptors() {
     this.axios.interceptors.request.use(config => {
       config.paramsSerializer = params => {
@@ -214,27 +186,21 @@ export class APIClient {
           arrayFormat: 'brackets'
         });
       };
-
       return config;
     });
   }
-
   request(config) {
     const resource = config.resource,
-          resourceOf = config.resourceOf,
-          action = config.action,
-          params = config.params;
-
+      resourceOf = config.resourceOf,
+      action = config.action,
+      params = config.params;
     if (resource) {
       return this.resource(resource, resourceOf)[action](params);
     }
-
     return this.axios.request(config);
   }
-
   resource(name, of) {
     var _this3 = this;
-
     const target = {};
     const handler = {
       get: (_, actionName) => {
@@ -243,22 +209,18 @@ export class APIClient {
         const config = {
           url
         };
-
         if (['get', 'list'].includes(actionName)) {
           config['method'] = 'get';
         } else {
           config['method'] = 'post';
         }
-
         return /*#__PURE__*/function () {
           var _ref2 = _asyncToGenerator(function* (params, opts) {
             const _ref3 = params || {},
-                  values = _ref3.values,
-                  filter = _ref3.filter,
-                  others = _objectWithoutProperties(_ref3, _excluded2);
-
+              values = _ref3.values,
+              filter = _ref3.filter,
+              others = _objectWithoutProperties(_ref3, _excluded2);
             config['params'] = others;
-
             if (filter) {
               if (typeof filter === 'string') {
                 config['params']['filter'] = filter;
@@ -266,14 +228,11 @@ export class APIClient {
                 config['params']['filter'] = JSON.stringify(filter);
               }
             }
-
             if (config.method !== 'get') {
               config['data'] = values || {};
             }
-
             return yield _this3.request(_objectSpread(_objectSpread({}, config), opts));
           });
-
           return function (_x, _x2) {
             return _ref2.apply(this, arguments);
           };
@@ -282,5 +241,4 @@ export class APIClient {
     };
     return new Proxy(target, handler);
   }
-
 }

package/lib/APIClient.d.ts

@@ -19,12 +19,15 @@ export interface IResource {
 }
 export declare class Auth {
     protected api: APIClient;
+    protected NOCOBASE_LOCALE_KEY: string;
+    protected NOCOBASE_ROLE_KEY: string;
     protected options: {
         token: any;
         locale: any;
         role: any;
     };
     constructor(api: APIClient);
+    initKeys(): void;
     get locale(): string;
     get role(): string;
     get token(): string;

package/lib/APIClient.js

@@ -4,122 +4,109 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.Storage = exports.MemoryStorage = exports.Auth = exports.APIClient = void 0;
-
 var _axios = _interopRequireDefault(require("axios"));
-
 var _qs = _interopRequireDefault(require("qs"));
-
 const _excluded = ["authClass", "storageClass"],
-      _excluded2 = ["values", "filter"];
-
+  _excluded2 = ["values", "filter"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
-
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-
 class Auth {
   constructor(api) {
     this.api = void 0;
+    this.NOCOBASE_LOCALE_KEY = 'NOCOBASE_LOCALE';
+    this.NOCOBASE_ROLE_KEY = 'NOCOBASE_ROLE';
     this.options = {
       token: null,
       locale: null,
       role: null
     };
     this.api = api;
+    this.initKeys();
     this.locale = this.getLocale();
     this.role = this.getRole();
     this.token = this.getToken();
     this.api.axios.interceptors.request.use(this.middleware.bind(this));
   }
-
+  initKeys() {
+    if (!window) {
+      return;
+    }
+    const match = window.location.pathname.match(/^\/apps\/([^/]*)\//);
+    if (!match) {
+      return;
+    }
+    const appName = match[1];
+    this.NOCOBASE_LOCALE_KEY = `${appName.toUpperCase()}_NOCOBASE_LOCALE`;
+    this.NOCOBASE_ROLE_KEY = `${appName.toUpperCase()}_NOCOBASE_ROLE`;
+  }
   get locale() {
     return this.getLocale();
   }
-
   get role() {
     return this.getRole();
   }
-
   get token() {
     return this.getToken();
   }
-
   set locale(value) {
     this.setLocale(value);
   }
-
   set role(value) {
     this.setRole(value);
   }
-
   set token(value) {
     this.setToken(value);
   }
-
   middleware(config) {
     if (this.locale) {
       config.headers['X-Locale'] = this.locale;
     }
-
     if (this.role) {
       config.headers['X-Role'] = this.role;
     }
-
     if (this.token) {
       config.headers['Authorization'] = `Bearer ${this.token}`;
     }
-
     return config;
   }
-
   getLocale() {
-    return this.api.storage.getItem('NOCOBASE_LOCALE');
+    return this.api.storage.getItem(this.NOCOBASE_LOCALE_KEY);
   }
-
   setLocale(locale) {
     this.options.locale = locale;
-    this.api.storage.setItem('NOCOBASE_LOCALE', locale || '');
+    this.api.storage.setItem(this.NOCOBASE_LOCALE_KEY, locale || '');
   }
-
   getToken() {
     return this.api.storage.getItem('NOCOBASE_TOKEN');
   }
-
   setToken(token) {
     this.options.token = token;
     this.api.storage.setItem('NOCOBASE_TOKEN', token || '');
-
     if (!token) {
-      this.setRole(null); // this.setLocale(null);
+      this.setRole(null);
+      // this.setLocale(null);
     }
   }
 
   getRole() {
-    return this.api.storage.getItem('NOCOBASE_ROLE');
+    return this.api.storage.getItem(this.NOCOBASE_ROLE_KEY);
   }
-
   setRole(role) {
     this.options.role = role;
-    this.api.storage.setItem('NOCOBASE_ROLE', role || '');
+    this.api.storage.setItem(this.NOCOBASE_ROLE_KEY, role || '');
   }
-
   signIn(values, authenticator = 'password') {
     var _this = this;
-
     return _asyncToGenerator(function* () {
       var _response$data;
-
       const response = yield _this.api.request({
         method: 'post',
         url: 'users:signin',
@@ -129,93 +116,69 @@ class Auth {
         }
       });
       const data = response === null || response === void 0 ? void 0 : (_response$data = response.data) === null || _response$data === void 0 ? void 0 : _response$data.data;
-
       _this.setToken(data === null || data === void 0 ? void 0 : data.token);
-
       return response;
     })();
   }
-
   signOut() {
     var _this2 = this;
-
     return _asyncToGenerator(function* () {
       yield _this2.api.request({
         method: 'post',
         url: 'users:signout'
       });
-
       _this2.setToken(null);
     })();
   }
-
 }
-
 exports.Auth = Auth;
-
 class Storage {}
-
 exports.Storage = Storage;
-
 class MemoryStorage extends Storage {
   constructor(...args) {
     super(...args);
     this.items = new Map();
   }
-
   clear() {
     this.items.clear();
   }
-
   getItem(key) {
     return this.items.get(key);
   }
-
   setItem(key, value) {
     return this.items.set(key, value);
   }
-
   removeItem(key) {
     return this.items.delete(key);
   }
-
 }
-
 exports.MemoryStorage = MemoryStorage;
-
 class APIClient {
   constructor(instance) {
     this.axios = void 0;
     this.auth = void 0;
     this.storage = void 0;
-
     if (typeof instance === 'function') {
       this.axios = instance;
     } else {
       const _ref = instance || {},
-            authClass = _ref.authClass,
-            storageClass = _ref.storageClass,
-            others = _objectWithoutProperties(_ref, _excluded);
-
+        authClass = _ref.authClass,
+        storageClass = _ref.storageClass,
+        others = _objectWithoutProperties(_ref, _excluded);
       this.axios = _axios.default.create(others);
       this.initStorage(storageClass);
-
       if (authClass) {
         this.auth = new authClass(this);
       }
     }
-
     if (!this.storage) {
       this.initStorage();
     }
-
     if (!this.auth) {
       this.auth = new Auth(this);
     }
-
     this.interceptors();
   }
-
   initStorage(storage) {
     if (storage) {
       this.storage = new storage(this);
@@ -225,7 +188,6 @@ class APIClient {
       this.storage = new MemoryStorage();
     }
   }
-
   interceptors() {
     this.axios.interceptors.request.use(config => {
       config.paramsSerializer = params => {
@@ -234,27 +196,21 @@ class APIClient {
           arrayFormat: 'brackets'
         });
       };
-
       return config;
     });
   }
-
   request(config) {
     const resource = config.resource,
-          resourceOf = config.resourceOf,
-          action = config.action,
-          params = config.params;
-
+      resourceOf = config.resourceOf,
+      action = config.action,
+      params = config.params;
     if (resource) {
       return this.resource(resource, resourceOf)[action](params);
     }
-
     return this.axios.request(config);
   }
-
   resource(name, of) {
     var _this3 = this;
-
     const target = {};
     const handler = {
       get: (_, actionName) => {
@@ -263,22 +219,18 @@ class APIClient {
         const config = {
           url
         };
-
         if (['get', 'list'].includes(actionName)) {
           config['method'] = 'get';
         } else {
           config['method'] = 'post';
         }
-
         return /*#__PURE__*/function () {
           var _ref2 = _asyncToGenerator(function* (params, opts) {
             const _ref3 = params || {},
-                  values = _ref3.values,
-                  filter = _ref3.filter,
-                  others = _objectWithoutProperties(_ref3, _excluded2);
-
+              values = _ref3.values,
+              filter = _ref3.filter,
+              others = _objectWithoutProperties(_ref3, _excluded2);
             config['params'] = others;
-
             if (filter) {
               if (typeof filter === 'string') {
                 config['params']['filter'] = filter;
@@ -286,14 +238,11 @@ class APIClient {
                 config['params']['filter'] = JSON.stringify(filter);
               }
             }
-
             if (config.method !== 'get') {
               config['data'] = values || {};
             }
-
             return yield _this3.request(_objectSpread(_objectSpread({}, config), opts));
           });
-
           return function (_x, _x2) {
             return _ref2.apply(this, arguments);
           };
@@ -302,7 +251,5 @@ class APIClient {
     };
     return new Proxy(target, handler);
   }
-
 }
-
 exports.APIClient = APIClient;

package/lib/index.js

@@ -3,9 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-
 var _APIClient = require("./APIClient");
-
 Object.keys(_APIClient).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _APIClient[key]) return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/sdk",
-  "version": "0.9.1-alpha.2",
+  "version": "0.9.2-alpha.2",
   "license": "Apache-2.0",
   "main": "lib",
   "module": "es/index.js",
@@ -12,5 +12,5 @@
   "devDependencies": {
     "axios-mock-adapter": "^1.20.0"
   },
-  "gitHead": "d588a68eca4feed4642a4cb317301011266fe5c9"
+  "gitHead": "1a0de6908b2b1854bdf434fcafa8909cb65bb8a3"
 }

package/src/APIClient.ts

@@ -25,6 +25,10 @@ export interface IResource {
 export class Auth {
   protected api: APIClient;
 
+  protected NOCOBASE_LOCALE_KEY = 'NOCOBASE_LOCALE';
+
+  protected NOCOBASE_ROLE_KEY = 'NOCOBASE_ROLE';
+
   protected options = {
     token: null,
     locale: null,
@@ -33,12 +37,26 @@ export class Auth {
 
   constructor(api: APIClient) {
     this.api = api;
+    this.initKeys();
     this.locale = this.getLocale();
     this.role = this.getRole();
     this.token = this.getToken();
     this.api.axios.interceptors.request.use(this.middleware.bind(this));
   }
 
+  initKeys() {
+    if (!window) {
+      return;
+    }
+    const match = window.location.pathname.match(/^\/apps\/([^/]*)\//);
+    if (!match) {
+      return;
+    }
+    const appName = match[1];
+    this.NOCOBASE_LOCALE_KEY = `${appName.toUpperCase()}_NOCOBASE_LOCALE`;
+    this.NOCOBASE_ROLE_KEY = `${appName.toUpperCase()}_NOCOBASE_ROLE`;
+  }
+
   get locale() {
     return this.getLocale();
   }
@@ -77,12 +95,12 @@ export class Auth {
   }
 
   getLocale() {
-    return this.api.storage.getItem('NOCOBASE_LOCALE');
+    return this.api.storage.getItem(this.NOCOBASE_LOCALE_KEY);
   }
 
   setLocale(locale: string) {
     this.options.locale = locale;
-    this.api.storage.setItem('NOCOBASE_LOCALE', locale || '');
+    this.api.storage.setItem(this.NOCOBASE_LOCALE_KEY, locale || '');
   }
 
   getToken() {
@@ -99,12 +117,12 @@ export class Auth {
   }
 
   getRole() {
-    return this.api.storage.getItem('NOCOBASE_ROLE');
+    return this.api.storage.getItem(this.NOCOBASE_ROLE_KEY);
   }
 
   setRole(role: string) {
     this.options.role = role;
-    this.api.storage.setItem('NOCOBASE_ROLE', role || '');
+    this.api.storage.setItem(this.NOCOBASE_ROLE_KEY, role || '');
   }
 
   async signIn(values, authenticator: string = 'password'): Promise<AxiosResponse<any>> {