@etsoo/appscript 1.5.59 → 1.5.61

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,9 +635,9 @@ 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
+     * @param action Callback
      */
-    signout(): Promise<void>;
+    signout(action?: () => void | boolean): Promise<void>;
     /**
      * Go to the login page
      * @param data Login parameters

package/lib/cjs/app/CoreApp.js

@@ -376,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)
@@ -1623,11 +1632,13 @@ class CoreApp {
     }
     /**
      * Signout, with userLogout and toLoginPage
-     * @param apiUrl Signout API URL
+     * @param action Callback
      */
-    async signout() {
+    async signout(action) {
         // 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({
@@ -1646,8 +1657,10 @@ class CoreApp {
         }
         // Clear, noTrigger = true, avoid state update
         this.userLogout(true, true);
-        // Go to login page
-        this.toLoginPage({ params: { tryLogin: false }, removeUrl: true });
+        if (action == null || action() !== false) {
+            // Go to login page
+            this.toLoginPage({ params: { tryLogin: false }, removeUrl: true });
+        }
     }
     /**
      * Go to the login page

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

@@ -571,8 +571,9 @@ export interface IApp {
     setupLogging(action?: (data: ErrorData) => void | Promise<void>, preventDefault?: ((type: ErrorType) => boolean) | boolean): void;
     /**
      * Signout, with userLogout and toLoginPage
+     * @param action Callback
      */
-    signout(): Promise<void>;
+    signout(action?: () => void | boolean): Promise<void>;
     /**
      * Persist settings to source when application exit
      */

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,9 +635,9 @@ 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
+     * @param action Callback
      */
-    signout(): Promise<void>;
+    signout(action?: () => void | boolean): Promise<void>;
     /**
      * Go to the login page
      * @param data Login parameters

package/lib/mjs/app/CoreApp.js

@@ -373,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)
@@ -1620,11 +1629,13 @@ export class CoreApp {
     }
     /**
      * Signout, with userLogout and toLoginPage
-     * @param apiUrl Signout API URL
+     * @param action Callback
      */
-    async signout() {
+    async signout(action) {
         // 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({
@@ -1643,8 +1654,10 @@ export class CoreApp {
         }
         // Clear, noTrigger = true, avoid state update
         this.userLogout(true, true);
-        // Go to login page
-        this.toLoginPage({ params: { tryLogin: false }, removeUrl: true });
+        if (action == null || action() !== false) {
+            // Go to login page
+            this.toLoginPage({ params: { tryLogin: false }, removeUrl: true });
+        }
     }
     /**
      * Go to the login page

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

@@ -571,8 +571,9 @@ export interface IApp {
     setupLogging(action?: (data: ErrorData) => void | Promise<void>, preventDefault?: ((type: ErrorType) => boolean) | boolean): void;
     /**
      * Signout, with userLogout and toLoginPage
+     * @param action Callback
      */
-    signout(): Promise<void>;
+    signout(action?: () => void | boolean): Promise<void>;
     /**
      * Persist settings to source when application exit
      */

package/package.json

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

package/src/app/CoreApp.ts

@@ -620,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
@@ -2208,12 +2218,15 @@ export abstract class CoreApp<
 
     /**
      * Signout, with userLogout and toLoginPage
-     * @param apiUrl Signout API URL
+     * @param action Callback
      */
-    async signout() {
+    async signout(action?: () => void | boolean) {
         // 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(
@@ -2241,8 +2254,10 @@ export abstract class CoreApp<
         // Clear, noTrigger = true, avoid state update
         this.userLogout(true, true);
 
-        // Go to login page
-        this.toLoginPage({ params: { tryLogin: false }, removeUrl: true });
+        if (action == null || action() !== false) {
+            // Go to login page
+            this.toLoginPage({ params: { tryLogin: false }, removeUrl: true });
+        }
     }
 
     /**

package/src/app/IApp.ts

@@ -770,8 +770,9 @@ export interface IApp {
 
     /**
      * Signout, with userLogout and toLoginPage
+     * @param action Callback
      */
-    signout(): Promise<void>;
+    signout(action?: () => void | boolean): Promise<void>;
 
     /**
      * Persist settings to source when application exit