@etsoo/appscript 1.5.44 → 1.5.46

package/lib/cjs/app/CoreApp.d.ts

@@ -7,7 +7,7 @@ import { InitCallDto } from '../erp/dto/InitCallDto';
 import { InitCallResult, InitCallResultData } from '../result/InitCallResult';
 import { IUser } from '../state/User';
 import { IAppSettings } from './AppSettings';
-import { AppLoginParams, FormatResultCustomCallback, IApp, IAppFields, IDetectIPCallback, NavigateOptions, RefreshTokenProps, RefreshTokenResult } from './IApp';
+import { AppLoginParams, FormatResultCustomCallback, IApp, IAppFields, IDetectIPCallback, NavigateOptions, RefreshTokenProps } from './IApp';
 import { UserRole } from './UserRole';
 import { ExternalEndpoint } from './ExternalSettings';
 import { ApiRefreshTokenDto } from '../erp/dto/ApiRefreshTokenDto';
@@ -152,7 +152,6 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * Passphrase for encryption
      */
     protected passphrase: string;
-    private cachedRefreshToken?;
     private apis;
     private tasks;
     /**
@@ -426,12 +425,6 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @param givenName Given name
      */
     formatFullName(familyName: string | undefined | null, givenName: string | undefined | null): string;
-    /**
-     * Format refresh token result
-     * @param result Refresh token result
-     * @returns Message
-     */
-    protected formatRefreshTokenResult(result: RefreshTokenResult<IActionResult<U>>): string | undefined;
     private getFieldLabel;
     /**
      * Format result text
@@ -579,11 +572,11 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      */
     abstract freshCountdownUI(callback?: () => PromiseLike<unknown>): void;
     /**
-     * Refresh token
+     * Refresh token with result
      * @param props Props
      * @param callback Callback
      */
-    refreshToken(props?: RefreshTokenProps, callback?: (result?: boolean | string) => boolean | void): Promise<void>;
+    refreshToken(props: RefreshTokenProps, callback?: (result?: boolean | IActionResult) => boolean | void): Promise<void>;
     /**
      * Setup callback
      */
@@ -644,9 +637,8 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * User login
      * @param user User data
      * @param refreshToken Refresh token
-     * @param keep Keep login or not
      */
-    userLogin(user: U, refreshToken: string, keep?: boolean): void;
+    userLogin(user: U, refreshToken: string): void;
     /**
      * User logout
      * @param clearToken Clear refresh token or not

package/lib/cjs/app/CoreApp.js

@@ -162,13 +162,14 @@ class CoreApp {
             throw new Error('No default region defined');
         }
         this.defaultRegion = region;
+        // Current system refresh token
         const refresh = async (api, token) => {
             if (this.lastCalled) {
                 // Call refreshToken to update access token
-                // No popups show
-                await this.refreshToken({ showLoading: false }, (result) => {
-                    console.log(`CoreApp.${this.name}.ApiRefreshToken`, result);
-                    return false;
+                await this.refreshToken({ token, showLoading: false }, (result) => {
+                    if (result === true)
+                        return;
+                    console.log(`CoreApp.${this.name}.RefreshToken`, result);
                 });
             }
             else {
@@ -666,7 +667,6 @@ class CoreApp {
             }
         }
         else {
-            this.cachedRefreshToken = undefined;
             this.updateApi(this.api.name, undefined, -1);
         }
         // Host notice
@@ -773,7 +773,6 @@ class CoreApp {
      * Clear cached token
      */
     clearCacheToken() {
-        this.cachedRefreshToken = undefined;
         this.storage.setPersistedData(this.fields.headerToken, undefined);
     }
     /**
@@ -1024,28 +1023,6 @@ class CoreApp {
         }
         return wf;
     }
-    /**
-     * Format refresh token result
-     * @param result Refresh token result
-     * @returns Message
-     */
-    formatRefreshTokenResult(result) {
-        // Error message
-        if (typeof result === 'string')
-            return result;
-        // API error
-        if (result instanceof restclient_1.ApiDataError)
-            return this.formatError(result);
-        // Action result
-        const [token, r] = result;
-        // Success
-        if (r.ok)
-            return undefined;
-        // No token data
-        if (token == null)
-            return `${this.get('noData')} (token)`;
-        return ActionResultError_1.ActionResultError.format(r);
-    }
     getFieldLabel(field) {
         return this.get(field.formatInitial(false)) ?? field;
     }
@@ -1130,9 +1107,6 @@ class CoreApp {
      * @returns Cached token
      */
     getCacheToken() {
-        // Temp refresh token
-        if (this.cachedRefreshToken)
-            return this.cachedRefreshToken;
         return this.storage.getData(this.fields.headerToken);
     }
     /**
@@ -1378,11 +1352,72 @@ class CoreApp {
         this.notifier.hideLoading(true);
     }
     /**
-     * Refresh token
+     * Refresh token with result
      * @param props Props
      * @param callback Callback
      */
-    async refreshToken(props, callback) { }
+    async refreshToken(props, callback) {
+        // Call refresh token API
+        let data = await new AuthApi_1.AuthApi(this).refreshToken(props);
+        let r;
+        if (Array.isArray(data)) {
+            const [token, result] = data;
+            if (result.ok) {
+                if (!token) {
+                    data = {
+                        ok: false,
+                        type: 'noData',
+                        field: 'token',
+                        title: this.get('noData')
+                    };
+                }
+                else if (result.data == null) {
+                    data = {
+                        ok: false,
+                        type: 'noData',
+                        field: 'user',
+                        title: this.get('noData')
+                    };
+                }
+                else {
+                    // User login
+                    this.userLogin(result.data, token);
+                    if (callback)
+                        callback(true);
+                    // Exit
+                    return;
+                }
+            }
+            else if (this.checkDeviceResult(result)) {
+                if (callback == null || callback(result) !== true) {
+                    this.initCall((ir) => {
+                        if (!ir)
+                            return;
+                        this.notifier.alert(this.get('environmentChanged') ??
+                            'Environment changed', () => {
+                            // Callback, return true to prevent the default reload action
+                            if (callback == null || callback() !== true) {
+                                // Reload the page
+                                history.go(0);
+                            }
+                        });
+                    }, true);
+                    return;
+                }
+            }
+            r = result;
+        }
+        else {
+            r = data;
+        }
+        if (callback == null || callback(r) !== true) {
+            const message = `${r.title} (${r.field})`;
+            this.notifier.alert(message, () => {
+                if (callback)
+                    callback(false);
+            });
+        }
+    }
     /**
      * Setup callback
      */
@@ -1609,21 +1644,16 @@ class CoreApp {
      * User login
      * @param user User data
      * @param refreshToken Refresh token
-     * @param keep Keep login or not
      */
-    userLogin(user, refreshToken, keep) {
+    userLogin(user, refreshToken) {
+        // Hold the user data
         this.userData = user;
         // Cache the encrypted serverside device id
         if (user.deviceId) {
             this.storage.setData(this.fields.serversideDeviceId, user.deviceId);
         }
-        if (keep) {
-            this.authorize(user.token, user.tokenScheme, refreshToken);
-        }
-        else {
-            this.cachedRefreshToken = this.encrypt(refreshToken);
-            this.authorize(user.token, user.tokenScheme, undefined);
-        }
+        // Authorize
+        this.authorize(user.token, user.tokenScheme, refreshToken);
     }
     /**
      * User logout

package/lib/cjs/app/IApp.d.ts

@@ -27,7 +27,7 @@ export interface NavigateOptions {
  * array means success, false means failed but no any message
  * other cases means failed with differnet message
  */
-export type RefreshTokenResult<R> = string | ApiDataError | [string | null, R];
+export type RefreshTokenResult<R> = IActionResult | [string | null, R];
 /**
  * Format result custom type
  */
@@ -61,6 +61,10 @@ export type AppLoginParams = DataTypes.SimpleObject & {
  * Refresh token props
  */
 export interface RefreshTokenProps {
+    /**
+     * Refresh token
+     */
+    token: string;
     /**
      * API name
      */
@@ -515,11 +519,12 @@ export interface IApp {
      */
     pageExit(): void;
     /**
-     * Refresh token
+     * Refresh token with result
      * @param props Props
      * @param callback Callback
+     * @param api API
      */
-    refreshToken(props?: RefreshTokenProps, callback?: (result?: boolean | string) => boolean | void): Promise<void>;
+    refreshToken(props: RefreshTokenProps, callback?: (result?: boolean | IActionResult) => boolean | void): Promise<void>;
     /**
      * Setup Api error handler
      * @param api Api
@@ -572,9 +577,8 @@ export interface IApp {
      * User login
      * @param user User data
      * @param refreshToken Refresh token
-     * @param keep Keep login or not
      */
-    userLogin(user: IUser, refreshToken: string, keep?: boolean): void;
+    userLogin(user: IUser, refreshToken: string): void;
     /**
      * User logout
      * @param clearToken Clear refresh token or not

package/lib/cjs/erp/AuthApi.d.ts

@@ -10,6 +10,7 @@ import { GetLogInUrlRQ } from './rq/GetLogInUrlRQ';
 import { TokenRQ } from './rq/TokenRQ';
 import { ApiRefreshTokenDto } from './dto/ApiRefreshTokenDto';
 import { RefreshTokenProps, RefreshTokenResult } from '../app/IApp';
+import { SwitchOrgRQ } from './rq/SwitchOrgRQ';
 /**
  * Authentication API
  */
@@ -56,11 +57,10 @@ export declare class AuthApi extends BaseApi {
     loginId(id: string, payload?: ResultPayload): Promise<IActionResult<{}> | undefined>;
     /**
      * Refresh token
-     * @param token Refresh token
      * @param props Props
      * @returns Result
      */
-    refreshToken<R>(token: string, props?: RefreshTokenProps): Promise<RefreshTokenResult<R>>;
+    refreshToken<R>(props: RefreshTokenProps): Promise<RefreshTokenResult<R>>;
     /**
      * Reset password
      * @param rq Request data
@@ -75,4 +75,10 @@ export declare class AuthApi extends BaseApi {
      * @returns Result
      */
     signout(rq: SignoutRQ, payload?: ResultPayload): Promise<IActionResult<{}> | undefined>;
+    /**
+     * Switch organization
+     * @param rq Request data
+     * @param payload Payload
+     */
+    switchOrg(rq: SwitchOrgRQ, payload?: ResultPayload): Promise<IActionResult<{}> | undefined>;
 }

package/lib/cjs/erp/AuthApi.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AuthApi = void 0;
 const BaseApi_1 = require("./BaseApi");
+const shared_1 = require("@etsoo/shared");
 /**
  * Authentication API
  */
@@ -66,13 +67,12 @@ class AuthApi extends BaseApi_1.BaseApi {
     }
     /**
      * Refresh token
-     * @param token Refresh token
      * @param props Props
      * @returns Result
      */
-    async refreshToken(token, props) {
+    async refreshToken(props) {
         // Destruct
-        const { api = 'Auth/RefreshToken', showLoading = false, tokenField = AuthApi.HeaderTokenField } = props ?? {};
+        const { api = 'Auth/RefreshToken', showLoading = false, token, tokenField = AuthApi.HeaderTokenField } = props ?? {};
         // Reqest data
         const rq = {
             deviceId: this.app.deviceId
@@ -90,7 +90,14 @@ class AuthApi extends BaseApi_1.BaseApi {
         // Call API
         const result = await this.api.put(api, rq, payload);
         if (result == null) {
-            return this.api.lastError ?? this.app.get('unknownError');
+            return this.api.lastError
+                ? shared_1.ActionResult.create(this.api.lastError)
+                : {
+                    ok: false,
+                    type: 'unknownError',
+                    field: 'result',
+                    title: this.app.get('unknownError')
+                };
         }
         // Token
         const refreshToken = this.app.getResponseToken(payload.response, tokenField);
@@ -115,6 +122,14 @@ class AuthApi extends BaseApi_1.BaseApi {
     signout(rq, payload) {
         return this.api.put('Auth/Signout', rq, payload);
     }
+    /**
+     * Switch organization
+     * @param rq Request data
+     * @param payload Payload
+     */
+    switchOrg(rq, payload) {
+        return this.app.api.put('Auth/SwitchOrg', rq, payload);
+    }
 }
 exports.AuthApi = AuthApi;
 /**

package/lib/cjs/erp/OrgApi.d.ts

@@ -57,13 +57,6 @@ export declare class OrgApi extends EntityApi {
      * @returns Result
      */
     sendActionMessage(rq: SendActionMessageRQ, payload?: IApiPayload<void>): Promise<void | undefined>;
-    /**
-     * Switch organization
-     * @param id Organization id
-     * @param serviceId Service id
-     * @param payload Payload
-     */
-    switch(id: number, serviceId?: number, payload?: IApiPayload<boolean>): Promise<false | void>;
     /**
      * Update
      * @param data Modal data

package/lib/cjs/erp/OrgApi.js

@@ -72,22 +72,6 @@ class OrgApi extends EntityApi_1.EntityApi {
         payload ?? (payload = { showLoading: false });
         return this.api.post('System/SendActionMessage', { ...rq, appId }, payload);
     }
-    /**
-     * Switch organization
-     * @param id Organization id
-     * @param serviceId Service id
-     * @param payload Payload
-     */
-    async switch(id, serviceId, payload) {
-        const result = await this.app.api.put('Organization/Switch', {
-            id,
-            serviceId,
-            deviceId: this.app.deviceId
-        }, payload);
-        if (result)
-            return await this.app.refreshToken();
-        return result;
-    }
     /**
      * Update
      * @param data Modal data

package/lib/cjs/erp/rq/SwitchOrgRQ.d.ts

@@ -0,0 +1,13 @@
+/**
+ * Switch organization request data
+ */
+export type SwitchOrgRQ = {
+    /**
+     * Target organization id
+     */
+    organizationId: number;
+    /**
+     * From organization id
+     */
+    fromOrganizationId: number;
+};

package/lib/cjs/erp/rq/SwitchOrgRQ.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/cjs/index.d.ts

@@ -61,6 +61,7 @@ export * from './erp/rq/RegionsRQ';
 export * from './erp/rq/ResetPasswordRQ';
 export * from './erp/rq/SendActionMessageRQ';
 export * from './erp/rq/SignoutRQ';
+export * from './erp/rq/SwitchOrgRQ';
 export * from './erp/rq/TiplistRQ';
 export * from './erp/rq/TokenRQ';
 export * from './erp/rq/UpdateStatusRQ';
@@ -75,7 +76,7 @@ export * from './i18n/CultureUtils';
 export * from './i18n/en';
 export * from './i18n/zhHans';
 export * from './i18n/zhHant';
-export { ApiAuthorizationScheme, ApiMethod, ApiResponseType, createClient, createClientAsync } from '@etsoo/restclient';
+export { ApiAuthorizationScheme, ApiDataError, ApiMethod, ApiResponseType, createClient, createClientAsync } from '@etsoo/restclient';
 export type { IApi, IApiPayload } from '@etsoo/restclient';
 export * from './result/ActionResult';
 export * from './result/ActionResultError';

package/lib/cjs/index.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createClientAsync = exports.createClient = exports.ApiResponseType = exports.ApiMethod = exports.ApiAuthorizationScheme = void 0;
+exports.createClientAsync = exports.createClient = exports.ApiResponseType = exports.ApiMethod = exports.ApiDataError = exports.ApiAuthorizationScheme = void 0;
 // address
 __exportStar(require("./address/AddressAutocomplete"), exports);
 __exportStar(require("./address/AddressCity"), exports);
@@ -86,6 +86,7 @@ __exportStar(require("./erp/rq/RegionsRQ"), exports);
 __exportStar(require("./erp/rq/ResetPasswordRQ"), exports);
 __exportStar(require("./erp/rq/SendActionMessageRQ"), exports);
 __exportStar(require("./erp/rq/SignoutRQ"), exports);
+__exportStar(require("./erp/rq/SwitchOrgRQ"), exports);
 __exportStar(require("./erp/rq/TiplistRQ"), exports);
 __exportStar(require("./erp/rq/TokenRQ"), exports);
 __exportStar(require("./erp/rq/UpdateStatusRQ"), exports);
@@ -105,6 +106,7 @@ __exportStar(require("./i18n/zhHant"), exports);
 // @etsoo/restclient
 var restclient_1 = require("@etsoo/restclient");
 Object.defineProperty(exports, "ApiAuthorizationScheme", { enumerable: true, get: function () { return restclient_1.ApiAuthorizationScheme; } });
+Object.defineProperty(exports, "ApiDataError", { enumerable: true, get: function () { return restclient_1.ApiDataError; } });
 Object.defineProperty(exports, "ApiMethod", { enumerable: true, get: function () { return restclient_1.ApiMethod; } });
 Object.defineProperty(exports, "ApiResponseType", { enumerable: true, get: function () { return restclient_1.ApiResponseType; } });
 Object.defineProperty(exports, "createClient", { enumerable: true, get: function () { return restclient_1.createClient; } });

package/lib/mjs/app/CoreApp.d.ts

@@ -7,7 +7,7 @@ import { InitCallDto } from '../erp/dto/InitCallDto';
 import { InitCallResult, InitCallResultData } from '../result/InitCallResult';
 import { IUser } from '../state/User';
 import { IAppSettings } from './AppSettings';
-import { AppLoginParams, FormatResultCustomCallback, IApp, IAppFields, IDetectIPCallback, NavigateOptions, RefreshTokenProps, RefreshTokenResult } from './IApp';
+import { AppLoginParams, FormatResultCustomCallback, IApp, IAppFields, IDetectIPCallback, NavigateOptions, RefreshTokenProps } from './IApp';
 import { UserRole } from './UserRole';
 import { ExternalEndpoint } from './ExternalSettings';
 import { ApiRefreshTokenDto } from '../erp/dto/ApiRefreshTokenDto';
@@ -152,7 +152,6 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * Passphrase for encryption
      */
     protected passphrase: string;
-    private cachedRefreshToken?;
     private apis;
     private tasks;
     /**
@@ -426,12 +425,6 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @param givenName Given name
      */
     formatFullName(familyName: string | undefined | null, givenName: string | undefined | null): string;
-    /**
-     * Format refresh token result
-     * @param result Refresh token result
-     * @returns Message
-     */
-    protected formatRefreshTokenResult(result: RefreshTokenResult<IActionResult<U>>): string | undefined;
     private getFieldLabel;
     /**
      * Format result text
@@ -579,11 +572,11 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      */
     abstract freshCountdownUI(callback?: () => PromiseLike<unknown>): void;
     /**
-     * Refresh token
+     * Refresh token with result
      * @param props Props
      * @param callback Callback
      */
-    refreshToken(props?: RefreshTokenProps, callback?: (result?: boolean | string) => boolean | void): Promise<void>;
+    refreshToken(props: RefreshTokenProps, callback?: (result?: boolean | IActionResult) => boolean | void): Promise<void>;
     /**
      * Setup callback
      */
@@ -644,9 +637,8 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * User login
      * @param user User data
      * @param refreshToken Refresh token
-     * @param keep Keep login or not
      */
-    userLogin(user: U, refreshToken: string, keep?: boolean): void;
+    userLogin(user: U, refreshToken: string): void;
     /**
      * User logout
      * @param clearToken Clear refresh token or not

package/lib/mjs/app/CoreApp.js

@@ -1,5 +1,5 @@
 import { NotificationAlign, NotificationMessageType } from '@etsoo/notificationbase';
-import { ApiDataError, createClient } from '@etsoo/restclient';
+import { createClient } from '@etsoo/restclient';
 import { DataTypes, DateUtils, DomUtils, ExtendUtils, NumberUtils, Utils } from '@etsoo/shared';
 import { AddressRegion } from '../address/AddressRegion';
 import { BridgeUtils } from '../bridges/BridgeUtils';
@@ -159,13 +159,14 @@ export class CoreApp {
             throw new Error('No default region defined');
         }
         this.defaultRegion = region;
+        // Current system refresh token
         const refresh = async (api, token) => {
             if (this.lastCalled) {
                 // Call refreshToken to update access token
-                // No popups show
-                await this.refreshToken({ showLoading: false }, (result) => {
-                    console.log(`CoreApp.${this.name}.ApiRefreshToken`, result);
-                    return false;
+                await this.refreshToken({ token, showLoading: false }, (result) => {
+                    if (result === true)
+                        return;
+                    console.log(`CoreApp.${this.name}.RefreshToken`, result);
                 });
             }
             else {
@@ -663,7 +664,6 @@ export class CoreApp {
             }
         }
         else {
-            this.cachedRefreshToken = undefined;
             this.updateApi(this.api.name, undefined, -1);
         }
         // Host notice
@@ -770,7 +770,6 @@ export class CoreApp {
      * Clear cached token
      */
     clearCacheToken() {
-        this.cachedRefreshToken = undefined;
         this.storage.setPersistedData(this.fields.headerToken, undefined);
     }
     /**
@@ -1021,28 +1020,6 @@ export class CoreApp {
         }
         return wf;
     }
-    /**
-     * Format refresh token result
-     * @param result Refresh token result
-     * @returns Message
-     */
-    formatRefreshTokenResult(result) {
-        // Error message
-        if (typeof result === 'string')
-            return result;
-        // API error
-        if (result instanceof ApiDataError)
-            return this.formatError(result);
-        // Action result
-        const [token, r] = result;
-        // Success
-        if (r.ok)
-            return undefined;
-        // No token data
-        if (token == null)
-            return `${this.get('noData')} (token)`;
-        return ActionResultError.format(r);
-    }
     getFieldLabel(field) {
         return this.get(field.formatInitial(false)) ?? field;
     }
@@ -1127,9 +1104,6 @@ export class CoreApp {
      * @returns Cached token
      */
     getCacheToken() {
-        // Temp refresh token
-        if (this.cachedRefreshToken)
-            return this.cachedRefreshToken;
         return this.storage.getData(this.fields.headerToken);
     }
     /**
@@ -1375,11 +1349,72 @@ export class CoreApp {
         this.notifier.hideLoading(true);
     }
     /**
-     * Refresh token
+     * Refresh token with result
      * @param props Props
      * @param callback Callback
      */
-    async refreshToken(props, callback) { }
+    async refreshToken(props, callback) {
+        // Call refresh token API
+        let data = await new AuthApi(this).refreshToken(props);
+        let r;
+        if (Array.isArray(data)) {
+            const [token, result] = data;
+            if (result.ok) {
+                if (!token) {
+                    data = {
+                        ok: false,
+                        type: 'noData',
+                        field: 'token',
+                        title: this.get('noData')
+                    };
+                }
+                else if (result.data == null) {
+                    data = {
+                        ok: false,
+                        type: 'noData',
+                        field: 'user',
+                        title: this.get('noData')
+                    };
+                }
+                else {
+                    // User login
+                    this.userLogin(result.data, token);
+                    if (callback)
+                        callback(true);
+                    // Exit
+                    return;
+                }
+            }
+            else if (this.checkDeviceResult(result)) {
+                if (callback == null || callback(result) !== true) {
+                    this.initCall((ir) => {
+                        if (!ir)
+                            return;
+                        this.notifier.alert(this.get('environmentChanged') ??
+                            'Environment changed', () => {
+                            // Callback, return true to prevent the default reload action
+                            if (callback == null || callback() !== true) {
+                                // Reload the page
+                                history.go(0);
+                            }
+                        });
+                    }, true);
+                    return;
+                }
+            }
+            r = result;
+        }
+        else {
+            r = data;
+        }
+        if (callback == null || callback(r) !== true) {
+            const message = `${r.title} (${r.field})`;
+            this.notifier.alert(message, () => {
+                if (callback)
+                    callback(false);
+            });
+        }
+    }
     /**
      * Setup callback
      */
@@ -1606,21 +1641,16 @@ export class CoreApp {
      * User login
      * @param user User data
      * @param refreshToken Refresh token
-     * @param keep Keep login or not
      */
-    userLogin(user, refreshToken, keep) {
+    userLogin(user, refreshToken) {
+        // Hold the user data
         this.userData = user;
         // Cache the encrypted serverside device id
         if (user.deviceId) {
             this.storage.setData(this.fields.serversideDeviceId, user.deviceId);
         }
-        if (keep) {
-            this.authorize(user.token, user.tokenScheme, refreshToken);
-        }
-        else {
-            this.cachedRefreshToken = this.encrypt(refreshToken);
-            this.authorize(user.token, user.tokenScheme, undefined);
-        }
+        // Authorize
+        this.authorize(user.token, user.tokenScheme, refreshToken);
     }
     /**
      * User logout

package/lib/mjs/app/IApp.d.ts

@@ -27,7 +27,7 @@ export interface NavigateOptions {
  * array means success, false means failed but no any message
  * other cases means failed with differnet message
  */
-export type RefreshTokenResult<R> = string | ApiDataError | [string | null, R];
+export type RefreshTokenResult<R> = IActionResult | [string | null, R];
 /**
  * Format result custom type
  */
@@ -61,6 +61,10 @@ export type AppLoginParams = DataTypes.SimpleObject & {
  * Refresh token props
  */
 export interface RefreshTokenProps {
+    /**
+     * Refresh token
+     */
+    token: string;
     /**
      * API name
      */
@@ -515,11 +519,12 @@ export interface IApp {
      */
     pageExit(): void;
     /**
-     * Refresh token
+     * Refresh token with result
      * @param props Props
      * @param callback Callback
+     * @param api API
      */
-    refreshToken(props?: RefreshTokenProps, callback?: (result?: boolean | string) => boolean | void): Promise<void>;
+    refreshToken(props: RefreshTokenProps, callback?: (result?: boolean | IActionResult) => boolean | void): Promise<void>;
     /**
      * Setup Api error handler
      * @param api Api
@@ -572,9 +577,8 @@ export interface IApp {
      * User login
      * @param user User data
      * @param refreshToken Refresh token
-     * @param keep Keep login or not
      */
-    userLogin(user: IUser, refreshToken: string, keep?: boolean): void;
+    userLogin(user: IUser, refreshToken: string): void;
     /**
      * User logout
      * @param clearToken Clear refresh token or not

package/lib/mjs/erp/AuthApi.d.ts

@@ -10,6 +10,7 @@ import { GetLogInUrlRQ } from './rq/GetLogInUrlRQ';
 import { TokenRQ } from './rq/TokenRQ';
 import { ApiRefreshTokenDto } from './dto/ApiRefreshTokenDto';
 import { RefreshTokenProps, RefreshTokenResult } from '../app/IApp';
+import { SwitchOrgRQ } from './rq/SwitchOrgRQ';
 /**
  * Authentication API
  */
@@ -56,11 +57,10 @@ export declare class AuthApi extends BaseApi {
     loginId(id: string, payload?: ResultPayload): Promise<IActionResult<{}> | undefined>;
     /**
      * Refresh token
-     * @param token Refresh token
      * @param props Props
      * @returns Result
      */
-    refreshToken<R>(token: string, props?: RefreshTokenProps): Promise<RefreshTokenResult<R>>;
+    refreshToken<R>(props: RefreshTokenProps): Promise<RefreshTokenResult<R>>;
     /**
      * Reset password
      * @param rq Request data
@@ -75,4 +75,10 @@ export declare class AuthApi extends BaseApi {
      * @returns Result
      */
     signout(rq: SignoutRQ, payload?: ResultPayload): Promise<IActionResult<{}> | undefined>;
+    /**
+     * Switch organization
+     * @param rq Request data
+     * @param payload Payload
+     */
+    switchOrg(rq: SwitchOrgRQ, payload?: ResultPayload): Promise<IActionResult<{}> | undefined>;
 }

package/lib/mjs/erp/AuthApi.js

@@ -1,4 +1,5 @@
 import { BaseApi } from './BaseApi';
+import { ActionResult } from '@etsoo/shared';
 /**
  * Authentication API
  */
@@ -63,13 +64,12 @@ export class AuthApi extends BaseApi {
     }
     /**
      * Refresh token
-     * @param token Refresh token
      * @param props Props
      * @returns Result
      */
-    async refreshToken(token, props) {
+    async refreshToken(props) {
         // Destruct
-        const { api = 'Auth/RefreshToken', showLoading = false, tokenField = AuthApi.HeaderTokenField } = props ?? {};
+        const { api = 'Auth/RefreshToken', showLoading = false, token, tokenField = AuthApi.HeaderTokenField } = props ?? {};
         // Reqest data
         const rq = {
             deviceId: this.app.deviceId
@@ -87,7 +87,14 @@ export class AuthApi extends BaseApi {
         // Call API
         const result = await this.api.put(api, rq, payload);
         if (result == null) {
-            return this.api.lastError ?? this.app.get('unknownError');
+            return this.api.lastError
+                ? ActionResult.create(this.api.lastError)
+                : {
+                    ok: false,
+                    type: 'unknownError',
+                    field: 'result',
+                    title: this.app.get('unknownError')
+                };
         }
         // Token
         const refreshToken = this.app.getResponseToken(payload.response, tokenField);
@@ -112,6 +119,14 @@ export class AuthApi extends BaseApi {
     signout(rq, payload) {
         return this.api.put('Auth/Signout', rq, payload);
     }
+    /**
+     * Switch organization
+     * @param rq Request data
+     * @param payload Payload
+     */
+    switchOrg(rq, payload) {
+        return this.app.api.put('Auth/SwitchOrg', rq, payload);
+    }
 }
 /**
  * Header token field name

package/lib/mjs/erp/OrgApi.d.ts

@@ -57,13 +57,6 @@ export declare class OrgApi extends EntityApi {
      * @returns Result
      */
     sendActionMessage(rq: SendActionMessageRQ, payload?: IApiPayload<void>): Promise<void | undefined>;
-    /**
-     * Switch organization
-     * @param id Organization id
-     * @param serviceId Service id
-     * @param payload Payload
-     */
-    switch(id: number, serviceId?: number, payload?: IApiPayload<boolean>): Promise<false | void>;
     /**
      * Update
      * @param data Modal data

package/lib/mjs/erp/OrgApi.js

@@ -69,22 +69,6 @@ export class OrgApi extends EntityApi {
         payload ?? (payload = { showLoading: false });
         return this.api.post('System/SendActionMessage', { ...rq, appId }, payload);
     }
-    /**
-     * Switch organization
-     * @param id Organization id
-     * @param serviceId Service id
-     * @param payload Payload
-     */
-    async switch(id, serviceId, payload) {
-        const result = await this.app.api.put('Organization/Switch', {
-            id,
-            serviceId,
-            deviceId: this.app.deviceId
-        }, payload);
-        if (result)
-            return await this.app.refreshToken();
-        return result;
-    }
     /**
      * Update
      * @param data Modal data

package/lib/mjs/erp/rq/SwitchOrgRQ.d.ts

@@ -0,0 +1,13 @@
+/**
+ * Switch organization request data
+ */
+export type SwitchOrgRQ = {
+    /**
+     * Target organization id
+     */
+    organizationId: number;
+    /**
+     * From organization id
+     */
+    fromOrganizationId: number;
+};

package/lib/mjs/erp/rq/SwitchOrgRQ.js

@@ -0,0 +1 @@
+export {};

package/lib/mjs/index.d.ts

@@ -61,6 +61,7 @@ export * from './erp/rq/RegionsRQ';
 export * from './erp/rq/ResetPasswordRQ';
 export * from './erp/rq/SendActionMessageRQ';
 export * from './erp/rq/SignoutRQ';
+export * from './erp/rq/SwitchOrgRQ';
 export * from './erp/rq/TiplistRQ';
 export * from './erp/rq/TokenRQ';
 export * from './erp/rq/UpdateStatusRQ';
@@ -75,7 +76,7 @@ export * from './i18n/CultureUtils';
 export * from './i18n/en';
 export * from './i18n/zhHans';
 export * from './i18n/zhHant';
-export { ApiAuthorizationScheme, ApiMethod, ApiResponseType, createClient, createClientAsync } from '@etsoo/restclient';
+export { ApiAuthorizationScheme, ApiDataError, ApiMethod, ApiResponseType, createClient, createClientAsync } from '@etsoo/restclient';
 export type { IApi, IApiPayload } from '@etsoo/restclient';
 export * from './result/ActionResult';
 export * from './result/ActionResultError';

package/lib/mjs/index.js

@@ -69,6 +69,7 @@ export * from './erp/rq/RegionsRQ';
 export * from './erp/rq/ResetPasswordRQ';
 export * from './erp/rq/SendActionMessageRQ';
 export * from './erp/rq/SignoutRQ';
+export * from './erp/rq/SwitchOrgRQ';
 export * from './erp/rq/TiplistRQ';
 export * from './erp/rq/TokenRQ';
 export * from './erp/rq/UpdateStatusRQ';
@@ -86,7 +87,7 @@ export * from './i18n/en';
 export * from './i18n/zhHans';
 export * from './i18n/zhHant';
 // @etsoo/restclient
-export { ApiAuthorizationScheme, ApiMethod, ApiResponseType, createClient, createClientAsync } from '@etsoo/restclient';
+export { ApiAuthorizationScheme, ApiDataError, ApiMethod, ApiResponseType, createClient, createClientAsync } from '@etsoo/restclient';
 // result
 export * from './result/ActionResult';
 export * from './result/ActionResultError';

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.5.44",
+    "version": "1.5.46",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",

package/src/app/CoreApp.ts

@@ -39,8 +39,7 @@ import {
     IAppFields,
     IDetectIPCallback,
     NavigateOptions,
-    RefreshTokenProps,
-    RefreshTokenResult
+    RefreshTokenProps
 } from './IApp';
 import { UserRole } from './UserRole';
 import type CryptoJS from 'crypto-js';
@@ -283,8 +282,6 @@ export abstract class CoreApp<
      */
     protected passphrase: string = '';
 
-    private cachedRefreshToken?: string;
-
     private apis: Record<string, ApiTaskData> = {};
 
     private tasks: [() => PromiseLike<void | false>, number, number][] = [];
@@ -329,14 +326,20 @@ export abstract class CoreApp<
         }
         this.defaultRegion = region;
 
+        // Current system refresh token
         const refresh: ApiRefreshTokenFunction = async (api, token) => {
             if (this.lastCalled) {
                 // Call refreshToken to update access token
-                // No popups show
-                await this.refreshToken({ showLoading: false }, (result) => {
-                    console.log(`CoreApp.${this.name}.ApiRefreshToken`, result);
-                    return false;
-                });
+                await this.refreshToken(
+                    { token, showLoading: false },
+                    (result) => {
+                        if (result === true) return;
+                        console.log(
+                            `CoreApp.${this.name}.RefreshToken`,
+                            result
+                        );
+                    }
+                );
             } else {
                 // Popup countdown for user action
                 this.freshCountdownUI();
@@ -1038,7 +1041,6 @@ export abstract class CoreApp<
                 );
             }
         } else {
-            this.cachedRefreshToken = undefined;
             this.updateApi(this.api.name, undefined, -1);
         }
 
@@ -1170,7 +1172,6 @@ export abstract class CoreApp<
      * Clear cached token
      */
     clearCacheToken() {
-        this.cachedRefreshToken = undefined;
         this.storage.setPersistedData(this.fields.headerToken, undefined);
     }
 
@@ -1498,32 +1499,6 @@ export abstract class CoreApp<
         return wf;
     }
 
-    /**
-     * Format refresh token result
-     * @param result Refresh token result
-     * @returns Message
-     */
-    protected formatRefreshTokenResult(
-        result: RefreshTokenResult<IActionResult<U>>
-    ): string | undefined {
-        // Error message
-        if (typeof result === 'string') return result;
-
-        // API error
-        if (result instanceof ApiDataError) return this.formatError(result);
-
-        // Action result
-        const [token, r] = result;
-
-        // Success
-        if (r.ok) return undefined;
-
-        // No token data
-        if (token == null) return `${this.get('noData')} (token)`;
-
-        return ActionResultError.format(r);
-    }
-
     private getFieldLabel(field: string) {
         return this.get(field.formatInitial(false)) ?? field;
     }
@@ -1623,8 +1598,6 @@ export abstract class CoreApp<
      * @returns Cached token
      */
     getCacheToken(): string | undefined {
-        // Temp refresh token
-        if (this.cachedRefreshToken) return this.cachedRefreshToken;
         return this.storage.getData<string>(this.fields.headerToken);
     }
 
@@ -1910,14 +1883,78 @@ export abstract class CoreApp<
     abstract freshCountdownUI(callback?: () => PromiseLike<unknown>): void;
 
     /**
-     * Refresh token
+     * Refresh token with result
      * @param props Props
      * @param callback Callback
      */
     async refreshToken(
-        props?: RefreshTokenProps,
-        callback?: (result?: boolean | string) => boolean | void
-    ) {}
+        props: RefreshTokenProps,
+        callback?: (result?: boolean | IActionResult) => boolean | void
+    ) {
+        // Call refresh token API
+        let data = await new AuthApi(this).refreshToken<IActionResult<U>>(
+            props
+        );
+
+        let r: IActionResult;
+        if (Array.isArray(data)) {
+            const [token, result] = data;
+            if (result.ok) {
+                if (!token) {
+                    data = {
+                        ok: false,
+                        type: 'noData',
+                        field: 'token',
+                        title: this.get('noData')
+                    };
+                } else if (result.data == null) {
+                    data = {
+                        ok: false,
+                        type: 'noData',
+                        field: 'user',
+                        title: this.get('noData')
+                    };
+                } else {
+                    // User login
+                    this.userLogin(result.data, token);
+
+                    if (callback) callback(true);
+
+                    // Exit
+                    return;
+                }
+            } else if (this.checkDeviceResult(result)) {
+                if (callback == null || callback(result) !== true) {
+                    this.initCall((ir) => {
+                        if (!ir) return;
+                        this.notifier.alert(
+                            this.get('environmentChanged') ??
+                                'Environment changed',
+                            () => {
+                                // Callback, return true to prevent the default reload action
+                                if (callback == null || callback() !== true) {
+                                    // Reload the page
+                                    history.go(0);
+                                }
+                            }
+                        );
+                    }, true);
+                    return;
+                }
+            }
+
+            r = result;
+        } else {
+            r = data;
+        }
+
+        if (callback == null || callback(r) !== true) {
+            const message = `${r.title} (${r.field})`;
+            this.notifier.alert(message, () => {
+                if (callback) callback(false);
+            });
+        }
+    }
 
     /**
      * Setup callback
@@ -2198,9 +2235,9 @@ export abstract class CoreApp<
      * User login
      * @param user User data
      * @param refreshToken Refresh token
-     * @param keep Keep login or not
      */
-    userLogin(user: U, refreshToken: string, keep?: boolean) {
+    userLogin(user: U, refreshToken: string) {
+        // Hold the user data
         this.userData = user;
 
         // Cache the encrypted serverside device id
@@ -2208,12 +2245,8 @@ export abstract class CoreApp<
             this.storage.setData(this.fields.serversideDeviceId, user.deviceId);
         }
 
-        if (keep) {
-            this.authorize(user.token, user.tokenScheme, refreshToken);
-        } else {
-            this.cachedRefreshToken = this.encrypt(refreshToken);
-            this.authorize(user.token, user.tokenScheme, undefined);
-        }
+        // Authorize
+        this.authorize(user.token, user.tokenScheme, refreshToken);
     }
 
     /**

package/src/app/IApp.ts

@@ -45,7 +45,7 @@ export interface NavigateOptions {
  * array means success, false means failed but no any message
  * other cases means failed with differnet message
  */
-export type RefreshTokenResult<R> = string | ApiDataError | [string | null, R];
+export type RefreshTokenResult<R> = IActionResult | [string | null, R];
 
 /**
  * Format result custom type
@@ -87,6 +87,11 @@ export type AppLoginParams = DataTypes.SimpleObject & {
  * Refresh token props
  */
 export interface RefreshTokenProps {
+    /**
+     * Refresh token
+     */
+    token: string;
+
     /**
      * API name
      */
@@ -695,13 +700,14 @@ export interface IApp {
     pageExit(): void;
 
     /**
-     * Refresh token
+     * Refresh token with result
      * @param props Props
      * @param callback Callback
+     * @param api API
      */
     refreshToken(
-        props?: RefreshTokenProps,
-        callback?: (result?: boolean | string) => boolean | void
+        props: RefreshTokenProps,
+        callback?: (result?: boolean | IActionResult) => boolean | void
     ): Promise<void>;
 
     /**
@@ -771,9 +777,8 @@ export interface IApp {
      * User login
      * @param user User data
      * @param refreshToken Refresh token
-     * @param keep Keep login or not
      */
-    userLogin(user: IUser, refreshToken: string, keep?: boolean): void;
+    userLogin(user: IUser, refreshToken: string): void;
 
     /**
      * User logout

package/src/erp/AuthApi.ts

@@ -5,13 +5,14 @@ import { ResultPayload } from './dto/ResultPayload';
 import { LoginIdRQ } from './rq/LoginIdRQ';
 import { LoginRQ } from './rq/LoginRQ';
 import { ResetPasswordRQ } from './rq/ResetPasswordRQ';
-import { IActionResult } from '@etsoo/shared';
+import { ActionResult, IActionResult } from '@etsoo/shared';
 import { SignoutRQ } from './rq/SignoutRQ';
 import { GetLogInUrlRQ } from './rq/GetLogInUrlRQ';
 import { TokenRQ } from './rq/TokenRQ';
 import { ApiRefreshTokenDto } from './dto/ApiRefreshTokenDto';
 import { RefreshTokenProps, RefreshTokenResult } from '../app/IApp';
 import { RefreshTokenRQ } from './rq/RefreshTokenRQ';
+import { SwitchOrgRQ } from './rq/SwitchOrgRQ';
 
 /**
  * Authentication API
@@ -91,18 +92,17 @@ export class AuthApi extends BaseApi {
 
     /**
      * Refresh token
-     * @param token Refresh token
      * @param props Props
      * @returns Result
      */
     async refreshToken<R>(
-        token: string,
-        props?: RefreshTokenProps
+        props: RefreshTokenProps
     ): Promise<RefreshTokenResult<R>> {
         // Destruct
         const {
             api = 'Auth/RefreshToken',
             showLoading = false,
+            token,
             tokenField = AuthApi.HeaderTokenField
         } = props ?? {};
 
@@ -125,7 +125,14 @@ export class AuthApi extends BaseApi {
         // Call API
         const result = await this.api.put(api, rq, payload);
         if (result == null) {
-            return this.api.lastError ?? this.app.get('unknownError')!;
+            return this.api.lastError
+                ? ActionResult.create(this.api.lastError)
+                : {
+                      ok: false,
+                      type: 'unknownError',
+                      field: 'result',
+                      title: this.app.get('unknownError')
+                  };
         }
 
         // Token
@@ -157,4 +164,13 @@ export class AuthApi extends BaseApi {
     signout(rq: SignoutRQ, payload?: ResultPayload) {
         return this.api.put('Auth/Signout', rq, payload);
     }
+
+    /**
+     * Switch organization
+     * @param rq Request data
+     * @param payload Payload
+     */
+    switchOrg(rq: SwitchOrgRQ, payload?: ResultPayload) {
+        return this.app.api.put('Auth/SwitchOrg', rq, payload);
+    }
 }

package/src/erp/OrgApi.ts

@@ -111,30 +111,6 @@ export class OrgApi extends EntityApi {
         );
     }
 
-    /**
-     * Switch organization
-     * @param id Organization id
-     * @param serviceId Service id
-     * @param payload Payload
-     */
-    async switch(
-        id: number,
-        serviceId?: number,
-        payload?: IApiPayload<boolean>
-    ) {
-        const result = await this.app.api.put(
-            'Organization/Switch',
-            {
-                id,
-                serviceId,
-                deviceId: this.app.deviceId
-            },
-            payload
-        );
-        if (result) return await this.app.refreshToken();
-        return result;
-    }
-
     /**
      * Update
      * @param data Modal data

package/src/erp/rq/SwitchOrgRQ.ts

@@ -0,0 +1,14 @@
+/**
+ * Switch organization request data
+ */
+export type SwitchOrgRQ = {
+    /**
+     * Target organization id
+     */
+    organizationId: number;
+
+    /**
+     * From organization id
+     */
+    fromOrganizationId: number;
+};

package/src/index.ts

@@ -76,6 +76,7 @@ export * from './erp/rq/RegionsRQ';
 export * from './erp/rq/ResetPasswordRQ';
 export * from './erp/rq/SendActionMessageRQ';
 export * from './erp/rq/SignoutRQ';
+export * from './erp/rq/SwitchOrgRQ';
 export * from './erp/rq/TiplistRQ';
 export * from './erp/rq/TokenRQ';
 export * from './erp/rq/UpdateStatusRQ';
@@ -98,6 +99,7 @@ export * from './i18n/zhHant';
 // @etsoo/restclient
 export {
     ApiAuthorizationScheme,
+    ApiDataError,
     ApiMethod,
     ApiResponseType,
     createClient,