@etsoo/appscript 1.5.58 → 1.5.60

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

@@ -219,6 +219,10 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @returns Result
      */
     createApi(name: string, item: ExternalEndpoint, refresh?: (api: IApi, rq: ApiRefreshTokenRQ) => Promise<[string, number] | undefined>): IApi<any>;
+    /**
+     * Reset all APIs
+     */
+    protected resetApis(): void;
     /**
      * Update API token and expires
      * @param name Api name
@@ -631,7 +635,6 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
     protected setupTasks(): void;
     /**
      * Signout, with userLogout and toLoginPage
-     * @param apiUrl Signout API URL
      */
     signout(): Promise<void>;
     /**

package/lib/cjs/app/CoreApp.js

@@ -14,6 +14,8 @@ const UserRole_1 = require("./UserRole");
 const AuthApi_1 = require("../erp/AuthApi");
 let CJ;
 const loadCrypto = () => import('crypto-js');
+// System API name
+const systemApi = 'system';
 /**
  * Core application
  */
@@ -201,12 +203,12 @@ class CoreApp {
         if (api) {
             // Base URL of the API
             api.baseUrl = this.settings.endpoint;
-            api.name = 'system';
+            api.name = systemApi;
             this.setApi(api, refresh);
             this.api = api;
         }
         else {
-            this.api = this.createApi('system', {
+            this.api = this.createApi(systemApi, {
                 endpoint: settings.endpoint,
                 webUrl: settings.webUrl
             }, refresh);
@@ -374,6 +376,15 @@ class CoreApp {
         this.setApi(api, refresh);
         return api;
     }
+    /**
+     * Reset all APIs
+     */
+    resetApis() {
+        for (const name in this.apis) {
+            const data = this.apis[name];
+            this.updateApi(data, undefined, -1);
+        }
+    }
     updateApi(nameOrData, token, seconds) {
         const api = typeof nameOrData === 'string' ? this.apis[nameOrData] : nameOrData;
         if (api == null)
@@ -1476,6 +1487,10 @@ class CoreApp {
      * @returns Result
      */
     async exchangeToken(api, token) {
+        // Avoid to call the system API
+        if (api.name === systemApi) {
+            throw new Error('System API is not allowed to exchange token');
+        }
         // Call the API quietly, no loading bar and no error popup
         const data = await new AuthApi_1.AuthApi(this).exchangeToken({ token }, {
             showLoading: false,
@@ -1508,14 +1523,18 @@ class CoreApp {
     exchangeTokenAll(coreData, coreName) {
         coreName ?? (coreName = 'core');
         for (const name in this.apis) {
-            const api = this.apis[name];
+            // Ignore the system API as it has its own logic with refreshToken
+            if (name === systemApi)
+                continue;
+            const data = this.apis[name];
+            const api = data[0];
             // The core API
-            if (api[0].name === coreName) {
-                api[0].authorize(coreData.tokenType, coreData.accessToken);
-                this.updateApi(api, coreData.refreshToken, coreData.expiresIn);
+            if (name === coreName) {
+                api.authorize(coreData.tokenType, coreData.accessToken);
+                this.updateApi(data, coreData.refreshToken, coreData.expiresIn);
             }
             else {
-                this.exchangeToken(api[0], coreData.refreshToken);
+                this.exchangeToken(api, coreData.refreshToken);
             }
         }
     }
@@ -1613,11 +1632,12 @@ class CoreApp {
     }
     /**
      * Signout, with userLogout and toLoginPage
-     * @param apiUrl Signout API URL
      */
     async signout() {
         // Clear the keep login status
         this.keepLogin = false;
+        // Reset all APIs
+        this.resetApis();
         const token = this.getCacheToken();
         if (token) {
             const result = await new AuthApi_1.AuthApi(this).signout({

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

@@ -219,6 +219,10 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @returns Result
      */
     createApi(name: string, item: ExternalEndpoint, refresh?: (api: IApi, rq: ApiRefreshTokenRQ) => Promise<[string, number] | undefined>): IApi<any>;
+    /**
+     * Reset all APIs
+     */
+    protected resetApis(): void;
     /**
      * Update API token and expires
      * @param name Api name
@@ -631,7 +635,6 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
     protected setupTasks(): void;
     /**
      * Signout, with userLogout and toLoginPage
-     * @param apiUrl Signout API URL
      */
     signout(): Promise<void>;
     /**

package/lib/mjs/app/CoreApp.js

@@ -11,6 +11,8 @@ import { UserRole } from './UserRole';
 import { AuthApi } from '../erp/AuthApi';
 let CJ;
 const loadCrypto = () => import('crypto-js');
+// System API name
+const systemApi = 'system';
 /**
  * Core application
  */
@@ -198,12 +200,12 @@ export class CoreApp {
         if (api) {
             // Base URL of the API
             api.baseUrl = this.settings.endpoint;
-            api.name = 'system';
+            api.name = systemApi;
             this.setApi(api, refresh);
             this.api = api;
         }
         else {
-            this.api = this.createApi('system', {
+            this.api = this.createApi(systemApi, {
                 endpoint: settings.endpoint,
                 webUrl: settings.webUrl
             }, refresh);
@@ -371,6 +373,15 @@ export class CoreApp {
         this.setApi(api, refresh);
         return api;
     }
+    /**
+     * Reset all APIs
+     */
+    resetApis() {
+        for (const name in this.apis) {
+            const data = this.apis[name];
+            this.updateApi(data, undefined, -1);
+        }
+    }
     updateApi(nameOrData, token, seconds) {
         const api = typeof nameOrData === 'string' ? this.apis[nameOrData] : nameOrData;
         if (api == null)
@@ -1473,6 +1484,10 @@ export class CoreApp {
      * @returns Result
      */
     async exchangeToken(api, token) {
+        // Avoid to call the system API
+        if (api.name === systemApi) {
+            throw new Error('System API is not allowed to exchange token');
+        }
         // Call the API quietly, no loading bar and no error popup
         const data = await new AuthApi(this).exchangeToken({ token }, {
             showLoading: false,
@@ -1505,14 +1520,18 @@ export class CoreApp {
     exchangeTokenAll(coreData, coreName) {
         coreName ?? (coreName = 'core');
         for (const name in this.apis) {
-            const api = this.apis[name];
+            // Ignore the system API as it has its own logic with refreshToken
+            if (name === systemApi)
+                continue;
+            const data = this.apis[name];
+            const api = data[0];
             // The core API
-            if (api[0].name === coreName) {
-                api[0].authorize(coreData.tokenType, coreData.accessToken);
-                this.updateApi(api, coreData.refreshToken, coreData.expiresIn);
+            if (name === coreName) {
+                api.authorize(coreData.tokenType, coreData.accessToken);
+                this.updateApi(data, coreData.refreshToken, coreData.expiresIn);
             }
             else {
-                this.exchangeToken(api[0], coreData.refreshToken);
+                this.exchangeToken(api, coreData.refreshToken);
             }
         }
     }
@@ -1610,11 +1629,12 @@ export class CoreApp {
     }
     /**
      * Signout, with userLogout and toLoginPage
-     * @param apiUrl Signout API URL
      */
     async signout() {
         // Clear the keep login status
         this.keepLogin = false;
+        // Reset all APIs
+        this.resetApis();
         const token = this.getCacheToken();
         if (token) {
             const result = await new AuthApi(this).signout({

package/package.json

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

package/src/app/CoreApp.ts

@@ -64,6 +64,9 @@ type ApiRefreshTokenFunction = (
 // API task data
 type ApiTaskData = [IApi, number, number, ApiRefreshTokenFunction, string?];
 
+// System API name
+const systemApi = 'system';
+
 /**
  * Core application interface
  */
@@ -375,12 +378,12 @@ export abstract class CoreApp<
         if (api) {
             // Base URL of the API
             api.baseUrl = this.settings.endpoint;
-            api.name = 'system';
+            api.name = systemApi;
             this.setApi(api, refresh);
             this.api = api;
         } else {
             this.api = this.createApi(
-                'system',
+                systemApi,
                 {
                     endpoint: settings.endpoint,
                     webUrl: settings.webUrl
@@ -617,6 +620,16 @@ export abstract class CoreApp<
         return api;
     }
 
+    /**
+     * Reset all APIs
+     */
+    protected resetApis() {
+        for (const name in this.apis) {
+            const data = this.apis[name];
+            this.updateApi(data, undefined, -1);
+        }
+    }
+
     /**
      * Update API token and expires
      * @param name Api name
@@ -2026,6 +2039,11 @@ export abstract class CoreApp<
      * @returns Result
      */
     async exchangeToken(api: IApi, token: string) {
+        // Avoid to call the system API
+        if (api.name === systemApi) {
+            throw new Error('System API is not allowed to exchange token');
+        }
+
         // Call the API quietly, no loading bar and no error popup
         const data = await new AuthApi(this).exchangeToken(
             { token },
@@ -2071,14 +2089,18 @@ export abstract class CoreApp<
         coreName ??= 'core';
 
         for (const name in this.apis) {
-            const api = this.apis[name];
+            // Ignore the system API as it has its own logic with refreshToken
+            if (name === systemApi) continue;
+
+            const data = this.apis[name];
+            const api = data[0];
 
             // The core API
-            if (api[0].name === coreName) {
-                api[0].authorize(coreData.tokenType, coreData.accessToken);
-                this.updateApi(api, coreData.refreshToken, coreData.expiresIn);
+            if (name === coreName) {
+                api.authorize(coreData.tokenType, coreData.accessToken);
+                this.updateApi(data, coreData.refreshToken, coreData.expiresIn);
             } else {
-                this.exchangeToken(api[0], coreData.refreshToken);
+                this.exchangeToken(api, coreData.refreshToken);
             }
         }
     }
@@ -2196,12 +2218,14 @@ export abstract class CoreApp<
 
     /**
      * Signout, with userLogout and toLoginPage
-     * @param apiUrl Signout API URL
      */
     async signout() {
         // Clear the keep login status
         this.keepLogin = false;
 
+        // Reset all APIs
+        this.resetApis();
+
         const token = this.getCacheToken();
         if (token) {
             const result = await new AuthApi(this).signout(