@etsoo/appscript 1.4.30 → 1.4.32

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

@@ -519,15 +519,16 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      */
     setup(): void;
     /**
-     * Signout
+     * Signout, with userLogout and toLoginPage
      * @param apiUrl Signout API URL
      */
     signout(): Promise<void>;
     /**
      * Go to the login page
      * @param tryLogin Try to login again
+     * @param removeUrl Remove current URL for reuse
      */
-    toLoginPage(tryLogin?: boolean): void;
+    toLoginPage(tryLogin?: boolean, removeUrl?: boolean): void;
     /**
      * Try login, returning false means is loading
      * UI get involved while refreshToken not intended
@@ -545,8 +546,9 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
     /**
      * User logout
      * @param clearToken Clear refresh token or not
+     * @param noTrigger No trigger for state change
      */
-    userLogout(clearToken?: boolean): void;
+    userLogout(clearToken?: boolean, noTrigger?: boolean): void;
     /**
      * User unauthorized
      */

package/lib/cjs/app/CoreApp.js

@@ -1278,7 +1278,7 @@ class CoreApp {
         this.pendings.forEach((p) => p());
     }
     /**
-     * Signout
+     * Signout, with userLogout and toLoginPage
      * @param apiUrl Signout API URL
      */
     async signout() {
@@ -1289,19 +1289,19 @@ class CoreApp {
                 return false;
             }
         });
-        // Clear
-        this.userLogout();
+        // Clear, noTrigger = true, avoid state update
+        this.userLogout(true, true);
         // Go to login page
-        this.toLoginPage();
+        this.toLoginPage(false, true);
     }
     /**
      * Go to the login page
      * @param tryLogin Try to login again
+     * @param removeUrl Remove current URL for reuse
      */
-    toLoginPage(tryLogin) {
-        const url = '/?url=' +
-            encodeURIComponent(location.href) +
-            (tryLogin ? '' : '&tryLogin=false');
+    toLoginPage(tryLogin, removeUrl) {
+        const url = `/?tryLogin=${tryLogin !== null && tryLogin !== void 0 ? tryLogin : false}` +
+            (removeUrl ? '' : '&url=' + encodeURIComponent(location.href));
         this.navigate(url);
     }
     /**
@@ -1337,8 +1337,9 @@ class CoreApp {
     /**
      * User logout
      * @param clearToken Clear refresh token or not
+     * @param noTrigger No trigger for state change
      */
-    userLogout(clearToken = true) {
+    userLogout(clearToken = true, noTrigger = false) {
         this.authorize(undefined, clearToken ? undefined : '');
     }
     /**

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

@@ -449,7 +449,7 @@ export interface IApp {
      */
     refreshToken<D extends object = {}>(props?: RefreshTokenProps<D>): Promise<boolean>;
     /**
-     * Signout
+     * Signout, with userLogout and toLoginPage
      */
     signout(): Promise<void>;
     /**
@@ -459,8 +459,9 @@ export interface IApp {
     /**
      * Go to the login page
      * @param tryLogin Try to login again
+     * @param removeUrl Remove current URL for reuse
      */
-    toLoginPage(tryLogin?: boolean): void;
+    toLoginPage(tryLogin?: boolean, removeUrl?: boolean): void;
     /**
      * Try login, returning false means is loading
      * UI get involved while refreshToken not intended
@@ -477,8 +478,9 @@ export interface IApp {
     /**
      * User logout
      * @param clearToken Clear refresh token or not
+     * @param noTrigger No trigger for state change
      */
-    userLogout(clearToken: boolean): void;
+    userLogout(clearToken: boolean, noTrigger?: boolean): void;
     /**
      * User unauthorized
      */

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

@@ -519,15 +519,16 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      */
     setup(): void;
     /**
-     * Signout
+     * Signout, with userLogout and toLoginPage
      * @param apiUrl Signout API URL
      */
     signout(): Promise<void>;
     /**
      * Go to the login page
      * @param tryLogin Try to login again
+     * @param removeUrl Remove current URL for reuse
      */
-    toLoginPage(tryLogin?: boolean): void;
+    toLoginPage(tryLogin?: boolean, removeUrl?: boolean): void;
     /**
      * Try login, returning false means is loading
      * UI get involved while refreshToken not intended
@@ -545,8 +546,9 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
     /**
      * User logout
      * @param clearToken Clear refresh token or not
+     * @param noTrigger No trigger for state change
      */
-    userLogout(clearToken?: boolean): void;
+    userLogout(clearToken?: boolean, noTrigger?: boolean): void;
     /**
      * User unauthorized
      */

package/lib/mjs/app/CoreApp.js

@@ -1252,7 +1252,7 @@ export class CoreApp {
         this.pendings.forEach((p) => p());
     }
     /**
-     * Signout
+     * Signout, with userLogout and toLoginPage
      * @param apiUrl Signout API URL
      */
     async signout() {
@@ -1263,19 +1263,19 @@ export class CoreApp {
                 return false;
             }
         });
-        // Clear
-        this.userLogout();
+        // Clear, noTrigger = true, avoid state update
+        this.userLogout(true, true);
         // Go to login page
-        this.toLoginPage();
+        this.toLoginPage(false, true);
     }
     /**
      * Go to the login page
      * @param tryLogin Try to login again
+     * @param removeUrl Remove current URL for reuse
      */
-    toLoginPage(tryLogin) {
-        const url = '/?url=' +
-            encodeURIComponent(location.href) +
-            (tryLogin ? '' : '&tryLogin=false');
+    toLoginPage(tryLogin, removeUrl) {
+        const url = `/?tryLogin=${tryLogin !== null && tryLogin !== void 0 ? tryLogin : false}` +
+            (removeUrl ? '' : '&url=' + encodeURIComponent(location.href));
         this.navigate(url);
     }
     /**
@@ -1311,8 +1311,9 @@ export class CoreApp {
     /**
      * User logout
      * @param clearToken Clear refresh token or not
+     * @param noTrigger No trigger for state change
      */
-    userLogout(clearToken = true) {
+    userLogout(clearToken = true, noTrigger = false) {
         this.authorize(undefined, clearToken ? undefined : '');
     }
     /**

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

@@ -449,7 +449,7 @@ export interface IApp {
      */
     refreshToken<D extends object = {}>(props?: RefreshTokenProps<D>): Promise<boolean>;
     /**
-     * Signout
+     * Signout, with userLogout and toLoginPage
      */
     signout(): Promise<void>;
     /**
@@ -459,8 +459,9 @@ export interface IApp {
     /**
      * Go to the login page
      * @param tryLogin Try to login again
+     * @param removeUrl Remove current URL for reuse
      */
-    toLoginPage(tryLogin?: boolean): void;
+    toLoginPage(tryLogin?: boolean, removeUrl?: boolean): void;
     /**
      * Try login, returning false means is loading
      * UI get involved while refreshToken not intended
@@ -477,8 +478,9 @@ export interface IApp {
     /**
      * User logout
      * @param clearToken Clear refresh token or not
+     * @param noTrigger No trigger for state change
      */
-    userLogout(clearToken: boolean): void;
+    userLogout(clearToken: boolean, noTrigger?: boolean): void;
     /**
      * User unauthorized
      */

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.4.30",
+    "version": "1.4.32",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -52,7 +52,7 @@
     },
     "homepage": "https://github.com/ETSOO/AppScript#readme",
     "dependencies": {
-        "@etsoo/notificationbase": "^1.1.25",
+        "@etsoo/notificationbase": "^1.1.26",
         "@etsoo/restclient": "^1.0.89",
         "@etsoo/shared": "^1.2.8",
         "crypto-js": "^4.1.1"

package/src/app/CoreApp.ts

@@ -1639,7 +1639,7 @@ export abstract class CoreApp<
     }
 
     /**
-     * Signout
+     * Signout, with userLogout and toLoginPage
      * @param apiUrl Signout API URL
      */
     async signout() {
@@ -1655,22 +1655,23 @@ export abstract class CoreApp<
             }
         );
 
-        // Clear
-        this.userLogout();
+        // Clear, noTrigger = true, avoid state update
+        this.userLogout(true, true);
 
         // Go to login page
-        this.toLoginPage();
+        this.toLoginPage(false, true);
     }
 
     /**
      * Go to the login page
      * @param tryLogin Try to login again
+     * @param removeUrl Remove current URL for reuse
      */
-    toLoginPage(tryLogin?: boolean) {
+    toLoginPage(tryLogin?: boolean, removeUrl?: boolean) {
         const url =
-            '/?url=' +
-            encodeURIComponent(location.href) +
-            (tryLogin ? '' : '&tryLogin=false');
+            `/?tryLogin=${tryLogin ?? false}` +
+            (removeUrl ? '' : '&url=' + encodeURIComponent(location.href));
+
         this.navigate(url);
     }
 
@@ -1709,8 +1710,9 @@ export abstract class CoreApp<
     /**
      * User logout
      * @param clearToken Clear refresh token or not
+     * @param noTrigger No trigger for state change
      */
-    userLogout(clearToken: boolean = true) {
+    userLogout(clearToken: boolean = true, noTrigger: boolean = false) {
         this.authorize(undefined, clearToken ? undefined : '');
     }
 

package/src/app/IApp.ts

@@ -607,7 +607,7 @@ export interface IApp {
     ): Promise<boolean>;
 
     /**
-     * Signout
+     * Signout, with userLogout and toLoginPage
      */
     signout(): Promise<void>;
 
@@ -619,8 +619,9 @@ export interface IApp {
     /**
      * Go to the login page
      * @param tryLogin Try to login again
+     * @param removeUrl Remove current URL for reuse
      */
-    toLoginPage(tryLogin?: boolean): void;
+    toLoginPage(tryLogin?: boolean, removeUrl?: boolean): void;
 
     /**
      * Try login, returning false means is loading
@@ -640,8 +641,9 @@ export interface IApp {
     /**
      * User logout
      * @param clearToken Clear refresh token or not
+     * @param noTrigger No trigger for state change
      */
-    userLogout(clearToken: boolean): void;
+    userLogout(clearToken: boolean, noTrigger?: boolean): void;
 
     /**
      * User unauthorized