@etsoo/appscript 1.5.47 → 1.5.49

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 } from './IApp';
+import { AppLoginParams, AppTryLoginParams, FormatResultCustomCallback, IApp, IAppFields, IDetectIPCallback, NavigateOptions, RefreshTokenProps } from './IApp';
 import { UserRole } from './UserRole';
 import { ExternalEndpoint } from './ExternalSettings';
 import { ApiRefreshTokenDto } from '../erp/dto/ApiRefreshTokenDto';
@@ -600,6 +600,13 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @param coreName Core system's name, default is 'core'
      */
     exchangeTokenAll(coreData: ApiRefreshTokenDto, coreName?: string): void;
+    /**
+     * API refresh token data
+     * @param api Current API
+     * @param token Refresh token
+     * @returns Result
+     */
+    protected apiRefreshTokenData(api: IApi, token: string): Promise<ApiRefreshTokenDto | undefined>;
     /**
      * API refresh token
      * @param api Current API
@@ -626,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<void>;
+    tryLogin(params?: AppTryLoginParams): Promise<boolean>;
     /**
      * Update embedded status
      * @param embedded New embedded status

package/lib/cjs/app/CoreApp.js

@@ -1488,14 +1488,14 @@ class CoreApp {
         }
     }
     /**
-     * API refresh token
+     * API refresh token data
      * @param api Current API
      * @param token Refresh token
      * @returns Result
      */
-    async apiRefreshToken(api, token) {
+    async apiRefreshTokenData(api, token) {
         // Call the API quietly, no loading bar and no error popup
-        const data = await new AuthApi_1.AuthApi(this).apiRefreshToken({ token }, {
+        return new AuthApi_1.AuthApi(this).apiRefreshToken({ token }, {
             showLoading: false,
             onError: (error) => {
                 console.error(`CoreApp.${api.name}.apiRefreshToken error`, error);
@@ -1503,6 +1503,16 @@ class CoreApp {
                 return false;
             }
         });
+    }
+    /**
+     * API refresh token
+     * @param api Current API
+     * @param token Refresh token
+     * @returns Result
+     */
+    async apiRefreshToken(api, token) {
+        // Call the API quietly, no loading bar and no error popup
+        const data = await this.apiRefreshTokenData(api, token);
         if (data == null)
             return undefined;
         // Update the access token
@@ -1614,9 +1624,9 @@ class CoreApp {
     async tryLogin(params) {
         // Check status
         if (this._isTryingLogin)
-            return;
+            return false;
         this._isTryingLogin = true;
-        this.toLoginPage(params);
+        return true;
     }
     /**
      * Update embedded status

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

@@ -57,6 +57,19 @@ export type AppLoginParams = DataTypes.SimpleObject & {
      */
     showLoading?: boolean;
 };
+/**
+ * App try login parameters
+ */
+export type AppTryLoginParams = AppLoginParams & {
+    /**
+     * Callback on failure
+     */
+    onFailure?: () => void;
+    /**
+     * Callback on success
+     */
+    onSuccess?: () => void;
+};
 /**
  * Refresh token props
  */
@@ -560,7 +573,7 @@ export interface IApp {
      * UI get involved while refreshToken not intended
      * @param params Login parameters
      */
-    tryLogin(params?: AppLoginParams): Promise<void>;
+    tryLogin(params?: AppLoginParams): Promise<boolean>;
     /**
      * Update API token and expires
      * @param name Api name

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 } from './IApp';
+import { AppLoginParams, AppTryLoginParams, FormatResultCustomCallback, IApp, IAppFields, IDetectIPCallback, NavigateOptions, RefreshTokenProps } from './IApp';
 import { UserRole } from './UserRole';
 import { ExternalEndpoint } from './ExternalSettings';
 import { ApiRefreshTokenDto } from '../erp/dto/ApiRefreshTokenDto';
@@ -600,6 +600,13 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @param coreName Core system's name, default is 'core'
      */
     exchangeTokenAll(coreData: ApiRefreshTokenDto, coreName?: string): void;
+    /**
+     * API refresh token data
+     * @param api Current API
+     * @param token Refresh token
+     * @returns Result
+     */
+    protected apiRefreshTokenData(api: IApi, token: string): Promise<ApiRefreshTokenDto | undefined>;
     /**
      * API refresh token
      * @param api Current API
@@ -626,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<void>;
+    tryLogin(params?: AppTryLoginParams): Promise<boolean>;
     /**
      * Update embedded status
      * @param embedded New embedded status

package/lib/mjs/app/CoreApp.js

@@ -1485,14 +1485,14 @@ export class CoreApp {
         }
     }
     /**
-     * API refresh token
+     * API refresh token data
      * @param api Current API
      * @param token Refresh token
      * @returns Result
      */
-    async apiRefreshToken(api, token) {
+    async apiRefreshTokenData(api, token) {
         // Call the API quietly, no loading bar and no error popup
-        const data = await new AuthApi(this).apiRefreshToken({ token }, {
+        return new AuthApi(this).apiRefreshToken({ token }, {
             showLoading: false,
             onError: (error) => {
                 console.error(`CoreApp.${api.name}.apiRefreshToken error`, error);
@@ -1500,6 +1500,16 @@ export class CoreApp {
                 return false;
             }
         });
+    }
+    /**
+     * API refresh token
+     * @param api Current API
+     * @param token Refresh token
+     * @returns Result
+     */
+    async apiRefreshToken(api, token) {
+        // Call the API quietly, no loading bar and no error popup
+        const data = await this.apiRefreshTokenData(api, token);
         if (data == null)
             return undefined;
         // Update the access token
@@ -1611,9 +1621,9 @@ export class CoreApp {
     async tryLogin(params) {
         // Check status
         if (this._isTryingLogin)
-            return;
+            return false;
         this._isTryingLogin = true;
-        this.toLoginPage(params);
+        return true;
     }
     /**
      * Update embedded status

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

@@ -57,6 +57,19 @@ export type AppLoginParams = DataTypes.SimpleObject & {
      */
     showLoading?: boolean;
 };
+/**
+ * App try login parameters
+ */
+export type AppTryLoginParams = AppLoginParams & {
+    /**
+     * Callback on failure
+     */
+    onFailure?: () => void;
+    /**
+     * Callback on success
+     */
+    onSuccess?: () => void;
+};
 /**
  * Refresh token props
  */
@@ -560,7 +573,7 @@ export interface IApp {
      * UI get involved while refreshToken not intended
      * @param params Login parameters
      */
-    tryLogin(params?: AppLoginParams): Promise<void>;
+    tryLogin(params?: AppLoginParams): Promise<boolean>;
     /**
      * Update API token and expires
      * @param name Api name

package/package.json

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

package/src/app/CoreApp.ts

@@ -34,6 +34,7 @@ import { IAppSettings } from './AppSettings';
 import {
     appFields,
     AppLoginParams,
+    AppTryLoginParams,
     FormatResultCustomCallback,
     IApp,
     IAppFields,
@@ -2045,17 +2046,17 @@ export abstract class CoreApp<
     }
 
     /**
-     * API refresh token
+     * API refresh token data
      * @param api Current API
      * @param token Refresh token
      * @returns Result
      */
-    protected async apiRefreshToken(
+    protected async apiRefreshTokenData(
         api: IApi,
         token: string
-    ): Promise<[string, number] | undefined> {
+    ): Promise<ApiRefreshTokenDto | undefined> {
         // Call the API quietly, no loading bar and no error popup
-        const data = await new AuthApi(this).apiRefreshToken(
+        return new AuthApi(this).apiRefreshToken(
             { token },
             {
                 showLoading: false,
@@ -2070,6 +2071,20 @@ export abstract class CoreApp<
                 }
             }
         );
+    }
+
+    /**
+     * API refresh token
+     * @param api Current API
+     * @param token Refresh token
+     * @returns Result
+     */
+    protected async apiRefreshToken(
+        api: IApi,
+        token: string
+    ): Promise<[string, number] | undefined> {
+        // Call the API quietly, no loading bar and no error popup
+        const data = await this.apiRefreshTokenData(api, token);
         if (data == null) return undefined;
 
         // Update the access token
@@ -2199,12 +2214,12 @@ export abstract class CoreApp<
      * UI get involved while refreshToken not intended
      * @param params Login parameters
      */
-    async tryLogin(params?: AppLoginParams) {
+    async tryLogin(params?: AppTryLoginParams) {
         // Check status
-        if (this._isTryingLogin) return;
+        if (this._isTryingLogin) return false;
         this._isTryingLogin = true;
 
-        this.toLoginPage(params);
+        return true;
     }
 
     /**

package/src/app/IApp.ts

@@ -83,6 +83,21 @@ export type AppLoginParams = DataTypes.SimpleObject & {
     showLoading?: boolean;
 };
 
+/**
+ * App try login parameters
+ */
+export type AppTryLoginParams = AppLoginParams & {
+    /**
+     * Callback on failure
+     */
+    onFailure?: () => void;
+
+    /**
+     * Callback on success
+     */
+    onSuccess?: () => void;
+};
+
 /**
  * Refresh token props
  */
@@ -757,7 +772,7 @@ export interface IApp {
      * UI get involved while refreshToken not intended
      * @param params Login parameters
      */
-    tryLogin(params?: AppLoginParams): Promise<void>;
+    tryLogin(params?: AppLoginParams): Promise<boolean>;
 
     /**
      * Update API token and expires