@etsoo/appscript 1.5.46 → 1.5.48

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';
@@ -576,7 +576,7 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @param props Props
      * @param callback Callback
      */
-    refreshToken(props: RefreshTokenProps, callback?: (result?: boolean | IActionResult) => boolean | void): Promise<void>;
+    refreshToken(props?: RefreshTokenProps, callback?: (result?: boolean | IActionResult) => boolean | void): Promise<void>;
     /**
      * Setup callback
      */
@@ -618,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;
     /**
@@ -626,7 +626,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

@@ -1357,6 +1357,9 @@ class CoreApp {
      * @param callback 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;
@@ -1592,7 +1595,7 @@ class CoreApp {
     }
     /**
      * Go to the login page
-     * params Login parameters
+     * @params Login parameters
      */
     toLoginPage(params) {
         // Destruct
@@ -1611,9 +1614,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
  */
@@ -64,9 +77,9 @@ export interface RefreshTokenProps {
     /**
      * Refresh token
      */
-    token: string;
+    token?: string;
     /**
-     * API name
+     * API URL
      */
     api?: string;
     /**
@@ -524,7 +537,7 @@ export interface IApp {
      * @param callback Callback
      * @param api API
      */
-    refreshToken(props: RefreshTokenProps, callback?: (result?: boolean | IActionResult) => boolean | void): Promise<void>;
+    refreshToken(props?: RefreshTokenProps, callback?: (result?: boolean | IActionResult) => boolean | void): Promise<void>;
     /**
      * Setup Api error handler
      * @param api Api
@@ -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/cjs/erp/AuthApi.js

@@ -73,6 +73,15 @@ class AuthApi extends BaseApi_1.BaseApi {
     async refreshToken(props) {
         // 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 = {
             deviceId: this.app.deviceId

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';
@@ -576,7 +576,7 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @param props Props
      * @param callback Callback
      */
-    refreshToken(props: RefreshTokenProps, callback?: (result?: boolean | IActionResult) => boolean | void): Promise<void>;
+    refreshToken(props?: RefreshTokenProps, callback?: (result?: boolean | IActionResult) => boolean | void): Promise<void>;
     /**
      * Setup callback
      */
@@ -618,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;
     /**
@@ -626,7 +626,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

@@ -1354,6 +1354,9 @@ export class CoreApp {
      * @param callback 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;
@@ -1589,7 +1592,7 @@ export class CoreApp {
     }
     /**
      * Go to the login page
-     * params Login parameters
+     * @params Login parameters
      */
     toLoginPage(params) {
         // Destruct
@@ -1608,9 +1611,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
  */
@@ -64,9 +77,9 @@ export interface RefreshTokenProps {
     /**
      * Refresh token
      */
-    token: string;
+    token?: string;
     /**
-     * API name
+     * API URL
      */
     api?: string;
     /**
@@ -524,7 +537,7 @@ export interface IApp {
      * @param callback Callback
      * @param api API
      */
-    refreshToken(props: RefreshTokenProps, callback?: (result?: boolean | IActionResult) => boolean | void): Promise<void>;
+    refreshToken(props?: RefreshTokenProps, callback?: (result?: boolean | IActionResult) => boolean | void): Promise<void>;
     /**
      * Setup Api error handler
      * @param api Api
@@ -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/erp/AuthApi.js

@@ -70,6 +70,15 @@ export class AuthApi extends BaseApi {
     async refreshToken(props) {
         // 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 = {
             deviceId: this.app.deviceId

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.5.46",
+    "version": "1.5.48",
     "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,
@@ -1888,9 +1889,13 @@ export abstract class CoreApp<
      * @param callback Callback
      */
     async refreshToken(
-        props: RefreshTokenProps,
+        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
@@ -2175,7 +2180,7 @@ export abstract class CoreApp<
 
     /**
      * Go to the login page
-     * params Login parameters
+     * @params Login parameters
      */
     toLoginPage(params?: AppLoginParams) {
         // Destruct
@@ -2195,12 +2200,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
  */
@@ -90,10 +105,10 @@ export interface RefreshTokenProps {
     /**
      * Refresh token
      */
-    token: string;
+    token?: string;
 
     /**
-     * API name
+     * API URL
      */
     api?: string;
 
@@ -706,7 +721,7 @@ export interface IApp {
      * @param api API
      */
     refreshToken(
-        props: RefreshTokenProps,
+        props?: RefreshTokenProps,
         callback?: (result?: boolean | IActionResult) => boolean | void
     ): Promise<void>;
 
@@ -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

package/src/erp/AuthApi.ts

@@ -106,6 +106,16 @@ export class AuthApi extends BaseApi {
             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