@etsoo/appscript 1.5.43 → 1.5.45

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, RefreshTokenResult } from './IApp';
+import { AppLoginParams, FormatResultCustomCallback, IApp, IAppFields, IDetectIPCallback, NavigateOptions, RefreshTokenProps } from './IApp';
 import { UserRole } from './UserRole';
 import { ExternalEndpoint } from './ExternalSettings';
 import { ApiRefreshTokenDto } from '../erp/dto/ApiRefreshTokenDto';
@@ -426,12 +426,6 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @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
-     */
-    protected formatRefreshTokenResult(result: RefreshTokenResult<IActionResult<U>>): string | undefined;
     private getFieldLabel;
     /**
      * Format result text
@@ -581,8 +575,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<void>;
+    refreshToken(props?: RefreshTokenProps, callback?: (result?: boolean | IActionResult) => boolean | void): Promise<void>;
     /**
      * Setup callback
      */

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
@@ -1020,28 +1024,6 @@ class CoreApp {
         }
         return wf;
     }
-    /**
-     * Format refresh token result
-     * @param result Refresh token result
-     * @returns Message
-     */
-    formatRefreshTokenResult(result) {
-        // Error message
-        if (typeof result === 'string')
-            return result;
-        // API error
-        if (result instanceof restclient_1.ApiDataError)
-            return this.formatError(result);
-        // Action result
-        const [token, r] = result;
-        // Success
-        if (r.ok)
-            return undefined;
-        // No token data
-        if (token == null)
-            return `${this.get('noData')} (token)`;
-        return ActionResultError_1.ActionResultError.format(r);
-    }
     getFieldLabel(field) {
         return this.get(field.formatInitial(false)) ?? field;
     }
@@ -1376,8 +1358,9 @@ class CoreApp {
     /**
      * Refresh token
      * @param props Props
+     * @param callback Callback
      */
-    async refreshToken(props) { }
+    async refreshToken(props, callback) { }
     /**
      * Setup callback
      */

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

@@ -27,7 +27,7 @@ export interface NavigateOptions {
  * array means success, false means failed but no any message
  * other cases means failed with differnet message
  */
-export type RefreshTokenResult<R> = string | ApiDataError | [string | null, R];
+export type RefreshTokenResult<R> = IActionResult | [string, R];
 /**
  * Format result custom type
  */
@@ -65,11 +65,6 @@ export interface RefreshTokenProps {
      * API name
      */
     api?: string;
-    /**
-     * Callback
-     * @param result Result
-     */
-    callback?: (result: boolean) => void;
     /**
      * Show loading bar or not
      */
@@ -522,8 +517,9 @@ export interface IApp {
     /**
      * Refresh token
      * @param props Props
+     * @param callback Callback
      */
-    refreshToken(props?: RefreshTokenProps): Promise<void>;
+    refreshToken(props?: RefreshTokenProps, callback?: (result?: boolean | IActionResult) => boolean | void): Promise<void>;
     /**
      * Setup Api error handler
      * @param api Api

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AuthApi = void 0;
 const BaseApi_1 = require("./BaseApi");
+const shared_1 = require("@etsoo/shared");
 /**
  * Authentication API
  */
@@ -72,7 +73,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
@@ -90,10 +91,26 @@ class AuthApi extends BaseApi_1.BaseApi {
         // Call API
         const result = await this.api.put(api, rq, payload);
         if (result == null) {
-            return this.api.lastError ?? this.app.get('unknownError');
+            return this.api.lastError
+                ? shared_1.ActionResult.create(this.api.lastError)
+                : {
+                    ok: false,
+                    type: 'unknownError',
+                    field: 'result',
+                    title: this.app.get('unknownError')
+                };
         }
         // Token
         const refreshToken = this.app.getResponseToken(payload.response, tokenField);
+        if (!refreshToken) {
+            // No refresh token
+            return {
+                ok: false,
+                type: 'noData',
+                field: 'token',
+                title: this.app.get('noData')
+            };
+        }
         // Success
         return [refreshToken, result];
     }
@@ -117,3 +134,7 @@ class AuthApi extends BaseApi_1.BaseApi {
     }
 }
 exports.AuthApi = AuthApi;
+/**
+ * Header token field name
+ */
+AuthApi.HeaderTokenField = 'Etsoo-Refresh-Token';

package/lib/cjs/index.d.ts

@@ -75,7 +75,7 @@ export * from './i18n/CultureUtils';
 export * from './i18n/en';
 export * from './i18n/zhHans';
 export * from './i18n/zhHant';
-export { ApiAuthorizationScheme, ApiMethod, ApiResponseType, createClient, createClientAsync } from '@etsoo/restclient';
+export { ApiAuthorizationScheme, ApiDataError, ApiMethod, ApiResponseType, createClient, createClientAsync } from '@etsoo/restclient';
 export type { IApi, IApiPayload } from '@etsoo/restclient';
 export * from './result/ActionResult';
 export * from './result/ActionResultError';

package/lib/cjs/index.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createClientAsync = exports.createClient = exports.ApiResponseType = exports.ApiMethod = exports.ApiAuthorizationScheme = void 0;
+exports.createClientAsync = exports.createClient = exports.ApiResponseType = exports.ApiMethod = exports.ApiDataError = exports.ApiAuthorizationScheme = void 0;
 // address
 __exportStar(require("./address/AddressAutocomplete"), exports);
 __exportStar(require("./address/AddressCity"), exports);
@@ -105,6 +105,7 @@ __exportStar(require("./i18n/zhHant"), exports);
 // @etsoo/restclient
 var restclient_1 = require("@etsoo/restclient");
 Object.defineProperty(exports, "ApiAuthorizationScheme", { enumerable: true, get: function () { return restclient_1.ApiAuthorizationScheme; } });
+Object.defineProperty(exports, "ApiDataError", { enumerable: true, get: function () { return restclient_1.ApiDataError; } });
 Object.defineProperty(exports, "ApiMethod", { enumerable: true, get: function () { return restclient_1.ApiMethod; } });
 Object.defineProperty(exports, "ApiResponseType", { enumerable: true, get: function () { return restclient_1.ApiResponseType; } });
 Object.defineProperty(exports, "createClient", { enumerable: true, get: function () { return restclient_1.createClient; } });

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, RefreshTokenResult } from './IApp';
+import { AppLoginParams, FormatResultCustomCallback, IApp, IAppFields, IDetectIPCallback, NavigateOptions, RefreshTokenProps } from './IApp';
 import { UserRole } from './UserRole';
 import { ExternalEndpoint } from './ExternalSettings';
 import { ApiRefreshTokenDto } from '../erp/dto/ApiRefreshTokenDto';
@@ -426,12 +426,6 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @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
-     */
-    protected formatRefreshTokenResult(result: RefreshTokenResult<IActionResult<U>>): string | undefined;
     private getFieldLabel;
     /**
      * Format result text
@@ -581,8 +575,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<void>;
+    refreshToken(props?: RefreshTokenProps, callback?: (result?: boolean | IActionResult) => boolean | void): Promise<void>;
     /**
      * Setup callback
      */

package/lib/mjs/app/CoreApp.js

@@ -1,5 +1,5 @@
 import { NotificationAlign, NotificationMessageType } from '@etsoo/notificationbase';
-import { ApiDataError, createClient } from '@etsoo/restclient';
+import { createClient } from '@etsoo/restclient';
 import { DataTypes, DateUtils, DomUtils, ExtendUtils, NumberUtils, Utils } from '@etsoo/shared';
 import { AddressRegion } from '../address/AddressRegion';
 import { BridgeUtils } from '../bridges/BridgeUtils';
@@ -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
@@ -1017,28 +1021,6 @@ export class CoreApp {
         }
         return wf;
     }
-    /**
-     * Format refresh token result
-     * @param result Refresh token result
-     * @returns Message
-     */
-    formatRefreshTokenResult(result) {
-        // Error message
-        if (typeof result === 'string')
-            return result;
-        // API error
-        if (result instanceof ApiDataError)
-            return this.formatError(result);
-        // Action result
-        const [token, r] = result;
-        // Success
-        if (r.ok)
-            return undefined;
-        // No token data
-        if (token == null)
-            return `${this.get('noData')} (token)`;
-        return ActionResultError.format(r);
-    }
     getFieldLabel(field) {
         return this.get(field.formatInitial(false)) ?? field;
     }
@@ -1373,8 +1355,9 @@ export class CoreApp {
     /**
      * Refresh token
      * @param props Props
+     * @param callback Callback
      */
-    async refreshToken(props) { }
+    async refreshToken(props, callback) { }
     /**
      * Setup callback
      */

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

@@ -27,7 +27,7 @@ export interface NavigateOptions {
  * array means success, false means failed but no any message
  * other cases means failed with differnet message
  */
-export type RefreshTokenResult<R> = string | ApiDataError | [string | null, R];
+export type RefreshTokenResult<R> = IActionResult | [string, R];
 /**
  * Format result custom type
  */
@@ -65,11 +65,6 @@ export interface RefreshTokenProps {
      * API name
      */
     api?: string;
-    /**
-     * Callback
-     * @param result Result
-     */
-    callback?: (result: boolean) => void;
     /**
      * Show loading bar or not
      */
@@ -522,8 +517,9 @@ export interface IApp {
     /**
      * Refresh token
      * @param props Props
+     * @param callback Callback
      */
-    refreshToken(props?: RefreshTokenProps): Promise<void>;
+    refreshToken(props?: RefreshTokenProps, callback?: (result?: boolean | IActionResult) => boolean | void): Promise<void>;
     /**
      * Setup Api error handler
      * @param api Api

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

@@ -1,4 +1,5 @@
 import { BaseApi } from './BaseApi';
+import { ActionResult } from '@etsoo/shared';
 /**
  * Authentication API
  */
@@ -69,7 +70,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
@@ -87,10 +88,26 @@ export class AuthApi extends BaseApi {
         // Call API
         const result = await this.api.put(api, rq, payload);
         if (result == null) {
-            return this.api.lastError ?? this.app.get('unknownError');
+            return this.api.lastError
+                ? ActionResult.create(this.api.lastError)
+                : {
+                    ok: false,
+                    type: 'unknownError',
+                    field: 'result',
+                    title: this.app.get('unknownError')
+                };
         }
         // Token
         const refreshToken = this.app.getResponseToken(payload.response, tokenField);
+        if (!refreshToken) {
+            // No refresh token
+            return {
+                ok: false,
+                type: 'noData',
+                field: 'token',
+                title: this.app.get('noData')
+            };
+        }
         // Success
         return [refreshToken, result];
     }
@@ -113,3 +130,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/index.d.ts

@@ -75,7 +75,7 @@ export * from './i18n/CultureUtils';
 export * from './i18n/en';
 export * from './i18n/zhHans';
 export * from './i18n/zhHant';
-export { ApiAuthorizationScheme, ApiMethod, ApiResponseType, createClient, createClientAsync } from '@etsoo/restclient';
+export { ApiAuthorizationScheme, ApiDataError, ApiMethod, ApiResponseType, createClient, createClientAsync } from '@etsoo/restclient';
 export type { IApi, IApiPayload } from '@etsoo/restclient';
 export * from './result/ActionResult';
 export * from './result/ActionResultError';

package/lib/mjs/index.js

@@ -86,7 +86,7 @@ export * from './i18n/en';
 export * from './i18n/zhHans';
 export * from './i18n/zhHant';
 // @etsoo/restclient
-export { ApiAuthorizationScheme, ApiMethod, ApiResponseType, createClient, createClientAsync } from '@etsoo/restclient';
+export { ApiAuthorizationScheme, ApiDataError, ApiMethod, ApiResponseType, createClient, createClientAsync } from '@etsoo/restclient';
 // result
 export * from './result/ActionResult';
 export * from './result/ActionResultError';

package/package.json

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

package/src/app/CoreApp.ts

@@ -39,8 +39,7 @@ import {
     IAppFields,
     IDetectIPCallback,
     NavigateOptions,
-    RefreshTokenProps,
-    RefreshTokenResult
+    RefreshTokenProps
 } from './IApp';
 import { UserRole } from './UserRole';
 import type CryptoJS from 'crypto-js';
@@ -332,7 +331,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();
@@ -1494,32 +1497,6 @@ export abstract class CoreApp<
         return wf;
     }
 
-    /**
-     * Format refresh token result
-     * @param result Refresh token result
-     * @returns Message
-     */
-    protected formatRefreshTokenResult(
-        result: RefreshTokenResult<IActionResult<U>>
-    ): string | undefined {
-        // Error message
-        if (typeof result === 'string') return result;
-
-        // API error
-        if (result instanceof ApiDataError) return this.formatError(result);
-
-        // Action result
-        const [token, r] = result;
-
-        // Success
-        if (r.ok) return undefined;
-
-        // No token data
-        if (token == null) return `${this.get('noData')} (token)`;
-
-        return ActionResultError.format(r);
-    }
-
     private getFieldLabel(field: string) {
         return this.get(field.formatInitial(false)) ?? field;
     }
@@ -1908,8 +1885,12 @@ export abstract class CoreApp<
     /**
      * Refresh token
      * @param props Props
+     * @param callback Callback
      */
-    async refreshToken(props?: RefreshTokenProps) {}
+    async refreshToken(
+        props?: RefreshTokenProps,
+        callback?: (result?: boolean | IActionResult) => boolean | void
+    ) {}
 
     /**
      * Setup callback

package/src/app/IApp.ts

@@ -45,7 +45,7 @@ export interface NavigateOptions {
  * array means success, false means failed but no any message
  * other cases means failed with differnet message
  */
-export type RefreshTokenResult<R> = string | ApiDataError | [string | null, R];
+export type RefreshTokenResult<R> = IActionResult | [string, R];
 
 /**
  * Format result custom type
@@ -92,12 +92,6 @@ export interface RefreshTokenProps {
      */
     api?: string;
 
-    /**
-     * Callback
-     * @param result Result
-     */
-    callback?: (result: boolean) => void;
-
     /**
      * Show loading bar or not
      */
@@ -703,8 +697,12 @@ export interface IApp {
     /**
      * Refresh token
      * @param props Props
+     * @param callback Callback
      */
-    refreshToken(props?: RefreshTokenProps): Promise<void>;
+    refreshToken(
+        props?: RefreshTokenProps,
+        callback?: (result?: boolean | IActionResult) => boolean | void
+    ): Promise<void>;
 
     /**
      * Setup Api error handler

package/src/erp/AuthApi.ts

@@ -5,7 +5,7 @@ import { ResultPayload } from './dto/ResultPayload';
 import { LoginIdRQ } from './rq/LoginIdRQ';
 import { LoginRQ } from './rq/LoginRQ';
 import { ResetPasswordRQ } from './rq/ResetPasswordRQ';
-import { IActionResult } from '@etsoo/shared';
+import { ActionResult, IActionResult } from '@etsoo/shared';
 import { SignoutRQ } from './rq/SignoutRQ';
 import { GetLogInUrlRQ } from './rq/GetLogInUrlRQ';
 import { TokenRQ } from './rq/TokenRQ';
@@ -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
@@ -120,7 +125,14 @@ export class AuthApi extends BaseApi {
         // Call API
         const result = await this.api.put(api, rq, payload);
         if (result == null) {
-            return this.api.lastError ?? this.app.get('unknownError')!;
+            return this.api.lastError
+                ? ActionResult.create(this.api.lastError)
+                : {
+                      ok: false,
+                      type: 'unknownError',
+                      field: 'result',
+                      title: this.app.get('unknownError')
+                  };
         }
 
         // Token
@@ -129,6 +141,16 @@ export class AuthApi extends BaseApi {
             tokenField
         );
 
+        if (!refreshToken) {
+            // No refresh token
+            return {
+                ok: false,
+                type: 'noData',
+                field: 'token',
+                title: this.app.get('noData')
+            };
+        }
+
         // Success
         return [refreshToken, result];
     }

package/src/index.ts

@@ -98,6 +98,7 @@ export * from './i18n/zhHant';
 // @etsoo/restclient
 export {
     ApiAuthorizationScheme,
+    ApiDataError,
     ApiMethod,
     ApiResponseType,
     createClient,