@etsoo/appscript 1.1.17 → 1.1.21

package/__tests__/result/ActionResult.ts

@@ -22,5 +22,5 @@ test('Tests for ActionResultError.format', () => {
 
     // Assert
     expect(error.name).toBe('ActionResultError');
-    expect(error.message).toBe(`${message}(${status}, ApiError)`);
+    expect(error.message).toBe(`${message} (${status}, ApiError)`);
 });

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

@@ -181,8 +181,13 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
     userLogin(user: IUserData, refreshToken?: string, keep?: boolean): void;
     /**
      * User logout
+     * @param clearToken Clear refresh token or not
      */
-    userLogout(): void;
+    userLogout(clearToken: boolean): void;
+    /**
+     * User unauthorized
+     */
+    userUnauthorized(): void;
 }
 /**
  * Core application
@@ -391,6 +396,11 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
     userLogin(user: IUserData, refreshToken?: string, keep?: boolean): void;
     /**
      * User logout
+     * @param clearToken Clear refresh token or not
+     */
+    userLogout(clearToken?: boolean): void;
+    /**
+     * User unauthorized
      */
-    userLogout(): void;
+    userUnauthorized(): void;
 }

package/lib/cjs/app/CoreApp.js

@@ -107,14 +107,16 @@ class CoreApp {
      * @param refreshToken Refresh token
      * @param keep Keep in local storage or not
      */
-    authorize(token, refreshToken, keep = false) {
+    authorize(token, refreshToken, keep) {
         // State, when token is null, means logout
         this.authorized = token != null;
         // Token
         this.api.authorize(this.settings.authScheme, token);
         // Cover the current value
-        shared_1.StorageUtils.setLocalData(this.headerTokenField, keep ? refreshToken : undefined);
-        shared_1.StorageUtils.setSessionData(this.headerTokenField, keep ? undefined : refreshToken);
+        if (keep != null) {
+            shared_1.StorageUtils.setLocalData(this.headerTokenField, keep ? refreshToken : undefined);
+            shared_1.StorageUtils.setSessionData(this.headerTokenField, keep ? undefined : refreshToken);
+        }
         // Reset tryLogin state
         this._isTryingLogin = false;
         // Token countdown
@@ -406,15 +408,22 @@ class CoreApp {
      * @param refreshToken Refresh token
      * @param keep Keep in local storage or not
      */
-    userLogin(user, refreshToken, keep) {
+    userLogin(user, refreshToken, keep = false) {
         this.userData = user;
         this.authorize(user.token, refreshToken, keep);
     }
     /**
      * User logout
+     * @param clearToken Clear refresh token or not
+     */
+    userLogout(clearToken = true) {
+        this.authorize(undefined, undefined, clearToken ? false : undefined);
+    }
+    /**
+     * User unauthorized
      */
-    userLogout() {
-        this.authorize(undefined, undefined);
+    userUnauthorized() {
+        this.authorize(undefined, undefined, undefined);
     }
 }
 exports.CoreApp = CoreApp;

package/lib/cjs/result/ActionResultError.js

@@ -28,7 +28,7 @@ class ActionResultError extends Error {
             addtions.push(result.status);
         if (result.type && result.type != 'about:blank')
             addtions.push(result.type);
-        var add = addtions.length > 0 ? `(${addtions.join(', ')})` : '';
+        var add = addtions.length > 0 ? ` (${addtions.join(', ')})` : '';
         return `${result.title || 'Error'}${add}`;
     }
 }

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

@@ -181,8 +181,13 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
     userLogin(user: IUserData, refreshToken?: string, keep?: boolean): void;
     /**
      * User logout
+     * @param clearToken Clear refresh token or not
      */
-    userLogout(): void;
+    userLogout(clearToken: boolean): void;
+    /**
+     * User unauthorized
+     */
+    userUnauthorized(): void;
 }
 /**
  * Core application
@@ -391,6 +396,11 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
     userLogin(user: IUserData, refreshToken?: string, keep?: boolean): void;
     /**
      * User logout
+     * @param clearToken Clear refresh token or not
+     */
+    userLogout(clearToken?: boolean): void;
+    /**
+     * User unauthorized
      */
-    userLogout(): void;
+    userUnauthorized(): void;
 }

package/lib/mjs/app/CoreApp.js

@@ -104,14 +104,16 @@ export class CoreApp {
      * @param refreshToken Refresh token
      * @param keep Keep in local storage or not
      */
-    authorize(token, refreshToken, keep = false) {
+    authorize(token, refreshToken, keep) {
         // State, when token is null, means logout
         this.authorized = token != null;
         // Token
         this.api.authorize(this.settings.authScheme, token);
         // Cover the current value
-        StorageUtils.setLocalData(this.headerTokenField, keep ? refreshToken : undefined);
-        StorageUtils.setSessionData(this.headerTokenField, keep ? undefined : refreshToken);
+        if (keep != null) {
+            StorageUtils.setLocalData(this.headerTokenField, keep ? refreshToken : undefined);
+            StorageUtils.setSessionData(this.headerTokenField, keep ? undefined : refreshToken);
+        }
         // Reset tryLogin state
         this._isTryingLogin = false;
         // Token countdown
@@ -403,14 +405,21 @@ export class CoreApp {
      * @param refreshToken Refresh token
      * @param keep Keep in local storage or not
      */
-    userLogin(user, refreshToken, keep) {
+    userLogin(user, refreshToken, keep = false) {
         this.userData = user;
         this.authorize(user.token, refreshToken, keep);
     }
     /**
      * User logout
+     * @param clearToken Clear refresh token or not
+     */
+    userLogout(clearToken = true) {
+        this.authorize(undefined, undefined, clearToken ? false : undefined);
+    }
+    /**
+     * User unauthorized
      */
-    userLogout() {
-        this.authorize(undefined, undefined);
+    userUnauthorized() {
+        this.authorize(undefined, undefined, undefined);
     }
 }

package/lib/mjs/result/ActionResultError.js

@@ -25,7 +25,7 @@ export class ActionResultError extends Error {
             addtions.push(result.status);
         if (result.type && result.type != 'about:blank')
             addtions.push(result.type);
-        var add = addtions.length > 0 ? `(${addtions.join(', ')})` : '';
+        var add = addtions.length > 0 ? ` (${addtions.join(', ')})` : '';
         return `${result.title || 'Error'}${add}`;
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.1.17",
+    "version": "1.1.21",
     "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.0.88",
-        "@etsoo/restclient": "^1.0.56",
-        "@etsoo/shared": "^1.0.55"
+        "@etsoo/notificationbase": "^1.0.89",
+        "@etsoo/restclient": "^1.0.57",
+        "@etsoo/shared": "^1.0.58"
     },
     "devDependencies": {
         "@babel/cli": "^7.15.7",
@@ -68,7 +68,7 @@
         "eslint": "^8.0.1",
         "eslint-config-airbnb-base": "^14.2.1",
         "eslint-plugin-import": "^2.25.2",
-        "jest": "^27.3.0",
+        "jest": "^27.3.1",
         "ts-jest": "^27.0.7",
         "typescript": "^4.4.4"
     }

package/src/app/CoreApp.ts

@@ -236,8 +236,14 @@ export interface ICoreApp<
 
     /**
      * User logout
+     * @param clearToken Clear refresh token or not
      */
-    userLogout(): void;
+    userLogout(clearToken: boolean): void;
+
+    /**
+     * User unauthorized
+     */
+    userUnauthorized(): void;
 }
 
 /**
@@ -400,7 +406,7 @@ export abstract class CoreApp<
      * @param refreshToken Refresh token
      * @param keep Keep in local storage or not
      */
-    authorize(token?: string, refreshToken?: string, keep: boolean = false) {
+    authorize(token?: string, refreshToken?: string, keep?: boolean) {
         // State, when token is null, means logout
         this.authorized = token != null;
 
@@ -408,14 +414,16 @@ export abstract class CoreApp<
         this.api.authorize(this.settings.authScheme, token);
 
         // Cover the current value
-        StorageUtils.setLocalData(
-            this.headerTokenField,
-            keep ? refreshToken : undefined
-        );
-        StorageUtils.setSessionData(
-            this.headerTokenField,
-            keep ? undefined : refreshToken
-        );
+        if (keep != null) {
+            StorageUtils.setLocalData(
+                this.headerTokenField,
+                keep ? refreshToken : undefined
+            );
+            StorageUtils.setSessionData(
+                this.headerTokenField,
+                keep ? undefined : refreshToken
+            );
+        }
 
         // Reset tryLogin state
         this._isTryingLogin = false;
@@ -769,15 +777,23 @@ export abstract class CoreApp<
      * @param refreshToken Refresh token
      * @param keep Keep in local storage or not
      */
-    userLogin(user: IUserData, refreshToken?: string, keep?: boolean) {
+    userLogin(user: IUserData, refreshToken?: string, keep: boolean = false) {
         this.userData = user;
         this.authorize(user.token, refreshToken, keep);
     }
 
     /**
      * User logout
+     * @param clearToken Clear refresh token or not
+     */
+    userLogout(clearToken: boolean = true) {
+        this.authorize(undefined, undefined, clearToken ? false : undefined);
+    }
+
+    /**
+     * User unauthorized
      */
-    userLogout() {
-        this.authorize(undefined, undefined);
+    userUnauthorized() {
+        this.authorize(undefined, undefined, undefined);
     }
 }

package/src/result/ActionResultError.ts

@@ -15,7 +15,7 @@ export class ActionResultError extends Error {
         if (result.type && result.type != 'about:blank')
             addtions.push(result.type);
 
-        var add = addtions.length > 0 ? `(${addtions.join(', ')})` : '';
+        var add = addtions.length > 0 ? ` (${addtions.join(', ')})` : '';
 
         return `${result.title || 'Error'}${add}`;
     }