@etsoo/appscript 1.5.42 → 1.5.44

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

@@ -420,17 +420,6 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @returns Error message
      */
     formatError(error: ApiDataError): string;
-    /**
-     * Refresh token failed
-     */
-    protected refreshTokenFailed(): void;
-    /**
-     * Do refresh token result
-     * @param result Result
-     * @param initCallCallback InitCall callback
-     * @param silent Silent without any popups
-     */
-    doRefreshTokenResult(result: RefreshTokenResult<IActionResult<U>>, initCallCallback?: (result: boolean) => void, silent?: boolean): void;
     /**
      * Format as full name
      * @param familyName Family name
@@ -442,7 +431,7 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @param result Refresh token result
      * @returns Message
      */
-    formatRefreshTokenResult(result: RefreshTokenResult<IActionResult<U>>): string | undefined;
+    protected formatRefreshTokenResult(result: RefreshTokenResult<IActionResult<U>>): string | undefined;
     private getFieldLabel;
     /**
      * Format result text
@@ -592,8 +581,9 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
     /**
      * Refresh token
      * @param props Props
+     * @param callback Callback
      */
-    refreshToken(props?: RefreshTokenProps): Promise<boolean>;
+    refreshToken(props?: RefreshTokenProps, callback?: (result?: boolean | string) => boolean | void): Promise<void>;
     /**
      * Setup callback
      */
@@ -643,7 +633,7 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * UI get involved while refreshToken not intended
      * @param params Login parameters
      */
-    tryLogin(params?: AppLoginParams): Promise<boolean>;
+    tryLogin(params?: AppLoginParams): Promise<void>;
     /**
      * Update embedded status
      * @param embedded New embedded status

package/lib/cjs/app/CoreApp.js

@@ -165,7 +165,11 @@ class CoreApp {
         const refresh = async (api, token) => {
             if (this.lastCalled) {
                 // Call refreshToken to update access token
-                await this.refreshToken();
+                // No popups show
+                await this.refreshToken({ showLoading: false }, (result) => {
+                    console.log(`CoreApp.${this.name}.ApiRefreshToken`, result);
+                    return false;
+                });
             }
             else {
                 // Popup countdown for user action
@@ -1004,44 +1008,6 @@ class CoreApp {
     formatError(error) {
         return `${error.message} (${error.name})`;
     }
-    /**
-     * Refresh token failed
-     */
-    refreshTokenFailed() {
-        this.userUnauthorized();
-        this.toLoginPage();
-    }
-    /**
-     * Do refresh token result
-     * @param result Result
-     * @param initCallCallback InitCall callback
-     * @param silent Silent without any popups
-     */
-    doRefreshTokenResult(result, initCallCallback, silent = false) {
-        if (Array.isArray(result) &&
-            !(result instanceof restclient_1.ApiDataError) &&
-            this.checkDeviceResult(result[1])) {
-            initCallCallback ?? (initCallCallback = (result) => {
-                if (!result)
-                    return;
-                this.notifier.alert(this.get('environmentChanged') ??
-                    'Environment changed', () => {
-                    // Reload the page
-                    history.go(0);
-                });
-            });
-            this.initCall(initCallCallback, true);
-            return;
-        }
-        const message = this.formatRefreshTokenResult(result);
-        if (message == null || silent) {
-            this.refreshTokenFailed();
-            return;
-        }
-        this.notifier.alert(message, () => {
-            this.refreshTokenFailed();
-        });
-    }
     /**
      * Format as full name
      * @param familyName Family name
@@ -1414,10 +1380,9 @@ class CoreApp {
     /**
      * Refresh token
      * @param props Props
+     * @param callback Callback
      */
-    async refreshToken(props) {
-        return true;
-    }
+    async refreshToken(props, callback) { }
     /**
      * Setup callback
      */
@@ -1611,10 +1576,9 @@ class CoreApp {
     async tryLogin(params) {
         // Check status
         if (this._isTryingLogin)
-            return false;
+            return;
         this._isTryingLogin = true;
         this.toLoginPage(params);
-        return true;
     }
     /**
      * Update embedded status

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

@@ -350,25 +350,12 @@ export interface IApp {
      * @returns Result
      */
     formatNumber(input: number | bigint, options?: Intl.NumberFormatOptions): string;
-    /**
-     * Do refresh token result
-     * @param result Result
-     * @param initCallCallback InitCall callback
-     * @param silent Silent without any popups
-     */
-    doRefreshTokenResult(result: RefreshTokenResult<IActionResult<IUser>>, initCallCallback?: (result: boolean) => void, silent?: boolean): void;
     /**
      * Format as full name
      * @param familyName Family name
      * @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
-     */
-    formatRefreshTokenResult(result: RefreshTokenResult<IActionResult<IUser>>): string | undefined;
     /**
      * Format result text
      * @param result Action result
@@ -530,8 +517,9 @@ export interface IApp {
     /**
      * Refresh token
      * @param props Props
+     * @param callback Callback
      */
-    refreshToken(props?: RefreshTokenProps): Promise<boolean>;
+    refreshToken(props?: RefreshTokenProps, callback?: (result?: boolean | string) => boolean | void): Promise<void>;
     /**
      * Setup Api error handler
      * @param api Api
@@ -567,7 +555,7 @@ export interface IApp {
      * UI get involved while refreshToken not intended
      * @param params Login parameters
      */
-    tryLogin(params?: AppLoginParams): Promise<boolean>;
+    tryLogin(params?: AppLoginParams): Promise<void>;
     /**
      * Update API token and expires
      * @param name Api name

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

@@ -14,6 +14,10 @@ import { RefreshTokenProps, RefreshTokenResult } from '../app/IApp';
  * Authentication API
  */
 export declare class AuthApi extends BaseApi {
+    /**
+     * Header token field name
+     */
+    static HeaderTokenField: string;
     /**
      * API refresh token
      * @param rq Request data

package/lib/cjs/erp/AuthApi.js

@@ -72,7 +72,7 @@ class AuthApi extends BaseApi_1.BaseApi {
      */
     async refreshToken(token, props) {
         // Destruct
-        const { api = 'Auth/RefreshToken', showLoading = false, tokenField = 'Etsoo-Refresh-Token' } = props ?? {};
+        const { api = 'Auth/RefreshToken', showLoading = false, tokenField = AuthApi.HeaderTokenField } = props ?? {};
         // Reqest data
         const rq = {
             deviceId: this.app.deviceId
@@ -117,3 +117,7 @@ class AuthApi extends BaseApi_1.BaseApi {
     }
 }
 exports.AuthApi = AuthApi;
+/**
+ * Header token field name
+ */
+AuthApi.HeaderTokenField = 'Etsoo-Refresh-Token';

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

@@ -63,7 +63,7 @@ export declare class OrgApi extends EntityApi {
      * @param serviceId Service id
      * @param payload Payload
      */
-    switch(id: number, serviceId?: number, payload?: IApiPayload<boolean>): Promise<boolean | undefined>;
+    switch(id: number, serviceId?: number, payload?: IApiPayload<boolean>): Promise<false | void>;
     /**
      * Update
      * @param data Modal data

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

@@ -420,17 +420,6 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @returns Error message
      */
     formatError(error: ApiDataError): string;
-    /**
-     * Refresh token failed
-     */
-    protected refreshTokenFailed(): void;
-    /**
-     * Do refresh token result
-     * @param result Result
-     * @param initCallCallback InitCall callback
-     * @param silent Silent without any popups
-     */
-    doRefreshTokenResult(result: RefreshTokenResult<IActionResult<U>>, initCallCallback?: (result: boolean) => void, silent?: boolean): void;
     /**
      * Format as full name
      * @param familyName Family name
@@ -442,7 +431,7 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @param result Refresh token result
      * @returns Message
      */
-    formatRefreshTokenResult(result: RefreshTokenResult<IActionResult<U>>): string | undefined;
+    protected formatRefreshTokenResult(result: RefreshTokenResult<IActionResult<U>>): string | undefined;
     private getFieldLabel;
     /**
      * Format result text
@@ -592,8 +581,9 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
     /**
      * Refresh token
      * @param props Props
+     * @param callback Callback
      */
-    refreshToken(props?: RefreshTokenProps): Promise<boolean>;
+    refreshToken(props?: RefreshTokenProps, callback?: (result?: boolean | string) => boolean | void): Promise<void>;
     /**
      * Setup callback
      */
@@ -643,7 +633,7 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * UI get involved while refreshToken not intended
      * @param params Login parameters
      */
-    tryLogin(params?: AppLoginParams): Promise<boolean>;
+    tryLogin(params?: AppLoginParams): Promise<void>;
     /**
      * Update embedded status
      * @param embedded New embedded status

package/lib/mjs/app/CoreApp.js

@@ -162,7 +162,11 @@ export class CoreApp {
         const refresh = async (api, token) => {
             if (this.lastCalled) {
                 // Call refreshToken to update access token
-                await this.refreshToken();
+                // No popups show
+                await this.refreshToken({ showLoading: false }, (result) => {
+                    console.log(`CoreApp.${this.name}.ApiRefreshToken`, result);
+                    return false;
+                });
             }
             else {
                 // Popup countdown for user action
@@ -1001,44 +1005,6 @@ export class CoreApp {
     formatError(error) {
         return `${error.message} (${error.name})`;
     }
-    /**
-     * Refresh token failed
-     */
-    refreshTokenFailed() {
-        this.userUnauthorized();
-        this.toLoginPage();
-    }
-    /**
-     * Do refresh token result
-     * @param result Result
-     * @param initCallCallback InitCall callback
-     * @param silent Silent without any popups
-     */
-    doRefreshTokenResult(result, initCallCallback, silent = false) {
-        if (Array.isArray(result) &&
-            !(result instanceof ApiDataError) &&
-            this.checkDeviceResult(result[1])) {
-            initCallCallback ?? (initCallCallback = (result) => {
-                if (!result)
-                    return;
-                this.notifier.alert(this.get('environmentChanged') ??
-                    'Environment changed', () => {
-                    // Reload the page
-                    history.go(0);
-                });
-            });
-            this.initCall(initCallCallback, true);
-            return;
-        }
-        const message = this.formatRefreshTokenResult(result);
-        if (message == null || silent) {
-            this.refreshTokenFailed();
-            return;
-        }
-        this.notifier.alert(message, () => {
-            this.refreshTokenFailed();
-        });
-    }
     /**
      * Format as full name
      * @param familyName Family name
@@ -1411,10 +1377,9 @@ export class CoreApp {
     /**
      * Refresh token
      * @param props Props
+     * @param callback Callback
      */
-    async refreshToken(props) {
-        return true;
-    }
+    async refreshToken(props, callback) { }
     /**
      * Setup callback
      */
@@ -1608,10 +1573,9 @@ export class CoreApp {
     async tryLogin(params) {
         // Check status
         if (this._isTryingLogin)
-            return false;
+            return;
         this._isTryingLogin = true;
         this.toLoginPage(params);
-        return true;
     }
     /**
      * Update embedded status

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

@@ -350,25 +350,12 @@ export interface IApp {
      * @returns Result
      */
     formatNumber(input: number | bigint, options?: Intl.NumberFormatOptions): string;
-    /**
-     * Do refresh token result
-     * @param result Result
-     * @param initCallCallback InitCall callback
-     * @param silent Silent without any popups
-     */
-    doRefreshTokenResult(result: RefreshTokenResult<IActionResult<IUser>>, initCallCallback?: (result: boolean) => void, silent?: boolean): void;
     /**
      * Format as full name
      * @param familyName Family name
      * @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
-     */
-    formatRefreshTokenResult(result: RefreshTokenResult<IActionResult<IUser>>): string | undefined;
     /**
      * Format result text
      * @param result Action result
@@ -530,8 +517,9 @@ export interface IApp {
     /**
      * Refresh token
      * @param props Props
+     * @param callback Callback
      */
-    refreshToken(props?: RefreshTokenProps): Promise<boolean>;
+    refreshToken(props?: RefreshTokenProps, callback?: (result?: boolean | string) => boolean | void): Promise<void>;
     /**
      * Setup Api error handler
      * @param api Api
@@ -567,7 +555,7 @@ export interface IApp {
      * UI get involved while refreshToken not intended
      * @param params Login parameters
      */
-    tryLogin(params?: AppLoginParams): Promise<boolean>;
+    tryLogin(params?: AppLoginParams): Promise<void>;
     /**
      * Update API token and expires
      * @param name Api name

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

@@ -14,6 +14,10 @@ import { RefreshTokenProps, RefreshTokenResult } from '../app/IApp';
  * Authentication API
  */
 export declare class AuthApi extends BaseApi {
+    /**
+     * Header token field name
+     */
+    static HeaderTokenField: string;
     /**
      * API refresh token
      * @param rq Request data

package/lib/mjs/erp/AuthApi.js

@@ -69,7 +69,7 @@ export class AuthApi extends BaseApi {
      */
     async refreshToken(token, props) {
         // Destruct
-        const { api = 'Auth/RefreshToken', showLoading = false, tokenField = 'Etsoo-Refresh-Token' } = props ?? {};
+        const { api = 'Auth/RefreshToken', showLoading = false, tokenField = AuthApi.HeaderTokenField } = props ?? {};
         // Reqest data
         const rq = {
             deviceId: this.app.deviceId
@@ -113,3 +113,7 @@ export class AuthApi extends BaseApi {
         return this.api.put('Auth/Signout', rq, payload);
     }
 }
+/**
+ * Header token field name
+ */
+AuthApi.HeaderTokenField = 'Etsoo-Refresh-Token';

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

@@ -63,7 +63,7 @@ export declare class OrgApi extends EntityApi {
      * @param serviceId Service id
      * @param payload Payload
      */
-    switch(id: number, serviceId?: number, payload?: IApiPayload<boolean>): Promise<boolean | undefined>;
+    switch(id: number, serviceId?: number, payload?: IApiPayload<boolean>): Promise<false | void>;
     /**
      * Update
      * @param data Modal data

package/package.json

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

package/src/app/CoreApp.ts

@@ -332,7 +332,11 @@ export abstract class CoreApp<
         const refresh: ApiRefreshTokenFunction = async (api, token) => {
             if (this.lastCalled) {
                 // Call refreshToken to update access token
-                await this.refreshToken();
+                // No popups show
+                await this.refreshToken({ showLoading: false }, (result) => {
+                    console.log(`CoreApp.${this.name}.ApiRefreshToken`, result);
+                    return false;
+                });
             } else {
                 // Popup countdown for user action
                 this.freshCountdownUI();
@@ -1476,57 +1480,6 @@ export abstract class CoreApp<
         return `${error.message} (${error.name})`;
     }
 
-    /**
-     * Refresh token failed
-     */
-    protected refreshTokenFailed() {
-        this.userUnauthorized();
-        this.toLoginPage();
-    }
-
-    /**
-     * Do refresh token result
-     * @param result Result
-     * @param initCallCallback InitCall callback
-     * @param silent Silent without any popups
-     */
-    doRefreshTokenResult(
-        result: RefreshTokenResult<IActionResult<U>>,
-        initCallCallback?: (result: boolean) => void,
-        silent: boolean = false
-    ) {
-        if (
-            Array.isArray(result) &&
-            !(result instanceof ApiDataError) &&
-            this.checkDeviceResult(result[1])
-        ) {
-            initCallCallback ??= (result) => {
-                if (!result) return;
-                this.notifier.alert(
-                    this.get<string>('environmentChanged') ??
-                        'Environment changed',
-                    () => {
-                        // Reload the page
-                        history.go(0);
-                    }
-                );
-            };
-
-            this.initCall(initCallCallback, true);
-            return;
-        }
-
-        const message = this.formatRefreshTokenResult(result);
-        if (message == null || silent) {
-            this.refreshTokenFailed();
-            return;
-        }
-
-        this.notifier.alert(message, () => {
-            this.refreshTokenFailed();
-        });
-    }
-
     /**
      * Format as full name
      * @param familyName Family name
@@ -1550,7 +1503,9 @@ export abstract class CoreApp<
      * @param result Refresh token result
      * @returns Message
      */
-    formatRefreshTokenResult(result: RefreshTokenResult<IActionResult<U>>) {
+    protected formatRefreshTokenResult(
+        result: RefreshTokenResult<IActionResult<U>>
+    ): string | undefined {
         // Error message
         if (typeof result === 'string') return result;
 
@@ -1957,10 +1912,12 @@ export abstract class CoreApp<
     /**
      * Refresh token
      * @param props Props
+     * @param callback Callback
      */
-    async refreshToken(props?: RefreshTokenProps) {
-        return true;
-    }
+    async refreshToken(
+        props?: RefreshTokenProps,
+        callback?: (result?: boolean | string) => boolean | void
+    ) {}
 
     /**
      * Setup callback
@@ -2203,12 +2160,10 @@ export abstract class CoreApp<
      */
     async tryLogin(params?: AppLoginParams) {
         // Check status
-        if (this._isTryingLogin) return false;
+        if (this._isTryingLogin) return;
         this._isTryingLogin = true;
 
         this.toLoginPage(params);
-
-        return true;
     }
 
     /**

package/src/app/IApp.ts

@@ -473,18 +473,6 @@ export interface IApp {
         options?: Intl.NumberFormatOptions
     ): string;
 
-    /**
-     * Do refresh token result
-     * @param result Result
-     * @param initCallCallback InitCall callback
-     * @param silent Silent without any popups
-     */
-    doRefreshTokenResult(
-        result: RefreshTokenResult<IActionResult<IUser>>,
-        initCallCallback?: (result: boolean) => void,
-        silent?: boolean
-    ): void;
-
     /**
      * Format as full name
      * @param familyName Family name
@@ -495,15 +483,6 @@ export interface IApp {
         givenName: string | undefined | null
     ): string;
 
-    /**
-     * Format refresh token result
-     * @param result Refresh token result
-     * @returns Message
-     */
-    formatRefreshTokenResult(
-        result: RefreshTokenResult<IActionResult<IUser>>
-    ): string | undefined;
-
     /**
      * Format result text
      * @param result Action result
@@ -718,8 +697,12 @@ export interface IApp {
     /**
      * Refresh token
      * @param props Props
+     * @param callback Callback
      */
-    refreshToken(props?: RefreshTokenProps): Promise<boolean>;
+    refreshToken(
+        props?: RefreshTokenProps,
+        callback?: (result?: boolean | string) => boolean | void
+    ): Promise<void>;
 
     /**
      * Setup Api error handler
@@ -768,7 +751,7 @@ export interface IApp {
      * UI get involved while refreshToken not intended
      * @param params Login parameters
      */
-    tryLogin(params?: AppLoginParams): Promise<boolean>;
+    tryLogin(params?: AppLoginParams): Promise<void>;
 
     /**
      * Update API token and expires

package/src/erp/AuthApi.ts

@@ -17,6 +17,11 @@ import { RefreshTokenRQ } from './rq/RefreshTokenRQ';
  * Authentication API
  */
 export class AuthApi extends BaseApi {
+    /**
+     * Header token field name
+     */
+    static HeaderTokenField = 'Etsoo-Refresh-Token';
+
     /**
      * API refresh token
      * @param rq Request data
@@ -98,7 +103,7 @@ export class AuthApi extends BaseApi {
         const {
             api = 'Auth/RefreshToken',
             showLoading = false,
-            tokenField = 'Etsoo-Refresh-Token'
+            tokenField = AuthApi.HeaderTokenField
         } = props ?? {};
 
         // Reqest data