@etsoo/appscript 1.5.45 → 1.5.47

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

@@ -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;
     /**
@@ -573,7 +572,7 @@ 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
      */
@@ -619,7 +618,7 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
     signout(): Promise<void>;
     /**
      * Go to the login page
-     * params Login parameters
+     * @params Login parameters
      */
     toLoginPage(params?: AppLoginParams): void;
     /**
@@ -638,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);
     }
     /**
@@ -1108,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);
     }
     /**
@@ -1356,11 +1352,75 @@ 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) {
+        // Check props
+        props ?? (props = {});
+        props.token ?? (props.token = this.getCacheToken());
+        // 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
      */
@@ -1535,7 +1595,7 @@ class CoreApp {
     }
     /**
      * Go to the login page
-     * params Login parameters
+     * @params Login parameters
      */
     toLoginPage(params) {
         // Destruct
@@ -1587,21 +1647,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> = IActionResult | [string, R];
+export type RefreshTokenResult<R> = IActionResult | [string | null, R];
 /**
  * Format result custom type
  */
@@ -62,7 +62,11 @@ export type AppLoginParams = DataTypes.SimpleObject & {
  */
 export interface RefreshTokenProps {
     /**
-     * API name
+     * Refresh token
+     */
+    token?: string;
+    /**
+     * API URL
      */
     api?: string;
     /**
@@ -515,9 +519,10 @@ 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 | IActionResult) => boolean | void): Promise<void>;
     /**
@@ -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

@@ -67,13 +67,21 @@ 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 ?? {};
+        // Check the token
+        if (!token) {
+            return {
+                ok: false,
+                type: 'noData',
+                field: 'token',
+                title: this.app.get('noData')
+            };
+        }
         // Reqest data
         const rq = {
             deviceId: this.app.deviceId
@@ -102,15 +110,6 @@ class AuthApi extends BaseApi_1.BaseApi {
         }
         // Token
         const refreshToken = this.app.getResponseToken(payload.response, tokenField);
-        if (!refreshToken) {
-            // No refresh token
-            return {
-                ok: false,
-                type: 'noData',
-                field: 'token',
-                title: this.app.get('noData')
-            };
-        }
         // Success
         return [refreshToken, result];
     }
@@ -132,6 +131,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';

package/lib/cjs/index.js

@@ -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);

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

@@ -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;
     /**
@@ -573,7 +572,7 @@ 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
      */
@@ -619,7 +618,7 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
     signout(): Promise<void>;
     /**
      * Go to the login page
-     * params Login parameters
+     * @params Login parameters
      */
     toLoginPage(params?: AppLoginParams): void;
     /**
@@ -638,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

@@ -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);
     }
     /**
@@ -1105,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);
     }
     /**
@@ -1353,11 +1349,75 @@ 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) {
+        // Check props
+        props ?? (props = {});
+        props.token ?? (props.token = this.getCacheToken());
+        // 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
      */
@@ -1532,7 +1592,7 @@ export class CoreApp {
     }
     /**
      * Go to the login page
-     * params Login parameters
+     * @params Login parameters
      */
     toLoginPage(params) {
         // Destruct
@@ -1584,21 +1644,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> = IActionResult | [string, R];
+export type RefreshTokenResult<R> = IActionResult | [string | null, R];
 /**
  * Format result custom type
  */
@@ -62,7 +62,11 @@ export type AppLoginParams = DataTypes.SimpleObject & {
  */
 export interface RefreshTokenProps {
     /**
-     * API name
+     * Refresh token
+     */
+    token?: string;
+    /**
+     * API URL
      */
     api?: string;
     /**
@@ -515,9 +519,10 @@ 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 | IActionResult) => boolean | void): Promise<void>;
     /**
@@ -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

@@ -64,13 +64,21 @@ 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 ?? {};
+        // Check the token
+        if (!token) {
+            return {
+                ok: false,
+                type: 'noData',
+                field: 'token',
+                title: this.app.get('noData')
+            };
+        }
         // Reqest data
         const rq = {
             deviceId: this.app.deviceId
@@ -99,15 +107,6 @@ export class AuthApi extends BaseApi {
         }
         // Token
         const refreshToken = this.app.getResponseToken(payload.response, tokenField);
-        if (!refreshToken) {
-            // No refresh token
-            return {
-                ok: false,
-                type: 'noData',
-                field: 'token',
-                title: this.app.get('noData')
-            };
-        }
         // Success
         return [refreshToken, result];
     }
@@ -129,6 +128,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';

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';

package/package.json

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

package/src/app/CoreApp.ts

@@ -282,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][] = [];
@@ -328,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();
@@ -1037,7 +1041,6 @@ export abstract class CoreApp<
                 );
             }
         } else {
-            this.cachedRefreshToken = undefined;
             this.updateApi(this.api.name, undefined, -1);
         }
 
@@ -1169,7 +1172,6 @@ export abstract class CoreApp<
      * Clear cached token
      */
     clearCacheToken() {
-        this.cachedRefreshToken = undefined;
         this.storage.setPersistedData(this.fields.headerToken, undefined);
     }
 
@@ -1596,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);
     }
 
@@ -1883,14 +1883,82 @@ 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 | IActionResult) => boolean | void
-    ) {}
+    ) {
+        // Check props
+        props ??= {};
+        props.token ??= this.getCacheToken();
+
+        // 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
@@ -2111,7 +2179,7 @@ export abstract class CoreApp<
 
     /**
      * Go to the login page
-     * params Login parameters
+     * @params Login parameters
      */
     toLoginPage(params?: AppLoginParams) {
         // Destruct
@@ -2171,9 +2239,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
@@ -2181,12 +2249,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> = IActionResult | [string, R];
+export type RefreshTokenResult<R> = IActionResult | [string | null, R];
 
 /**
  * Format result custom type
@@ -88,7 +88,12 @@ export type AppLoginParams = DataTypes.SimpleObject & {
  */
 export interface RefreshTokenProps {
     /**
-     * API name
+     * Refresh token
+     */
+    token?: string;
+
+    /**
+     * API URL
      */
     api?: string;
 
@@ -695,9 +700,10 @@ export interface IApp {
     pageExit(): void;
 
     /**
-     * Refresh token
+     * Refresh token with result
      * @param props Props
      * @param callback Callback
+     * @param api API
      */
     refreshToken(
         props?: RefreshTokenProps,
@@ -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

@@ -12,6 +12,7 @@ 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,21 +92,30 @@ 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 ?? {};
 
+        // Check the token
+        if (!token) {
+            return {
+                ok: false,
+                type: 'noData',
+                field: 'token',
+                title: this.app.get('noData')
+            };
+        }
+
         // Reqest data
         const rq: RefreshTokenRQ = {
             deviceId: this.app.deviceId
@@ -141,16 +151,6 @@ export class AuthApi extends BaseApi {
             tokenField
         );
 
-        if (!refreshToken) {
-            // No refresh token
-            return {
-                ok: false,
-                type: 'noData',
-                field: 'token',
-                title: this.app.get('noData')
-            };
-        }
-
         // Success
         return [refreshToken, result];
     }
@@ -174,4 +174,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';