@etsoo/appscript 1.5.48 → 1.5.50

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

@@ -193,8 +193,9 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
     isValidPassword(password: string): boolean;
     /**
      * Persist settings to source when application exit
+     * @param keepLogin Keep login or not
      */
-    persist(): void;
+    persist(keepLogin?: boolean): void;
     /**
      * Add scheduled task
      * @param task Task, return false to stop
@@ -509,7 +510,7 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @param tokenKey Refresh token key
      * @returns response refresh token
      */
-    getResponseToken(rawResponse: any, tokenKey?: string): string | null;
+    getResponseToken(rawResponse: any, tokenKey: string): string | null;
     /**
      * Get time zone
      * @returns Time zone
@@ -600,6 +601,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

package/lib/cjs/app/CoreApp.js

@@ -303,8 +303,13 @@ class CoreApp {
     }
     /**
      * Persist settings to source when application exit
+     * @param keepLogin Keep login or not
      */
-    persist() {
+    persist(keepLogin) {
+        if (!keepLogin) {
+            // Unconditional clear the cache for security
+            this.clearCacheToken();
+        }
         // Devices
         const devices = this.storage.getPersistedData(this.fields.devices);
         if (devices != null) {
@@ -317,7 +322,10 @@ class CoreApp {
         }
         if (!this.authorized)
             return;
-        this.storage.copyTo(this.persistedFields);
+        const fields = keepLogin
+            ? this.persistedFields
+            : this.persistedFields.filter((f) => f !== this.fields.headerToken);
+        this.storage.copyTo(fields);
     }
     /**
      * Add scheduled task
@@ -1236,7 +1244,7 @@ class CoreApp {
         const response = this.api.transformResponse(rawResponse);
         if (!response.ok)
             return null;
-        return this.api.getHeaderValue(response.headers, tokenKey ?? 'Smarterp-Refresh-Token');
+        return this.api.getHeaderValue(response.headers, tokenKey);
     }
     /**
      * Get time zone
@@ -1488,14 +1496,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 +1511,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

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

@@ -462,7 +462,7 @@ export interface IApp {
      * @param tokenKey Refresh token key
      * @returns response refresh token
      */
-    getResponseToken(rawResponse: any, tokenKey?: string): string | null;
+    getResponseToken(rawResponse: any, tokenKey: string): string | null;
     /**
      * Get time zone
      * @returns Time zone
@@ -561,8 +561,9 @@ export interface IApp {
     signout(): Promise<void>;
     /**
      * Persist settings to source when application exit
+     * @param keepLogin Keep login or not
      */
-    persist(): void;
+    persist(keepLogin?: boolean): void;
     /**
      * Go to the login page
      * @param params Login parameters

package/lib/cjs/erp/AuthApi.js

@@ -42,11 +42,16 @@ class AuthApi extends BaseApi_1.BaseApi {
      * @returns Result
      */
     async loginBase(rq, payload, tokenKey) {
+        // Default values
         payload ?? (payload = {});
+        tokenKey ?? (tokenKey = AuthApi.HeaderTokenField);
+        // Call the API
         const result = await this.api.post('Auth/Login', rq, payload);
+        // Get the refresh token
         const refreshToken = result?.ok
             ? this.app.getResponseToken(payload.response, tokenKey)
             : null;
+        // Return the result
         return [result, refreshToken];
     }
     /**

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

@@ -193,8 +193,9 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
     isValidPassword(password: string): boolean;
     /**
      * Persist settings to source when application exit
+     * @param keepLogin Keep login or not
      */
-    persist(): void;
+    persist(keepLogin?: boolean): void;
     /**
      * Add scheduled task
      * @param task Task, return false to stop
@@ -509,7 +510,7 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @param tokenKey Refresh token key
      * @returns response refresh token
      */
-    getResponseToken(rawResponse: any, tokenKey?: string): string | null;
+    getResponseToken(rawResponse: any, tokenKey: string): string | null;
     /**
      * Get time zone
      * @returns Time zone
@@ -600,6 +601,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

package/lib/mjs/app/CoreApp.js

@@ -300,8 +300,13 @@ export class CoreApp {
     }
     /**
      * Persist settings to source when application exit
+     * @param keepLogin Keep login or not
      */
-    persist() {
+    persist(keepLogin) {
+        if (!keepLogin) {
+            // Unconditional clear the cache for security
+            this.clearCacheToken();
+        }
         // Devices
         const devices = this.storage.getPersistedData(this.fields.devices);
         if (devices != null) {
@@ -314,7 +319,10 @@ export class CoreApp {
         }
         if (!this.authorized)
             return;
-        this.storage.copyTo(this.persistedFields);
+        const fields = keepLogin
+            ? this.persistedFields
+            : this.persistedFields.filter((f) => f !== this.fields.headerToken);
+        this.storage.copyTo(fields);
     }
     /**
      * Add scheduled task
@@ -1233,7 +1241,7 @@ export class CoreApp {
         const response = this.api.transformResponse(rawResponse);
         if (!response.ok)
             return null;
-        return this.api.getHeaderValue(response.headers, tokenKey ?? 'Smarterp-Refresh-Token');
+        return this.api.getHeaderValue(response.headers, tokenKey);
     }
     /**
      * Get time zone
@@ -1485,14 +1493,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 +1508,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

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

@@ -462,7 +462,7 @@ export interface IApp {
      * @param tokenKey Refresh token key
      * @returns response refresh token
      */
-    getResponseToken(rawResponse: any, tokenKey?: string): string | null;
+    getResponseToken(rawResponse: any, tokenKey: string): string | null;
     /**
      * Get time zone
      * @returns Time zone
@@ -561,8 +561,9 @@ export interface IApp {
     signout(): Promise<void>;
     /**
      * Persist settings to source when application exit
+     * @param keepLogin Keep login or not
      */
-    persist(): void;
+    persist(keepLogin?: boolean): void;
     /**
      * Go to the login page
      * @param params Login parameters

package/lib/mjs/erp/AuthApi.js

@@ -39,11 +39,16 @@ export class AuthApi extends BaseApi {
      * @returns Result
      */
     async loginBase(rq, payload, tokenKey) {
+        // Default values
         payload ?? (payload = {});
+        tokenKey ?? (tokenKey = AuthApi.HeaderTokenField);
+        // Call the API
         const result = await this.api.post('Auth/Login', rq, payload);
+        // Get the refresh token
         const refreshToken = result?.ok
             ? this.app.getResponseToken(payload.response, tokenKey)
             : null;
+        // Return the result
         return [result, refreshToken];
     }
     /**

package/package.json

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

package/src/app/CoreApp.ts

@@ -525,8 +525,14 @@ export abstract class CoreApp<
 
     /**
      * Persist settings to source when application exit
+     * @param keepLogin Keep login or not
      */
-    persist() {
+    persist(keepLogin?: boolean) {
+        if (!keepLogin) {
+            // Unconditional clear the cache for security
+            this.clearCacheToken();
+        }
+
         // Devices
         const devices = this.storage.getPersistedData<string[]>(
             this.fields.devices
@@ -541,7 +547,12 @@ export abstract class CoreApp<
         }
 
         if (!this.authorized) return;
-        this.storage.copyTo(this.persistedFields);
+
+        const fields = keepLogin
+            ? this.persistedFields
+            : this.persistedFields.filter((f) => f !== this.fields.headerToken);
+
+        this.storage.copyTo(fields);
     }
 
     /**
@@ -1748,13 +1759,10 @@ export abstract class CoreApp<
      * @param tokenKey Refresh token key
      * @returns response refresh token
      */
-    getResponseToken(rawResponse: any, tokenKey?: string): string | null {
+    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'
-        );
+        return this.api.getHeaderValue(response.headers, tokenKey);
     }
 
     /**
@@ -2046,17 +2054,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,
@@ -2071,6 +2079,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

package/src/app/IApp.ts

@@ -623,7 +623,7 @@ export interface IApp {
      * @param tokenKey Refresh token key
      * @returns response refresh token
      */
-    getResponseToken(rawResponse: any, tokenKey?: string): string | null;
+    getResponseToken(rawResponse: any, tokenKey: string): string | null;
 
     /**
      * Get time zone
@@ -758,8 +758,9 @@ export interface IApp {
 
     /**
      * Persist settings to source when application exit
+     * @param keepLogin Keep login or not
      */
-    persist(): void;
+    persist(keepLogin?: boolean): void;
 
     /**
      * Go to the login page

package/src/erp/AuthApi.ts

@@ -65,11 +65,19 @@ export class AuthApi extends BaseApi {
         payload?: IApiPayload<IActionResult<T>>,
         tokenKey?: string
     ): Promise<[IActionResult<T> | undefined, string | null]> {
+        // Default values
         payload ??= {};
+        tokenKey ??= AuthApi.HeaderTokenField;
+
+        // Call the API
         const result = await this.api.post('Auth/Login', rq, payload);
+
+        // Get the refresh token
         const refreshToken = result?.ok
             ? this.app.getResponseToken(payload.response, tokenKey)
             : null;
+
+        // Return the result
         return [result, refreshToken];
     }