@nocobase/sdk 0.9.4-alpha.2 → 0.10.0-alpha.3

package/es/APIClient.d.ts

@@ -19,30 +19,42 @@ export interface IResource {
 }
 export declare class Auth {
     protected api: APIClient;
-    protected NOCOBASE_LOCALE_KEY: string;
-    protected NOCOBASE_ROLE_KEY: string;
+    protected KEYS: {
+        locale: string;
+        role: string;
+        token: string;
+        authenticator: string;
+    };
     protected options: {
-        token: any;
         locale: any;
         role: any;
+        authenticator: any;
+        token: any;
     };
     constructor(api: APIClient);
     initKeys(): void;
     get locale(): string;
-    get role(): string;
-    get token(): string;
     set locale(value: string);
+    get role(): string;
     set role(value: string);
+    get token(): string;
     set token(value: string);
-    middleware(config: AxiosRequestConfig): AxiosRequestConfig<any>;
+    get authenticator(): string;
+    set authenticator(value: string);
+    getOption(key: string): string;
+    setOption(key: string, value?: string): void;
     getLocale(): string;
     setLocale(locale: string): void;
-    getToken(): string;
-    setToken(token: string): void;
     getRole(): string;
     setRole(role: string): void;
+    getToken(): string;
+    setToken(token: string): void;
+    getAuthenticator(): string;
+    setAuthenticator(authenticator: string): void;
+    middleware(config: AxiosRequestConfig): AxiosRequestConfig<any>;
     signIn(values: any, authenticator?: string): Promise<AxiosResponse<any>>;
-    signOut(): Promise<void>;
+    signUp(values: any, authenticator?: string): Promise<AxiosResponse<any>>;
+    signOut(): Promise<AxiosResponse<any, any>>;
 }
 export declare abstract class Storage {
     abstract clear(): void;

package/es/APIClient.js

@@ -14,18 +14,20 @@ 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.KEYS = {
+      locale: 'NOCOBASE_LOCALE',
+      role: 'NOCOBASE_ROLE',
+      token: 'NOCOBASE_TOKEN',
+      authenticator: 'NOCOBASE_AUTH'
+    };
     this.options = {
-      token: null,
       locale: null,
-      role: null
+      role: null,
+      authenticator: null,
+      token: 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() {
@@ -37,90 +39,127 @@ export class Auth {
       return;
     }
     const appName = match[1];
-    this.NOCOBASE_LOCALE_KEY = `${appName.toUpperCase()}_NOCOBASE_LOCALE`;
-    this.NOCOBASE_ROLE_KEY = `${appName.toUpperCase()}_NOCOBASE_ROLE`;
+    this.KEYS['role'] = `${appName.toUpperCase()}_` + this.KEYS['role'];
+    this.KEYS['locale'] = `${appName.toUpperCase()}_` + this.KEYS['locale'];
   }
   get locale() {
     return this.getLocale();
   }
-  get role() {
-    return this.getRole();
-  }
-  get token() {
-    return this.getToken();
-  }
   set locale(value) {
     this.setLocale(value);
   }
+  get role() {
+    return this.getRole();
+  }
   set role(value) {
     this.setRole(value);
   }
+  get token() {
+    return this.getToken();
+  }
   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;
+  get authenticator() {
+    return this.getAuthenticator();
+  }
+  set authenticator(value) {
+    this.setAuthenticator(value);
+  }
+  getOption(key) {
+    if (!this.KEYS[key]) {
+      return;
     }
-    if (this.token) {
-      config.headers['Authorization'] = `Bearer ${this.token}`;
+    return this.api.storage.getItem(this.KEYS[key]);
+  }
+  setOption(key, value) {
+    if (!this.KEYS[key]) {
+      return;
     }
-    return config;
+    this.options[key] = value;
+    return this.api.storage.setItem(this.KEYS[key], value || '');
   }
   getLocale() {
-    return this.api.storage.getItem(this.NOCOBASE_LOCALE_KEY);
+    return this.getOption('locale');
   }
   setLocale(locale) {
-    this.options.locale = locale;
-    this.api.storage.setItem(this.NOCOBASE_LOCALE_KEY, locale || '');
+    this.setOption('locale', locale);
+  }
+  getRole() {
+    return this.getOption('role');
+  }
+  setRole(role) {
+    this.setOption('role', role);
   }
   getToken() {
-    return this.api.storage.getItem('NOCOBASE_TOKEN');
+    return this.getOption('token');
   }
   setToken(token) {
-    this.options.token = token;
-    this.api.storage.setItem('NOCOBASE_TOKEN', token || '');
-    if (!token) {
-      this.setRole(null);
-      // this.setLocale(null);
-    }
+    this.setOption('token', token);
   }
-
-  getRole() {
-    return this.api.storage.getItem(this.NOCOBASE_ROLE_KEY);
+  getAuthenticator() {
+    return this.getOption('authenticator');
   }
-  setRole(role) {
-    this.options.role = role;
-    this.api.storage.setItem(this.NOCOBASE_ROLE_KEY, role || '');
+  setAuthenticator(authenticator) {
+    this.setOption('authenticator', authenticator);
   }
-  signIn(values, authenticator = 'password') {
+  middleware(config) {
+    if (this.locale) {
+      config.headers['X-Locale'] = this.locale;
+    }
+    if (this.role) {
+      config.headers['X-Role'] = this.role;
+    }
+    if (this.authenticator && !config.headers['X-Authenticator']) {
+      config.headers['X-Authenticator'] = this.authenticator;
+    }
+    if (this.token) {
+      config.headers['Authorization'] = `Bearer ${this.token}`;
+    }
+    return config;
+  }
+  signIn(values, authenticator) {
     var _this = this;
     return _asyncToGenerator(function* () {
       var _response$data;
       const response = yield _this.api.request({
         method: 'post',
-        url: 'users:signin',
+        url: 'auth:signIn',
         data: values,
-        params: {
-          authenticator
+        headers: {
+          'X-Authenticator': authenticator
         }
       });
       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);
+      _this.setAuthenticator(authenticator);
       return response;
     })();
   }
-  signOut() {
+  signUp(values, authenticator) {
     var _this2 = this;
     return _asyncToGenerator(function* () {
-      yield _this2.api.request({
+      return yield _this2.api.request({
+        method: 'post',
+        url: 'auth:signUp',
+        data: values,
+        headers: {
+          'X-Authenticator': authenticator
+        }
+      });
+    })();
+  }
+  signOut() {
+    var _this3 = this;
+    return _asyncToGenerator(function* () {
+      const response = yield _this3.api.request({
         method: 'post',
-        url: 'users:signout'
+        url: 'auth:signOut'
       });
-      _this2.setToken(null);
+      _this3.setToken(null);
+      _this3.setRole(null);
+      _this3.setAuthenticator(null);
+      return response;
     })();
   }
 }
@@ -200,7 +239,7 @@ export class APIClient {
     return this.axios.request(config);
   }
   resource(name, of) {
-    var _this3 = this;
+    var _this4 = this;
     const target = {};
     const handler = {
       get: (_, actionName) => {
@@ -225,13 +264,16 @@ export class APIClient {
               if (typeof filter === 'string') {
                 config['params']['filter'] = filter;
               } else {
+                if (filter['*']) {
+                  delete filter['*'];
+                }
                 config['params']['filter'] = JSON.stringify(filter);
               }
             }
             if (config.method !== 'get') {
               config['data'] = values || {};
             }
-            return yield _this3.request(_objectSpread(_objectSpread({}, config), opts));
+            return yield _this4.request(_objectSpread(_objectSpread({}, config), opts));
           });
           return function (_x, _x2) {
             return _ref2.apply(this, arguments);

package/lib/APIClient.d.ts

@@ -19,30 +19,42 @@ export interface IResource {
 }
 export declare class Auth {
     protected api: APIClient;
-    protected NOCOBASE_LOCALE_KEY: string;
-    protected NOCOBASE_ROLE_KEY: string;
+    protected KEYS: {
+        locale: string;
+        role: string;
+        token: string;
+        authenticator: string;
+    };
     protected options: {
-        token: any;
         locale: any;
         role: any;
+        authenticator: any;
+        token: any;
     };
     constructor(api: APIClient);
     initKeys(): void;
     get locale(): string;
-    get role(): string;
-    get token(): string;
     set locale(value: string);
+    get role(): string;
     set role(value: string);
+    get token(): string;
     set token(value: string);
-    middleware(config: AxiosRequestConfig): AxiosRequestConfig<any>;
+    get authenticator(): string;
+    set authenticator(value: string);
+    getOption(key: string): string;
+    setOption(key: string, value?: string): void;
     getLocale(): string;
     setLocale(locale: string): void;
-    getToken(): string;
-    setToken(token: string): void;
     getRole(): string;
     setRole(role: string): void;
+    getToken(): string;
+    setToken(token: string): void;
+    getAuthenticator(): string;
+    setAuthenticator(authenticator: string): void;
+    middleware(config: AxiosRequestConfig): AxiosRequestConfig<any>;
     signIn(values: any, authenticator?: string): Promise<AxiosResponse<any>>;
-    signOut(): Promise<void>;
+    signUp(values: any, authenticator?: string): Promise<AxiosResponse<any>>;
+    signOut(): Promise<AxiosResponse<any, any>>;
 }
 export declare abstract class Storage {
     abstract clear(): void;

package/lib/APIClient.js

@@ -21,18 +21,20 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
 class Auth {
   constructor(api) {
     this.api = void 0;
-    this.NOCOBASE_LOCALE_KEY = 'NOCOBASE_LOCALE';
-    this.NOCOBASE_ROLE_KEY = 'NOCOBASE_ROLE';
+    this.KEYS = {
+      locale: 'NOCOBASE_LOCALE',
+      role: 'NOCOBASE_ROLE',
+      token: 'NOCOBASE_TOKEN',
+      authenticator: 'NOCOBASE_AUTH'
+    };
     this.options = {
-      token: null,
       locale: null,
-      role: null
+      role: null,
+      authenticator: null,
+      token: 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() {
@@ -44,90 +46,127 @@ class Auth {
       return;
     }
     const appName = match[1];
-    this.NOCOBASE_LOCALE_KEY = `${appName.toUpperCase()}_NOCOBASE_LOCALE`;
-    this.NOCOBASE_ROLE_KEY = `${appName.toUpperCase()}_NOCOBASE_ROLE`;
+    this.KEYS['role'] = `${appName.toUpperCase()}_` + this.KEYS['role'];
+    this.KEYS['locale'] = `${appName.toUpperCase()}_` + this.KEYS['locale'];
   }
   get locale() {
     return this.getLocale();
   }
-  get role() {
-    return this.getRole();
-  }
-  get token() {
-    return this.getToken();
-  }
   set locale(value) {
     this.setLocale(value);
   }
+  get role() {
+    return this.getRole();
+  }
   set role(value) {
     this.setRole(value);
   }
+  get token() {
+    return this.getToken();
+  }
   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;
+  get authenticator() {
+    return this.getAuthenticator();
+  }
+  set authenticator(value) {
+    this.setAuthenticator(value);
+  }
+  getOption(key) {
+    if (!this.KEYS[key]) {
+      return;
     }
-    if (this.token) {
-      config.headers['Authorization'] = `Bearer ${this.token}`;
+    return this.api.storage.getItem(this.KEYS[key]);
+  }
+  setOption(key, value) {
+    if (!this.KEYS[key]) {
+      return;
     }
-    return config;
+    this.options[key] = value;
+    return this.api.storage.setItem(this.KEYS[key], value || '');
   }
   getLocale() {
-    return this.api.storage.getItem(this.NOCOBASE_LOCALE_KEY);
+    return this.getOption('locale');
   }
   setLocale(locale) {
-    this.options.locale = locale;
-    this.api.storage.setItem(this.NOCOBASE_LOCALE_KEY, locale || '');
+    this.setOption('locale', locale);
+  }
+  getRole() {
+    return this.getOption('role');
+  }
+  setRole(role) {
+    this.setOption('role', role);
   }
   getToken() {
-    return this.api.storage.getItem('NOCOBASE_TOKEN');
+    return this.getOption('token');
   }
   setToken(token) {
-    this.options.token = token;
-    this.api.storage.setItem('NOCOBASE_TOKEN', token || '');
-    if (!token) {
-      this.setRole(null);
-      // this.setLocale(null);
-    }
+    this.setOption('token', token);
   }
-
-  getRole() {
-    return this.api.storage.getItem(this.NOCOBASE_ROLE_KEY);
+  getAuthenticator() {
+    return this.getOption('authenticator');
   }
-  setRole(role) {
-    this.options.role = role;
-    this.api.storage.setItem(this.NOCOBASE_ROLE_KEY, role || '');
+  setAuthenticator(authenticator) {
+    this.setOption('authenticator', authenticator);
+  }
+  middleware(config) {
+    if (this.locale) {
+      config.headers['X-Locale'] = this.locale;
+    }
+    if (this.role) {
+      config.headers['X-Role'] = this.role;
+    }
+    if (this.authenticator && !config.headers['X-Authenticator']) {
+      config.headers['X-Authenticator'] = this.authenticator;
+    }
+    if (this.token) {
+      config.headers['Authorization'] = `Bearer ${this.token}`;
+    }
+    return config;
   }
-  signIn(values, authenticator = 'password') {
+  signIn(values, authenticator) {
     var _this = this;
     return _asyncToGenerator(function* () {
       var _response$data;
       const response = yield _this.api.request({
         method: 'post',
-        url: 'users:signin',
+        url: 'auth:signIn',
         data: values,
-        params: {
-          authenticator
+        headers: {
+          'X-Authenticator': authenticator
         }
       });
       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);
+      _this.setAuthenticator(authenticator);
       return response;
     })();
   }
-  signOut() {
+  signUp(values, authenticator) {
     var _this2 = this;
     return _asyncToGenerator(function* () {
-      yield _this2.api.request({
+      return yield _this2.api.request({
         method: 'post',
-        url: 'users:signout'
+        url: 'auth:signUp',
+        data: values,
+        headers: {
+          'X-Authenticator': authenticator
+        }
       });
-      _this2.setToken(null);
+    })();
+  }
+  signOut() {
+    var _this3 = this;
+    return _asyncToGenerator(function* () {
+      const response = yield _this3.api.request({
+        method: 'post',
+        url: 'auth:signOut'
+      });
+      _this3.setToken(null);
+      _this3.setRole(null);
+      _this3.setAuthenticator(null);
+      return response;
     })();
   }
 }
@@ -210,7 +249,7 @@ class APIClient {
     return this.axios.request(config);
   }
   resource(name, of) {
-    var _this3 = this;
+    var _this4 = this;
     const target = {};
     const handler = {
       get: (_, actionName) => {
@@ -235,13 +274,16 @@ class APIClient {
               if (typeof filter === 'string') {
                 config['params']['filter'] = filter;
               } else {
+                if (filter['*']) {
+                  delete filter['*'];
+                }
                 config['params']['filter'] = JSON.stringify(filter);
               }
             }
             if (config.method !== 'get') {
               config['data'] = values || {};
             }
-            return yield _this3.request(_objectSpread(_objectSpread({}, config), opts));
+            return yield _this4.request(_objectSpread(_objectSpread({}, config), opts));
           });
           return function (_x, _x2) {
             return _ref2.apply(this, arguments);

package/package.json

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

package/src/APIClient.ts

@@ -25,22 +25,23 @@ export interface IResource {
 export class Auth {
   protected api: APIClient;
 
-  protected NOCOBASE_LOCALE_KEY = 'NOCOBASE_LOCALE';
-
-  protected NOCOBASE_ROLE_KEY = 'NOCOBASE_ROLE';
+  protected KEYS = {
+    locale: 'NOCOBASE_LOCALE',
+    role: 'NOCOBASE_ROLE',
+    token: 'NOCOBASE_TOKEN',
+    authenticator: 'NOCOBASE_AUTH',
+  };
 
   protected options = {
-    token: null,
     locale: null,
     role: null,
+    authenticator: null,
+    token: null,
   };
 
   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));
   }
 
@@ -53,98 +54,140 @@ export class Auth {
       return;
     }
     const appName = match[1];
-    this.NOCOBASE_LOCALE_KEY = `${appName.toUpperCase()}_NOCOBASE_LOCALE`;
-    this.NOCOBASE_ROLE_KEY = `${appName.toUpperCase()}_NOCOBASE_ROLE`;
+    this.KEYS['role'] = `${appName.toUpperCase()}_` + this.KEYS['role'];
+    this.KEYS['locale'] = `${appName.toUpperCase()}_` + this.KEYS['locale'];
   }
 
   get locale() {
     return this.getLocale();
   }
 
+  set locale(value: string) {
+    this.setLocale(value);
+  }
+
   get role() {
     return this.getRole();
   }
 
+  set role(value: string) {
+    this.setRole(value);
+  }
+
   get token() {
     return this.getToken();
   }
 
-  set locale(value) {
-    this.setLocale(value);
+  set token(value: string) {
+    this.setToken(value);
   }
 
-  set role(value) {
-    this.setRole(value);
+  get authenticator() {
+    return this.getAuthenticator();
   }
 
-  set token(value) {
-    this.setToken(value);
+  set authenticator(value: string) {
+    this.setAuthenticator(value);
   }
 
-  middleware(config: AxiosRequestConfig) {
-    if (this.locale) {
-      config.headers['X-Locale'] = this.locale;
-    }
-    if (this.role) {
-      config.headers['X-Role'] = this.role;
+  getOption(key: string) {
+    if (!this.KEYS[key]) {
+      return;
     }
-    if (this.token) {
-      config.headers['Authorization'] = `Bearer ${this.token}`;
+    return this.api.storage.getItem(this.KEYS[key]);
+  }
+
+  setOption(key: string, value?: string) {
+    if (!this.KEYS[key]) {
+      return;
     }
-    return config;
+    this.options[key] = value;
+    return this.api.storage.setItem(this.KEYS[key], value || '');
   }
 
   getLocale() {
-    return this.api.storage.getItem(this.NOCOBASE_LOCALE_KEY);
+    return this.getOption('locale');
   }
 
   setLocale(locale: string) {
-    this.options.locale = locale;
-    this.api.storage.setItem(this.NOCOBASE_LOCALE_KEY, locale || '');
+    this.setOption('locale', locale);
+  }
+
+  getRole() {
+    return this.getOption('role');
+  }
+
+  setRole(role: string) {
+    this.setOption('role', role);
   }
 
   getToken() {
-    return this.api.storage.getItem('NOCOBASE_TOKEN');
+    return this.getOption('token');
   }
 
   setToken(token: string) {
-    this.options.token = token;
-    this.api.storage.setItem('NOCOBASE_TOKEN', token || '');
-    if (!token) {
-      this.setRole(null);
-      // this.setLocale(null);
-    }
+    this.setOption('token', token);
   }
 
-  getRole() {
-    return this.api.storage.getItem(this.NOCOBASE_ROLE_KEY);
+  getAuthenticator() {
+    return this.getOption('authenticator');
   }
 
-  setRole(role: string) {
-    this.options.role = role;
-    this.api.storage.setItem(this.NOCOBASE_ROLE_KEY, role || '');
+  setAuthenticator(authenticator: string) {
+    this.setOption('authenticator', authenticator);
   }
 
-  async signIn(values, authenticator = 'password'): Promise<AxiosResponse<any>> {
+  middleware(config: AxiosRequestConfig) {
+    if (this.locale) {
+      config.headers['X-Locale'] = this.locale;
+    }
+    if (this.role) {
+      config.headers['X-Role'] = this.role;
+    }
+    if (this.authenticator && !config.headers['X-Authenticator']) {
+      config.headers['X-Authenticator'] = this.authenticator;
+    }
+    if (this.token) {
+      config.headers['Authorization'] = `Bearer ${this.token}`;
+    }
+    return config;
+  }
+
+  async signIn(values: any, authenticator?: string): Promise<AxiosResponse<any>> {
     const response = await this.api.request({
       method: 'post',
-      url: 'users:signin',
+      url: 'auth:signIn',
       data: values,
-      params: {
-        authenticator,
+      headers: {
+        'X-Authenticator': authenticator,
       },
     });
     const data = response?.data?.data;
     this.setToken(data?.token);
+    this.setAuthenticator(authenticator);
     return response;
   }
 
+  async signUp(values: any, authenticator?: string): Promise<AxiosResponse<any>> {
+    return await this.api.request({
+      method: 'post',
+      url: 'auth:signUp',
+      data: values,
+      headers: {
+        'X-Authenticator': authenticator,
+      },
+    });
+  }
+
   async signOut() {
-    await this.api.request({
+    const response = await this.api.request({
       method: 'post',
-      url: 'users:signout',
+      url: 'auth:signOut',
     });
     this.setToken(null);
+    this.setRole(null);
+    this.setAuthenticator(null);
+    return response;
   }
 }
 
@@ -254,6 +297,9 @@ export class APIClient {
             if (typeof filter === 'string') {
               config['params']['filter'] = filter;
             } else {
+              if (filter['*']) {
+                delete filter['*'];
+              }
               config['params']['filter'] = JSON.stringify(filter);
             }
           }

package/src/__tests__/api-client.test.ts

@@ -24,13 +24,16 @@ describe('api-client', () => {
       baseURL: 'https://localhost:8000/api',
     });
     const mock = new MockAdapter(api.axios);
-    mock.onPost('users:signin').reply(200, {
+    mock.onPost('auth:signIn').reply(200, {
       data: { id: 1, name: 'John Smith', token: '123' },
     });
-    const response = await api.auth.signIn({});
+    const response = await api.auth.signIn({}, 'basic');
     expect(response.status).toBe(200);
-    expect(api.auth.token).toBe('123');
-    expect(localStorage.getItem('NOCOBASE_TOKEN')).toBe('123');
+    expect(api.auth.getToken()).toBe('123');
+    const token = localStorage.getItem('NOCOBASE_TOKEN');
+    expect(token).toBe('123');
+    const auth = localStorage.getItem('NOCOBASE_AUTH');
+    expect(auth).toBe('basic');
   });
 
   test('resource action', async () => {
@@ -72,14 +75,15 @@ describe('api-client', () => {
     });
 
     const mock = new MockAdapter(api.axios);
-    mock.onPost('users:signin').reply(200, {
+    mock.onPost('auth:signIn').reply(200, {
       data: { id: 1, name: 'John Smith', token: '123' },
     });
 
     const response = await api.auth.signIn({});
     expect(response.status).toBe(200);
-    expect(api.auth.token).toBe('123');
-    expect(items.get('NOCOBASE_TOKEN')).toBe('123');
+    expect(api.auth.getToken()).toBe('123');
+    const token = items.get('NOCOBASE_TOKEN');
+    expect(token).toBe('123');
   });
 
   test('custom auth', async () => {
@@ -87,10 +91,11 @@ describe('api-client', () => {
       async signIn(values: any): Promise<AxiosResponse<any, any>> {
         const response = await this.api.request({
           method: 'post',
-          url: 'users:test',
+          url: 'auth:test',
           data: values,
         });
         const data = response?.data?.data;
+        this.setAuthenticator('test');
         this.setToken(data?.token);
         return response;
       }
@@ -104,13 +109,16 @@ describe('api-client', () => {
     expect(api.auth).toBeInstanceOf(TestAuth);
 
     const mock = new MockAdapter(api.axios);
-    mock.onPost('users:test').reply(200, {
+    mock.onPost('auth:test').reply(200, {
       data: { id: 1, name: 'John Smith', token: '123' },
     });
 
     const response = await api.auth.signIn({});
     expect(response.status).toBe(200);
-    expect(api.auth.token).toBe('123');
-    expect(localStorage.getItem('NOCOBASE_TOKEN')).toBe('123');
+    expect(api.auth.getToken()).toBe('123');
+    const token = localStorage.getItem('NOCOBASE_TOKEN');
+    expect(token).toBe('123');
+    const auth = localStorage.getItem('NOCOBASE_AUTH');
+    expect(auth).toBe('test');
   });
 });