@etsoo/appscript 1.5.49 → 1.5.51

package/__tests__/app/Culture.ts

@@ -1,10 +1,29 @@
-import { zhHans } from '../../src';
+import { en, zhHans } from '../../src';
+
+test('Tests for en', async () => {
+    const e = en(
+        { nameB: 'Name for Business' },
+        new Promise((resolve) => resolve({ no: 'No override' }))
+    );
+
+    expect(e.name).toBe('en');
+
+    const resources =
+        typeof e.resources === 'object' ? e.resources : await e.resources();
+
+    expect(resources.name).toBe('Name');
+    expect(resources.nameB).toBe('Name for Business');
+    expect(resources.no).toBe('No override');
+});
 
 test('Tests for zhHans', async () => {
     const zh = zhHans(
         { nameB: '名称覆盖' },
         new Promise((resolve) => resolve({ no: 'No override' }))
     );
+
+    expect(zh.name).toBe('zh-Hans');
+
     const resources =
         typeof zh.resources === 'object' ? zh.resources : await zh.resources();
 

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

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

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/cjs/i18n/CultureUtils.d.ts

@@ -1,12 +1,13 @@
-import { DataTypes } from '@etsoo/shared';
+import { DataTypes, DomUtils } from '@etsoo/shared';
 /**
  * Culture utilities
  */
 export declare namespace CultureUtils {
     /**
      * Make culture
+     * @param cultureMaker Culture maker
      * @param resources Resources
      * @returns Culture
      */
-    function make(...resources: (object | (() => Promise<object>))[]): DataTypes.CultureDefinition<DataTypes.StringRecord>;
+    function make(cultureMaker: typeof DomUtils.zhHans, ...resources: (object | (() => Promise<object>))[]): DataTypes.CultureDefinition<DataTypes.StringRecord>;
 }

package/lib/cjs/i18n/CultureUtils.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CultureUtils = void 0;
-const shared_1 = require("@etsoo/shared");
 /**
  * Culture utilities
  */
@@ -9,11 +8,12 @@ var CultureUtils;
 (function (CultureUtils) {
     /**
      * Make culture
+     * @param cultureMaker Culture maker
      * @param resources Resources
      * @returns Culture
      */
-    function make(...resources) {
-        return shared_1.DomUtils.zhHans(async () => {
+    function make(cultureMaker, ...resources) {
+        return cultureMaker(async () => {
             const rs = await Promise.all(resources.map((resource) => new Promise((resolve) => {
                 if (typeof resource === 'object') {
                     resolve(resource);

package/lib/cjs/i18n/en.js

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.en = void 0;
+const shared_1 = require("@etsoo/shared");
 const CultureUtils_1 = require("./CultureUtils");
 /**
  * Get en neutral culture
  * @param localResources Local resources
  * @returns Full culture
  */
-const en = (...resources) => CultureUtils_1.CultureUtils.make(import('./en.json'), ...resources);
+const en = (...resources) => CultureUtils_1.CultureUtils.make(shared_1.DomUtils.en, import('./en.json'), ...resources);
 exports.en = en;

package/lib/cjs/i18n/zhHans.js

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.zhHans = void 0;
+const shared_1 = require("@etsoo/shared");
 const CultureUtils_1 = require("./CultureUtils");
 /**
  * Get zh-Hans neutral cultrue
  * @param localResources Local resources
  * @returns Full culture
  */
-const zhHans = (...resources) => CultureUtils_1.CultureUtils.make(import('./zh-Hans.json'), ...resources);
+const zhHans = (...resources) => CultureUtils_1.CultureUtils.make(shared_1.DomUtils.zhHans, import('./zh-Hans.json'), ...resources);
 exports.zhHans = zhHans;

package/lib/cjs/i18n/zhHant.js

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.zhHant = void 0;
+const shared_1 = require("@etsoo/shared");
 const CultureUtils_1 = require("./CultureUtils");
 /**
  * Get zh-Hant neutral cultrue
  * @param localResources Local resources
  * @returns Full culture
  */
-const zhHant = (...resources) => CultureUtils_1.CultureUtils.make(import('./zh-Hant.json'), ...resources);
+const zhHant = (...resources) => CultureUtils_1.CultureUtils.make(shared_1.DomUtils.zhHant, import('./zh-Hant.json'), ...resources);
 exports.zhHant = zhHant;

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

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

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/lib/mjs/i18n/CultureUtils.d.ts

@@ -1,12 +1,13 @@
-import { DataTypes } from '@etsoo/shared';
+import { DataTypes, DomUtils } from '@etsoo/shared';
 /**
  * Culture utilities
  */
 export declare namespace CultureUtils {
     /**
      * Make culture
+     * @param cultureMaker Culture maker
      * @param resources Resources
      * @returns Culture
      */
-    function make(...resources: (object | (() => Promise<object>))[]): DataTypes.CultureDefinition<DataTypes.StringRecord>;
+    function make(cultureMaker: typeof DomUtils.zhHans, ...resources: (object | (() => Promise<object>))[]): DataTypes.CultureDefinition<DataTypes.StringRecord>;
 }

package/lib/mjs/i18n/CultureUtils.js

@@ -1,4 +1,3 @@
-import { DomUtils } from '@etsoo/shared';
 /**
  * Culture utilities
  */
@@ -6,11 +5,12 @@ export var CultureUtils;
 (function (CultureUtils) {
     /**
      * Make culture
+     * @param cultureMaker Culture maker
      * @param resources Resources
      * @returns Culture
      */
-    function make(...resources) {
-        return DomUtils.zhHans(async () => {
+    function make(cultureMaker, ...resources) {
+        return cultureMaker(async () => {
             const rs = await Promise.all(resources.map((resource) => new Promise((resolve) => {
                 if (typeof resource === 'object') {
                     resolve(resource);

package/lib/mjs/i18n/en.js

@@ -1,7 +1,8 @@
+import { DomUtils } from '@etsoo/shared';
 import { CultureUtils } from './CultureUtils';
 /**
  * Get en neutral culture
  * @param localResources Local resources
  * @returns Full culture
  */
-export const en = (...resources) => CultureUtils.make(import('./en.json'), ...resources);
+export const en = (...resources) => CultureUtils.make(DomUtils.en, import('./en.json'), ...resources);

package/lib/mjs/i18n/zhHans.js

@@ -1,7 +1,8 @@
+import { DomUtils } from '@etsoo/shared';
 import { CultureUtils } from './CultureUtils';
 /**
  * Get zh-Hans neutral cultrue
  * @param localResources Local resources
  * @returns Full culture
  */
-export const zhHans = (...resources) => CultureUtils.make(import('./zh-Hans.json'), ...resources);
+export const zhHans = (...resources) => CultureUtils.make(DomUtils.zhHans, import('./zh-Hans.json'), ...resources);

package/lib/mjs/i18n/zhHant.js

@@ -1,7 +1,8 @@
+import { DomUtils } from '@etsoo/shared';
 import { CultureUtils } from './CultureUtils';
 /**
  * Get zh-Hant neutral cultrue
  * @param localResources Local resources
  * @returns Full culture
  */
-export const zhHant = (...resources) => CultureUtils.make(import('./zh-Hant.json'), ...resources);
+export const zhHant = (...resources) => CultureUtils.make(DomUtils.zhHant, import('./zh-Hant.json'), ...resources);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.5.49",
+    "version": "1.5.51",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -52,9 +52,9 @@
     },
     "homepage": "https://github.com/ETSOO/AppScript#readme",
     "dependencies": {
-        "@etsoo/notificationbase": "^1.1.49",
-        "@etsoo/restclient": "^1.1.11",
-        "@etsoo/shared": "^1.2.48",
+        "@etsoo/notificationbase": "^1.1.50",
+        "@etsoo/restclient": "^1.1.12",
+        "@etsoo/shared": "^1.2.49",
         "crypto-js": "^4.2.0"
     },
     "devDependencies": {

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);
     }
 
     /**

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];
     }
 

package/src/i18n/CultureUtils.ts

@@ -6,11 +6,15 @@ import { DataTypes, DomUtils } from '@etsoo/shared';
 export namespace CultureUtils {
     /**
      * Make culture
+     * @param cultureMaker Culture maker
      * @param resources Resources
      * @returns Culture
      */
-    export function make(...resources: (object | (() => Promise<object>))[]) {
-        return DomUtils.zhHans(async () => {
+    export function make(
+        cultureMaker: typeof DomUtils.zhHans,
+        ...resources: (object | (() => Promise<object>))[]
+    ) {
+        return cultureMaker(async () => {
             const rs = await Promise.all(
                 resources.map(
                     (resource) =>

package/src/i18n/en.ts

@@ -1,3 +1,4 @@
+import { DomUtils } from '@etsoo/shared';
 import { CultureUtils } from './CultureUtils';
 
 /**
@@ -6,4 +7,4 @@ import { CultureUtils } from './CultureUtils';
  * @returns Full culture
  */
 export const en = (...resources: (object | (() => Promise<object>))[]) =>
-    CultureUtils.make(import('./en.json'), ...resources);
+    CultureUtils.make(DomUtils.en, import('./en.json'), ...resources);

package/src/i18n/zhHans.ts

@@ -1,3 +1,4 @@
+import { DomUtils } from '@etsoo/shared';
 import { CultureUtils } from './CultureUtils';
 
 /**
@@ -6,4 +7,4 @@ import { CultureUtils } from './CultureUtils';
  * @returns Full culture
  */
 export const zhHans = (...resources: (object | (() => Promise<object>))[]) =>
-    CultureUtils.make(import('./zh-Hans.json'), ...resources);
+    CultureUtils.make(DomUtils.zhHans, import('./zh-Hans.json'), ...resources);

package/src/i18n/zhHant.ts

@@ -1,3 +1,4 @@
+import { DomUtils } from '@etsoo/shared';
 import { CultureUtils } from './CultureUtils';
 
 /**
@@ -6,4 +7,4 @@ import { CultureUtils } from './CultureUtils';
  * @returns Full culture
  */
 export const zhHant = (...resources: (object | (() => Promise<object>))[]) =>
-    CultureUtils.make(import('./zh-Hant.json'), ...resources);
+    CultureUtils.make(DomUtils.zhHant, import('./zh-Hant.json'), ...resources);