@etsoo/appscript 1.5.39 → 1.5.41

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

@@ -425,7 +425,7 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @param initCallCallback InitCall callback
      * @param silent Silent without any popups
      */
-    doRefreshTokenResult(result: RefreshTokenResult, initCallCallback?: (result: boolean) => void, silent?: boolean): void;
+    doRefreshTokenResult(result: RefreshTokenResult<IActionResult<U>>, initCallCallback?: (result: boolean) => void, silent?: boolean): void;
     /**
      * Format as full name
      * @param familyName Family name
@@ -437,7 +437,7 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @param result Refresh token result
      * @returns Message
      */
-    formatRefreshTokenResult(result: RefreshTokenResult): string | undefined;
+    formatRefreshTokenResult(result: RefreshTokenResult<IActionResult<U>>): string | undefined;
     private getFieldLabel;
     /**
      * Format result text

package/lib/cjs/app/CoreApp.js

@@ -129,7 +129,6 @@ class CoreApp {
         this.pendings = [];
         this._authorized = false;
         this._isReady = false;
-        this._embedded = false;
         this._isTryingLogin = false;
         /**
          * Last called with token refresh
@@ -186,6 +185,9 @@ class CoreApp {
         this.fields = IApp_1.appFields.reduce((a, v) => ({ ...a, [v]: 'smarterp-' + v + '-' + name }), {});
         // Device id
         this._deviceId = storage.getData(this.fields.deviceId, '');
+        // Embedded
+        this._embedded =
+            this.storage.getData(this.fields.embedded) ?? false;
         const { currentCulture, currentRegion } = settings;
         // Load resources
         Promise.all([loadCrypto(), this.changeCulture(currentCulture)]).then(([cj, _resources]) => {
@@ -1007,11 +1009,9 @@ class CoreApp {
      * @param silent Silent without any popups
      */
     doRefreshTokenResult(result, initCallCallback, silent = false) {
-        if (result === true)
-            return;
-        if (typeof result === 'object' &&
+        if (Array.isArray(result) &&
             !(result instanceof restclient_1.ApiDataError) &&
-            this.checkDeviceResult(result)) {
+            this.checkDeviceResult(result[1])) {
             initCallCallback ?? (initCallCallback = (result) => {
                 if (!result)
                     return;
@@ -1055,14 +1055,21 @@ class CoreApp {
      * @returns Message
      */
     formatRefreshTokenResult(result) {
-        // Undefined for boolean
-        if (typeof result === 'boolean')
+        // 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;
-        return result instanceof restclient_1.ApiDataError
-            ? this.formatError(result)
-            : typeof result !== 'string'
-                ? ActionResultError_1.ActionResultError.format(result)
-                : result;
+        // 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;
@@ -1278,6 +1285,8 @@ class CoreApp {
      */
     getResponseToken(rawResponse, tokenKey) {
         const response = this.api.transformResponse(rawResponse);
+        if (!response.ok)
+            return null;
         return this.api.getHeaderValue(response.headers, tokenKey ?? 'Smarterp-Refresh-Token');
     }
     /**
@@ -1398,8 +1407,6 @@ class CoreApp {
      * @param props Props
      */
     async refreshToken(props) {
-        if (props && props.callback)
-            props.callback(true, undefined);
         return true;
     }
     /**

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

@@ -24,10 +24,10 @@ export interface NavigateOptions {
 }
 /**
  * Refresh token result type
- * true means success, false means failed but no any message
+ * array means success, false means failed but no any message
  * other cases means failed with differnet message
  */
-export type RefreshTokenResult = boolean | string | ApiDataError | IActionResult;
+export type RefreshTokenResult<R> = string | ApiDataError | [string | null, R];
 /**
  * Format result custom type
  */
@@ -45,13 +45,17 @@ export type FormatResultCustomCallback = ((data: FormatResultCustom) => string |
  */
 export interface RefreshTokenProps {
     /**
-     * Callback
+     * API name
      */
-    callback?: (result: RefreshTokenResult, successData?: string) => void;
+    api?: string;
     /**
      * Show loading bar or not
      */
     showLoading?: boolean;
+    /**
+     * Header token field name
+     */
+    tokenField?: string;
 }
 /**
  * App fields
@@ -331,7 +335,7 @@ export interface IApp {
      * @param initCallCallback InitCall callback
      * @param silent Silent without any popups
      */
-    doRefreshTokenResult(result: RefreshTokenResult, initCallCallback?: (result: boolean) => void, silent?: boolean): void;
+    doRefreshTokenResult(result: RefreshTokenResult<IActionResult<IUser>>, initCallCallback?: (result: boolean) => void, silent?: boolean): void;
     /**
      * Format as full name
      * @param familyName Family name
@@ -343,7 +347,7 @@ export interface IApp {
      * @param result Refresh token result
      * @returns Message
      */
-    formatRefreshTokenResult(result: RefreshTokenResult): string | undefined;
+    formatRefreshTokenResult(result: RefreshTokenResult<IActionResult<IUser>>): string | undefined;
     /**
      * Format result text
      * @param result Action result

package/lib/cjs/erp/AuthApi.d.ts

@@ -9,6 +9,7 @@ import { SignoutRQ } from './rq/SignoutRQ';
 import { GetLogInUrlRQ } from './rq/GetLogInUrlRQ';
 import { TokenRQ } from './rq/TokenRQ';
 import { ApiRefreshTokenDto } from './dto/ApiRefreshTokenDto';
+import { RefreshTokenProps, RefreshTokenResult } from '../app/IApp';
 /**
  * Authentication API
  */
@@ -49,6 +50,13 @@ export declare class AuthApi extends BaseApi {
      * @returns Result
      */
     loginId(id: string, payload?: ResultPayload): Promise<IActionResult<{}> | undefined>;
+    /**
+     * Refresh token
+     * @param token Refresh token
+     * @param props Props
+     * @returns Result
+     */
+    refreshToken<R>(token: string, props?: RefreshTokenProps): Promise<RefreshTokenResult<R>>;
     /**
      * Reset password
      * @param rq Request data

package/lib/cjs/erp/AuthApi.js

@@ -64,6 +64,39 @@ class AuthApi extends BaseApi_1.BaseApi {
         };
         return this.api.post('Auth/LoginId', rq, payload);
     }
+    /**
+     * Refresh token
+     * @param token Refresh token
+     * @param props Props
+     * @returns Result
+     */
+    async refreshToken(token, props) {
+        // Destruct
+        const { api = 'Auth/RefreshToken', showLoading = false, tokenField = 'Etsoo-Refresh-Token' } = props ?? {};
+        // Reqest data
+        const rq = {
+            deviceId: this.app.deviceId
+        };
+        // Payload
+        const payload = {
+            // No loading bar needed to avoid screen flicks
+            showLoading,
+            config: { headers: { [tokenField]: token } },
+            onError: () => {
+                // Prevent further processing
+                return false;
+            }
+        };
+        // Call API
+        const result = await this.api.put(api, rq, payload);
+        if (result == null) {
+            return this.api.lastError ?? this.app.get('unknownError');
+        }
+        // Token
+        const refreshToken = this.app.getResponseToken(payload.response, tokenField);
+        // Success
+        return [refreshToken, result];
+    }
     /**
      * Reset password
      * @param rq Request data

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

@@ -425,7 +425,7 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @param initCallCallback InitCall callback
      * @param silent Silent without any popups
      */
-    doRefreshTokenResult(result: RefreshTokenResult, initCallCallback?: (result: boolean) => void, silent?: boolean): void;
+    doRefreshTokenResult(result: RefreshTokenResult<IActionResult<U>>, initCallCallback?: (result: boolean) => void, silent?: boolean): void;
     /**
      * Format as full name
      * @param familyName Family name
@@ -437,7 +437,7 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @param result Refresh token result
      * @returns Message
      */
-    formatRefreshTokenResult(result: RefreshTokenResult): string | undefined;
+    formatRefreshTokenResult(result: RefreshTokenResult<IActionResult<U>>): string | undefined;
     private getFieldLabel;
     /**
      * Format result text

package/lib/mjs/app/CoreApp.js

@@ -126,7 +126,6 @@ export class CoreApp {
         this.pendings = [];
         this._authorized = false;
         this._isReady = false;
-        this._embedded = false;
         this._isTryingLogin = false;
         /**
          * Last called with token refresh
@@ -183,6 +182,9 @@ export class CoreApp {
         this.fields = appFields.reduce((a, v) => ({ ...a, [v]: 'smarterp-' + v + '-' + name }), {});
         // Device id
         this._deviceId = storage.getData(this.fields.deviceId, '');
+        // Embedded
+        this._embedded =
+            this.storage.getData(this.fields.embedded) ?? false;
         const { currentCulture, currentRegion } = settings;
         // Load resources
         Promise.all([loadCrypto(), this.changeCulture(currentCulture)]).then(([cj, _resources]) => {
@@ -1004,11 +1006,9 @@ export class CoreApp {
      * @param silent Silent without any popups
      */
     doRefreshTokenResult(result, initCallCallback, silent = false) {
-        if (result === true)
-            return;
-        if (typeof result === 'object' &&
+        if (Array.isArray(result) &&
             !(result instanceof ApiDataError) &&
-            this.checkDeviceResult(result)) {
+            this.checkDeviceResult(result[1])) {
             initCallCallback ?? (initCallCallback = (result) => {
                 if (!result)
                     return;
@@ -1052,14 +1052,21 @@ export class CoreApp {
      * @returns Message
      */
     formatRefreshTokenResult(result) {
-        // Undefined for boolean
-        if (typeof result === 'boolean')
+        // 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;
-        return result instanceof ApiDataError
-            ? this.formatError(result)
-            : typeof result !== 'string'
-                ? ActionResultError.format(result)
-                : result;
+        // No token data
+        if (token == null)
+            return `${this.get('noData')} (token)`;
+        return ActionResultError.format(r);
     }
     getFieldLabel(field) {
         return this.get(field.formatInitial(false)) ?? field;
@@ -1275,6 +1282,8 @@ export class CoreApp {
      */
     getResponseToken(rawResponse, tokenKey) {
         const response = this.api.transformResponse(rawResponse);
+        if (!response.ok)
+            return null;
         return this.api.getHeaderValue(response.headers, tokenKey ?? 'Smarterp-Refresh-Token');
     }
     /**
@@ -1395,8 +1404,6 @@ export class CoreApp {
      * @param props Props
      */
     async refreshToken(props) {
-        if (props && props.callback)
-            props.callback(true, undefined);
         return true;
     }
     /**

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

@@ -24,10 +24,10 @@ export interface NavigateOptions {
 }
 /**
  * Refresh token result type
- * true means success, false means failed but no any message
+ * array means success, false means failed but no any message
  * other cases means failed with differnet message
  */
-export type RefreshTokenResult = boolean | string | ApiDataError | IActionResult;
+export type RefreshTokenResult<R> = string | ApiDataError | [string | null, R];
 /**
  * Format result custom type
  */
@@ -45,13 +45,17 @@ export type FormatResultCustomCallback = ((data: FormatResultCustom) => string |
  */
 export interface RefreshTokenProps {
     /**
-     * Callback
+     * API name
      */
-    callback?: (result: RefreshTokenResult, successData?: string) => void;
+    api?: string;
     /**
      * Show loading bar or not
      */
     showLoading?: boolean;
+    /**
+     * Header token field name
+     */
+    tokenField?: string;
 }
 /**
  * App fields
@@ -331,7 +335,7 @@ export interface IApp {
      * @param initCallCallback InitCall callback
      * @param silent Silent without any popups
      */
-    doRefreshTokenResult(result: RefreshTokenResult, initCallCallback?: (result: boolean) => void, silent?: boolean): void;
+    doRefreshTokenResult(result: RefreshTokenResult<IActionResult<IUser>>, initCallCallback?: (result: boolean) => void, silent?: boolean): void;
     /**
      * Format as full name
      * @param familyName Family name
@@ -343,7 +347,7 @@ export interface IApp {
      * @param result Refresh token result
      * @returns Message
      */
-    formatRefreshTokenResult(result: RefreshTokenResult): string | undefined;
+    formatRefreshTokenResult(result: RefreshTokenResult<IActionResult<IUser>>): string | undefined;
     /**
      * Format result text
      * @param result Action result

package/lib/mjs/erp/AuthApi.d.ts

@@ -9,6 +9,7 @@ import { SignoutRQ } from './rq/SignoutRQ';
 import { GetLogInUrlRQ } from './rq/GetLogInUrlRQ';
 import { TokenRQ } from './rq/TokenRQ';
 import { ApiRefreshTokenDto } from './dto/ApiRefreshTokenDto';
+import { RefreshTokenProps, RefreshTokenResult } from '../app/IApp';
 /**
  * Authentication API
  */
@@ -49,6 +50,13 @@ export declare class AuthApi extends BaseApi {
      * @returns Result
      */
     loginId(id: string, payload?: ResultPayload): Promise<IActionResult<{}> | undefined>;
+    /**
+     * Refresh token
+     * @param token Refresh token
+     * @param props Props
+     * @returns Result
+     */
+    refreshToken<R>(token: string, props?: RefreshTokenProps): Promise<RefreshTokenResult<R>>;
     /**
      * Reset password
      * @param rq Request data

package/lib/mjs/erp/AuthApi.js

@@ -61,6 +61,39 @@ export class AuthApi extends BaseApi {
         };
         return this.api.post('Auth/LoginId', rq, payload);
     }
+    /**
+     * Refresh token
+     * @param token Refresh token
+     * @param props Props
+     * @returns Result
+     */
+    async refreshToken(token, props) {
+        // Destruct
+        const { api = 'Auth/RefreshToken', showLoading = false, tokenField = 'Etsoo-Refresh-Token' } = props ?? {};
+        // Reqest data
+        const rq = {
+            deviceId: this.app.deviceId
+        };
+        // Payload
+        const payload = {
+            // No loading bar needed to avoid screen flicks
+            showLoading,
+            config: { headers: { [tokenField]: token } },
+            onError: () => {
+                // Prevent further processing
+                return false;
+            }
+        };
+        // Call API
+        const result = await this.api.put(api, rq, payload);
+        if (result == null) {
+            return this.api.lastError ?? this.app.get('unknownError');
+        }
+        // Token
+        const refreshToken = this.app.getResponseToken(payload.response, tokenField);
+        // Success
+        return [refreshToken, result];
+    }
     /**
      * Reset password
      * @param rq Request data

package/package.json

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

package/src/app/CoreApp.ts

@@ -248,7 +248,7 @@ export abstract class CoreApp<
         this.storage.setData(this.fields.cachedUrl, value);
     }
 
-    private _embedded: boolean = false;
+    private _embedded: boolean;
     /**
      * Is embedded
      */
@@ -361,6 +361,10 @@ export abstract class CoreApp<
         // Device id
         this._deviceId = storage.getData(this.fields.deviceId, '');
 
+        // Embedded
+        this._embedded =
+            this.storage.getData<boolean>(this.fields.embedded) ?? false;
+
         const { currentCulture, currentRegion } = settings;
 
         // Load resources
@@ -1477,16 +1481,14 @@ export abstract class CoreApp<
      * @param silent Silent without any popups
      */
     doRefreshTokenResult(
-        result: RefreshTokenResult,
+        result: RefreshTokenResult<IActionResult<U>>,
         initCallCallback?: (result: boolean) => void,
         silent: boolean = false
     ) {
-        if (result === true) return;
-
         if (
-            typeof result === 'object' &&
+            Array.isArray(result) &&
             !(result instanceof ApiDataError) &&
-            this.checkDeviceResult(result)
+            this.checkDeviceResult(result[1])
         ) {
             initCallCallback ??= (result) => {
                 if (!result) return;
@@ -1538,15 +1540,23 @@ export abstract class CoreApp<
      * @param result Refresh token result
      * @returns Message
      */
-    formatRefreshTokenResult(result: RefreshTokenResult) {
-        // Undefined for boolean
-        if (typeof result === 'boolean') return undefined;
+    formatRefreshTokenResult(result: RefreshTokenResult<IActionResult<U>>) {
+        // 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 result instanceof ApiDataError
-            ? this.formatError(result)
-            : typeof result !== 'string'
-            ? ActionResultError.format(result)
-            : result;
+        return ActionResultError.format(r);
     }
 
     private getFieldLabel(field: string) {
@@ -1801,6 +1811,7 @@ export abstract class CoreApp<
      */
     getResponseToken(rawResponse: any, tokenKey?: string): string | null {
         const response = this.api.transformResponse(rawResponse);
+        if (!response.ok) return null;
         return this.api.getHeaderValue(
             response.headers,
             tokenKey ?? 'Smarterp-Refresh-Token'
@@ -1938,7 +1949,6 @@ export abstract class CoreApp<
      * @param props Props
      */
     async refreshToken(props?: RefreshTokenProps) {
-        if (props && props.callback) props.callback(true, undefined);
         return true;
     }
 

package/src/app/IApp.ts

@@ -42,14 +42,10 @@ export interface NavigateOptions {
 
 /**
  * Refresh token result type
- * true means success, false means failed but no any message
+ * array means success, false means failed but no any message
  * other cases means failed with differnet message
  */
-export type RefreshTokenResult =
-    | boolean
-    | string
-    | ApiDataError
-    | IActionResult;
+export type RefreshTokenResult<R> = string | ApiDataError | [string | null, R];
 
 /**
  * Format result custom type
@@ -72,14 +68,19 @@ export type FormatResultCustomCallback =
  */
 export interface RefreshTokenProps {
     /**
-     * Callback
+     * API name
      */
-    callback?: (result: RefreshTokenResult, successData?: string) => void;
+    api?: string;
 
     /**
      * Show loading bar or not
      */
     showLoading?: boolean;
+
+    /**
+     * Header token field name
+     */
+    tokenField?: string;
 }
 
 /**
@@ -454,7 +455,7 @@ export interface IApp {
      * @param silent Silent without any popups
      */
     doRefreshTokenResult(
-        result: RefreshTokenResult,
+        result: RefreshTokenResult<IActionResult<IUser>>,
         initCallCallback?: (result: boolean) => void,
         silent?: boolean
     ): void;
@@ -474,7 +475,9 @@ export interface IApp {
      * @param result Refresh token result
      * @returns Message
      */
-    formatRefreshTokenResult(result: RefreshTokenResult): string | undefined;
+    formatRefreshTokenResult(
+        result: RefreshTokenResult<IActionResult<IUser>>
+    ): string | undefined;
 
     /**
      * Format result text

package/src/erp/AuthApi.ts

@@ -10,6 +10,8 @@ import { SignoutRQ } from './rq/SignoutRQ';
 import { GetLogInUrlRQ } from './rq/GetLogInUrlRQ';
 import { TokenRQ } from './rq/TokenRQ';
 import { ApiRefreshTokenDto } from './dto/ApiRefreshTokenDto';
+import { RefreshTokenProps, RefreshTokenResult } from '../app/IApp';
+import { RefreshTokenRQ } from './rq/RefreshTokenRQ';
 
 /**
  * Authentication API
@@ -82,6 +84,55 @@ export class AuthApi extends BaseApi {
         return this.api.post('Auth/LoginId', rq, payload);
     }
 
+    /**
+     * Refresh token
+     * @param token Refresh token
+     * @param props Props
+     * @returns Result
+     */
+    async refreshToken<R>(
+        token: string,
+        props?: RefreshTokenProps
+    ): Promise<RefreshTokenResult<R>> {
+        // Destruct
+        const {
+            api = 'Auth/RefreshToken',
+            showLoading = false,
+            tokenField = 'Etsoo-Refresh-Token'
+        } = props ?? {};
+
+        // Reqest data
+        const rq: RefreshTokenRQ = {
+            deviceId: this.app.deviceId
+        };
+
+        // Payload
+        const payload: IApiPayload<R, any> = {
+            // No loading bar needed to avoid screen flicks
+            showLoading,
+            config: { headers: { [tokenField]: token } },
+            onError: () => {
+                // Prevent further processing
+                return false;
+            }
+        };
+
+        // Call API
+        const result = await this.api.put(api, rq, payload);
+        if (result == null) {
+            return this.api.lastError ?? this.app.get('unknownError')!;
+        }
+
+        // Token
+        const refreshToken = this.app.getResponseToken(
+            payload.response,
+            tokenField
+        );
+
+        // Success
+        return [refreshToken, result];
+    }
+
     /**
      * Reset password
      * @param rq Request data