@etsoo/appscript 1.5.42 → 1.5.43

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
@@ -593,7 +582,7 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * Refresh token
      * @param props Props
      */
-    refreshToken(props?: RefreshTokenProps): Promise<boolean>;
+    refreshToken(props?: RefreshTokenProps): Promise<void>;
     /**
      * Setup callback
      */
@@ -643,7 +632,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

@@ -1004,44 +1004,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
@@ -1415,9 +1377,7 @@ class CoreApp {
      * Refresh token
      * @param props Props
      */
-    async refreshToken(props) {
-        return true;
-    }
+    async refreshToken(props) { }
     /**
      * Setup callback
      */
@@ -1611,10 +1571,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

@@ -65,6 +65,11 @@ export interface RefreshTokenProps {
      * API name
      */
     api?: string;
+    /**
+     * Callback
+     * @param result Result
+     */
+    callback?: (result: boolean) => void;
     /**
      * Show loading bar or not
      */
@@ -350,25 +355,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
@@ -531,7 +523,7 @@ export interface IApp {
      * Refresh token
      * @param props Props
      */
-    refreshToken(props?: RefreshTokenProps): Promise<boolean>;
+    refreshToken(props?: RefreshTokenProps): Promise<void>;
     /**
      * Setup Api error handler
      * @param api Api
@@ -567,7 +559,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/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
@@ -593,7 +582,7 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * Refresh token
      * @param props Props
      */
-    refreshToken(props?: RefreshTokenProps): Promise<boolean>;
+    refreshToken(props?: RefreshTokenProps): Promise<void>;
     /**
      * Setup callback
      */
@@ -643,7 +632,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

@@ -1001,44 +1001,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
@@ -1412,9 +1374,7 @@ export class CoreApp {
      * Refresh token
      * @param props Props
      */
-    async refreshToken(props) {
-        return true;
-    }
+    async refreshToken(props) { }
     /**
      * Setup callback
      */
@@ -1608,10 +1568,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

@@ -65,6 +65,11 @@ export interface RefreshTokenProps {
      * API name
      */
     api?: string;
+    /**
+     * Callback
+     * @param result Result
+     */
+    callback?: (result: boolean) => void;
     /**
      * Show loading bar or not
      */
@@ -350,25 +355,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
@@ -531,7 +523,7 @@ export interface IApp {
      * Refresh token
      * @param props Props
      */
-    refreshToken(props?: RefreshTokenProps): Promise<boolean>;
+    refreshToken(props?: RefreshTokenProps): Promise<void>;
     /**
      * Setup Api error handler
      * @param api Api
@@ -567,7 +559,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/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.43",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",

package/src/app/CoreApp.ts

@@ -1476,57 +1476,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 +1499,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;
 
@@ -1958,9 +1909,7 @@ export abstract class CoreApp<
      * Refresh token
      * @param props Props
      */
-    async refreshToken(props?: RefreshTokenProps) {
-        return true;
-    }
+    async refreshToken(props?: RefreshTokenProps) {}
 
     /**
      * Setup callback
@@ -2203,12 +2152,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

@@ -92,6 +92,12 @@ export interface RefreshTokenProps {
      */
     api?: string;
 
+    /**
+     * Callback
+     * @param result Result
+     */
+    callback?: (result: boolean) => void;
+
     /**
      * Show loading bar or not
      */
@@ -473,18 +479,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 +489,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
@@ -719,7 +704,7 @@ export interface IApp {
      * Refresh token
      * @param props Props
      */
-    refreshToken(props?: RefreshTokenProps): Promise<boolean>;
+    refreshToken(props?: RefreshTokenProps): Promise<void>;
 
     /**
      * Setup Api error handler
@@ -768,7 +753,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