@etsoo/appscript 1.5.41 → 1.5.42

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 { FormatResultCustomCallback, IApp, IAppFields, IDetectIPCallback, NavigateOptions, RefreshTokenProps, RefreshTokenResult } from './IApp';
+import { AppLoginParams, FormatResultCustomCallback, IApp, IAppFields, IDetectIPCallback, NavigateOptions, RefreshTokenProps, RefreshTokenResult } from './IApp';
 import { UserRole } from './UserRole';
 import { ExternalEndpoint } from './ExternalSettings';
 import { ApiRefreshTokenDto } from '../erp/dto/ApiRefreshTokenDto';
@@ -135,6 +135,11 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      */
     get embedded(): boolean;
     private _isTryingLogin;
+    /**
+     * Is trying login
+     */
+    get isTryingLogin(): boolean;
+    protected set isTryingLogin(value: boolean);
     /**
      * Last called with token refresh
      */
@@ -630,16 +635,15 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
     signout(): Promise<void>;
     /**
      * Go to the login page
-     * @param tryLogin Try to login again
-     * @param removeUrl Remove current URL for reuse
+     * params Login parameters
      */
-    toLoginPage(tryLogin?: boolean, removeUrl?: boolean): void;
+    toLoginPage(params?: AppLoginParams): void;
     /**
      * Try login, returning false means is loading
      * UI get involved while refreshToken not intended
-     * @param showLoading Show loading bar or not during call
+     * @param params Login parameters
      */
-    tryLogin(_showLoading?: boolean): Promise<boolean>;
+    tryLogin(params?: AppLoginParams): Promise<boolean>;
     /**
      * Update embedded status
      * @param embedded New embedded status

package/lib/cjs/app/CoreApp.js

@@ -102,6 +102,15 @@ class CoreApp {
     get embedded() {
         return this._embedded;
     }
+    /**
+     * Is trying login
+     */
+    get isTryingLogin() {
+        return this._isTryingLogin;
+    }
+    set isTryingLogin(value) {
+        this._isTryingLogin = value;
+    }
     /**
      * Get persisted fields
      */
@@ -1579,28 +1588,32 @@ class CoreApp {
         // Clear, noTrigger = true, avoid state update
         this.userLogout(true, true);
         // Go to login page
-        this.toLoginPage(false, true);
+        this.toLoginPage({ tryLogin: false, removeUrl: true });
     }
     /**
      * Go to the login page
-     * @param tryLogin Try to login again
-     * @param removeUrl Remove current URL for reuse
+     * params Login parameters
      */
-    toLoginPage(tryLogin, removeUrl) {
+    toLoginPage(params) {
+        // Destruct
+        const { removeUrl, showLoading, ...rest } = params ?? {};
         // Save the current URL
         this.cachedUrl = removeUrl ? undefined : globalThis.location.href;
-        const url = `/?tryLogin=${tryLogin ?? false}`;
+        // URL with parameters
+        const url = '/'.addUrlParams(rest);
         this.navigate(url);
     }
     /**
      * Try login, returning false means is loading
      * UI get involved while refreshToken not intended
-     * @param showLoading Show loading bar or not during call
+     * @param params Login parameters
      */
-    async tryLogin(_showLoading) {
+    async tryLogin(params) {
+        // Check status
         if (this._isTryingLogin)
             return false;
         this._isTryingLogin = true;
+        this.toLoginPage(params);
         return true;
     }
     /**

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

@@ -40,6 +40,23 @@ export type FormatResultCustom = {
  * Format result custom callback type
  */
 export type FormatResultCustomCallback = ((data: FormatResultCustom) => string | null | undefined) | boolean;
+/**
+ * Login parameters
+ */
+export type AppLoginParams = DataTypes.SimpleObject & {
+    /**
+     * Try login with cached refresh token
+     */
+    tryLogin?: boolean;
+    /**
+     * Don't cache current URL instead of the default page
+     */
+    removeUrl?: boolean;
+    /**
+     * Show loading bar or not
+     */
+    showLoading?: boolean;
+};
 /**
  * Refresh token props
  */
@@ -123,6 +140,10 @@ export interface IApp {
      * Is the app ready
      */
     readonly isReady: boolean;
+    /**
+     * Is trying to login
+     */
+    readonly isTryingLogin: boolean;
     /**
      * Application name
      */
@@ -538,16 +559,15 @@ export interface IApp {
     persist(): void;
     /**
      * Go to the login page
-     * @param tryLogin Try to login again
-     * @param removeUrl Remove current URL for reuse
+     * @param params Login parameters
      */
-    toLoginPage(tryLogin?: boolean, removeUrl?: boolean): void;
+    toLoginPage(params?: AppLoginParams): void;
     /**
      * Try login, returning false means is loading
      * UI get involved while refreshToken not intended
-     * @param showLoading Show loading bar or not
+     * @param params Login parameters
      */
-    tryLogin(showLoading?: boolean): Promise<boolean>;
+    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 { FormatResultCustomCallback, IApp, IAppFields, IDetectIPCallback, NavigateOptions, RefreshTokenProps, RefreshTokenResult } from './IApp';
+import { AppLoginParams, FormatResultCustomCallback, IApp, IAppFields, IDetectIPCallback, NavigateOptions, RefreshTokenProps, RefreshTokenResult } from './IApp';
 import { UserRole } from './UserRole';
 import { ExternalEndpoint } from './ExternalSettings';
 import { ApiRefreshTokenDto } from '../erp/dto/ApiRefreshTokenDto';
@@ -135,6 +135,11 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      */
     get embedded(): boolean;
     private _isTryingLogin;
+    /**
+     * Is trying login
+     */
+    get isTryingLogin(): boolean;
+    protected set isTryingLogin(value: boolean);
     /**
      * Last called with token refresh
      */
@@ -630,16 +635,15 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
     signout(): Promise<void>;
     /**
      * Go to the login page
-     * @param tryLogin Try to login again
-     * @param removeUrl Remove current URL for reuse
+     * params Login parameters
      */
-    toLoginPage(tryLogin?: boolean, removeUrl?: boolean): void;
+    toLoginPage(params?: AppLoginParams): void;
     /**
      * Try login, returning false means is loading
      * UI get involved while refreshToken not intended
-     * @param showLoading Show loading bar or not during call
+     * @param params Login parameters
      */
-    tryLogin(_showLoading?: boolean): Promise<boolean>;
+    tryLogin(params?: AppLoginParams): Promise<boolean>;
     /**
      * Update embedded status
      * @param embedded New embedded status

package/lib/mjs/app/CoreApp.js

@@ -99,6 +99,15 @@ export class CoreApp {
     get embedded() {
         return this._embedded;
     }
+    /**
+     * Is trying login
+     */
+    get isTryingLogin() {
+        return this._isTryingLogin;
+    }
+    set isTryingLogin(value) {
+        this._isTryingLogin = value;
+    }
     /**
      * Get persisted fields
      */
@@ -1576,28 +1585,32 @@ export class CoreApp {
         // Clear, noTrigger = true, avoid state update
         this.userLogout(true, true);
         // Go to login page
-        this.toLoginPage(false, true);
+        this.toLoginPage({ tryLogin: false, removeUrl: true });
     }
     /**
      * Go to the login page
-     * @param tryLogin Try to login again
-     * @param removeUrl Remove current URL for reuse
+     * params Login parameters
      */
-    toLoginPage(tryLogin, removeUrl) {
+    toLoginPage(params) {
+        // Destruct
+        const { removeUrl, showLoading, ...rest } = params ?? {};
         // Save the current URL
         this.cachedUrl = removeUrl ? undefined : globalThis.location.href;
-        const url = `/?tryLogin=${tryLogin ?? false}`;
+        // URL with parameters
+        const url = '/'.addUrlParams(rest);
         this.navigate(url);
     }
     /**
      * Try login, returning false means is loading
      * UI get involved while refreshToken not intended
-     * @param showLoading Show loading bar or not during call
+     * @param params Login parameters
      */
-    async tryLogin(_showLoading) {
+    async tryLogin(params) {
+        // Check status
         if (this._isTryingLogin)
             return false;
         this._isTryingLogin = true;
+        this.toLoginPage(params);
         return true;
     }
     /**

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

@@ -40,6 +40,23 @@ export type FormatResultCustom = {
  * Format result custom callback type
  */
 export type FormatResultCustomCallback = ((data: FormatResultCustom) => string | null | undefined) | boolean;
+/**
+ * Login parameters
+ */
+export type AppLoginParams = DataTypes.SimpleObject & {
+    /**
+     * Try login with cached refresh token
+     */
+    tryLogin?: boolean;
+    /**
+     * Don't cache current URL instead of the default page
+     */
+    removeUrl?: boolean;
+    /**
+     * Show loading bar or not
+     */
+    showLoading?: boolean;
+};
 /**
  * Refresh token props
  */
@@ -123,6 +140,10 @@ export interface IApp {
      * Is the app ready
      */
     readonly isReady: boolean;
+    /**
+     * Is trying to login
+     */
+    readonly isTryingLogin: boolean;
     /**
      * Application name
      */
@@ -538,16 +559,15 @@ export interface IApp {
     persist(): void;
     /**
      * Go to the login page
-     * @param tryLogin Try to login again
-     * @param removeUrl Remove current URL for reuse
+     * @param params Login parameters
      */
-    toLoginPage(tryLogin?: boolean, removeUrl?: boolean): void;
+    toLoginPage(params?: AppLoginParams): void;
     /**
      * Try login, returning false means is loading
      * UI get involved while refreshToken not intended
-     * @param showLoading Show loading bar or not
+     * @param params Login parameters
      */
-    tryLogin(showLoading?: boolean): Promise<boolean>;
+    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.41",
+    "version": "1.5.42",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",

package/src/app/CoreApp.ts

@@ -33,6 +33,7 @@ import { IUser } from '../state/User';
 import { IAppSettings } from './AppSettings';
 import {
     appFields,
+    AppLoginParams,
     FormatResultCustomCallback,
     IApp,
     IAppFields,
@@ -257,6 +258,15 @@ export abstract class CoreApp<
     }
 
     private _isTryingLogin = false;
+    /**
+     * Is trying login
+     */
+    get isTryingLogin() {
+        return this._isTryingLogin;
+    }
+    protected set isTryingLogin(value: boolean) {
+        this._isTryingLogin = value;
+    }
 
     /**
      * Last called with token refresh
@@ -2166,19 +2176,22 @@ export abstract class CoreApp<
         this.userLogout(true, true);
 
         // Go to login page
-        this.toLoginPage(false, true);
+        this.toLoginPage({ tryLogin: false, removeUrl: true });
     }
 
     /**
      * Go to the login page
-     * @param tryLogin Try to login again
-     * @param removeUrl Remove current URL for reuse
+     * params Login parameters
      */
-    toLoginPage(tryLogin?: boolean, removeUrl?: boolean) {
+    toLoginPage(params?: AppLoginParams) {
+        // Destruct
+        const { removeUrl, showLoading, ...rest } = params ?? {};
+
         // Save the current URL
         this.cachedUrl = removeUrl ? undefined : globalThis.location.href;
 
-        const url = `/?tryLogin=${tryLogin ?? false}`;
+        // URL with parameters
+        const url = '/'.addUrlParams(rest);
 
         this.navigate(url);
     }
@@ -2186,11 +2199,15 @@ export abstract class CoreApp<
     /**
      * Try login, returning false means is loading
      * UI get involved while refreshToken not intended
-     * @param showLoading Show loading bar or not during call
+     * @param params Login parameters
      */
-    async tryLogin(_showLoading?: boolean) {
+    async tryLogin(params?: AppLoginParams) {
+        // Check status
         if (this._isTryingLogin) return false;
         this._isTryingLogin = true;
+
+        this.toLoginPage(params);
+
         return true;
     }
 

package/src/app/IApp.ts

@@ -63,6 +63,26 @@ export type FormatResultCustomCallback =
     | ((data: FormatResultCustom) => string | null | undefined)
     | boolean;
 
+/**
+ * Login parameters
+ */
+export type AppLoginParams = DataTypes.SimpleObject & {
+    /**
+     * Try login with cached refresh token
+     */
+    tryLogin?: boolean;
+
+    /**
+     * Don't cache current URL instead of the default page
+     */
+    removeUrl?: boolean;
+
+    /**
+     * Show loading bar or not
+     */
+    showLoading?: boolean;
+};
+
 /**
  * Refresh token props
  */
@@ -170,6 +190,11 @@ export interface IApp {
      */
     readonly isReady: boolean;
 
+    /**
+     * Is trying to login
+     */
+    readonly isTryingLogin: boolean;
+
     /**
      * Application name
      */
@@ -734,17 +759,16 @@ export interface IApp {
 
     /**
      * Go to the login page
-     * @param tryLogin Try to login again
-     * @param removeUrl Remove current URL for reuse
+     * @param params Login parameters
      */
-    toLoginPage(tryLogin?: boolean, removeUrl?: boolean): void;
+    toLoginPage(params?: AppLoginParams): void;
 
     /**
      * Try login, returning false means is loading
      * UI get involved while refreshToken not intended
-     * @param showLoading Show loading bar or not
+     * @param params Login parameters
      */
-    tryLogin(showLoading?: boolean): Promise<boolean>;
+    tryLogin(params?: AppLoginParams): Promise<boolean>;
 
     /**
      * Update API token and expires