@etsoo/appscript 1.1.76 → 1.1.80

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

@@ -302,8 +302,9 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
      * User login
      * @param user User data
      * @param refreshToken Refresh token
+     * @param keep Keep login or not
      */
-    userLogin(user: IUserData, refreshToken: string): void;
+    userLogin(user: IUserData, refreshToken: string, keep?: boolean): void;
     /**
      * User logout
      * @param clearToken Clear refresh token or not
@@ -405,6 +406,7 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      * Passphrase for encryption
      */
     protected passphrase: string;
+    private cachedRefreshToken?;
     /**
      * Protected constructor
      * @param settings Settings
@@ -649,8 +651,9 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      * User login
      * @param user User data
      * @param refreshToken Refresh token
+     * @param keep Keep login or not
      */
-    userLogin(user: IUserData, refreshToken: string): void;
+    userLogin(user: IUserData, refreshToken: string, keep?: boolean): void;
     /**
      * User logout
      * @param clearToken Clear refresh token or not

package/lib/cjs/app/CoreApp.js

@@ -252,8 +252,10 @@ class CoreApp {
         // Token countdown
         if (this.authorized)
             this.refreshCountdown(this.userData.seconds);
-        else
+        else {
+            this.cachedRefreshToken = undefined;
             this.refreshCountdownClear();
+        }
     }
     /**
      * Change country or region
@@ -315,7 +317,8 @@ class CoreApp {
      * Clear cached token
      */
     clearCacheToken() {
-        shared_1.StorageUtils.setLocalData(this.headerTokenField, null);
+        this.cachedRefreshToken = undefined;
+        shared_1.StorageUtils.setLocalData(this.headerTokenField, undefined);
     }
     /**
      * Decrypt message
@@ -560,6 +563,9 @@ class CoreApp {
      * @returns Cached token
      */
     getCacheToken() {
+        // Temp refresh token
+        if (this.cachedRefreshToken)
+            return this.cachedRefreshToken;
         const refreshToken = shared_1.StorageUtils.getLocalData(this.headerTokenField, '');
         if (refreshToken === '')
             return null;
@@ -740,7 +746,7 @@ class CoreApp {
             return url;
         // From relative root, like home:/react/, url: /about => /react/about
         if (url.startsWith('/'))
-            return home + url.substr(1);
+            return home + url.substring(1);
         const pathname = window.location.pathname;
         // Relative
         const pos = pathname.indexOf(home);
@@ -764,10 +770,17 @@ class CoreApp {
      * User login
      * @param user User data
      * @param refreshToken Refresh token
+     * @param keep Keep login or not
      */
-    userLogin(user, refreshToken) {
+    userLogin(user, refreshToken, keep) {
         this.userData = user;
-        this.authorize(user.token, refreshToken);
+        if (keep) {
+            this.authorize(user.token, refreshToken);
+        }
+        else {
+            this.cachedRefreshToken = refreshToken;
+            this.authorize(user.token, undefined);
+        }
     }
     /**
      * User logout

package/lib/cjs/state/User.d.ts

@@ -28,6 +28,10 @@ export interface IUserData {
      */
     readonly token: string;
 }
+/**
+ * User data property keys
+ */
+export declare type UserKey = keyof IUserData;
 /**
  * User interface
  */
@@ -36,4 +40,8 @@ export interface IUser extends IUserData, IState {
      * Authorized or not
      */
     authorized: boolean;
+    /**
+     * Last update changed fields
+     */
+    lastChangedFields?: UserKey[];
 }

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

@@ -302,8 +302,9 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
      * User login
      * @param user User data
      * @param refreshToken Refresh token
+     * @param keep Keep login or not
      */
-    userLogin(user: IUserData, refreshToken: string): void;
+    userLogin(user: IUserData, refreshToken: string, keep?: boolean): void;
     /**
      * User logout
      * @param clearToken Clear refresh token or not
@@ -405,6 +406,7 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      * Passphrase for encryption
      */
     protected passphrase: string;
+    private cachedRefreshToken?;
     /**
      * Protected constructor
      * @param settings Settings
@@ -649,8 +651,9 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      * User login
      * @param user User data
      * @param refreshToken Refresh token
+     * @param keep Keep login or not
      */
-    userLogin(user: IUserData, refreshToken: string): void;
+    userLogin(user: IUserData, refreshToken: string, keep?: boolean): void;
     /**
      * User logout
      * @param clearToken Clear refresh token or not

package/lib/mjs/app/CoreApp.js

@@ -249,8 +249,10 @@ export class CoreApp {
         // Token countdown
         if (this.authorized)
             this.refreshCountdown(this.userData.seconds);
-        else
+        else {
+            this.cachedRefreshToken = undefined;
             this.refreshCountdownClear();
+        }
     }
     /**
      * Change country or region
@@ -312,7 +314,8 @@ export class CoreApp {
      * Clear cached token
      */
     clearCacheToken() {
-        StorageUtils.setLocalData(this.headerTokenField, null);
+        this.cachedRefreshToken = undefined;
+        StorageUtils.setLocalData(this.headerTokenField, undefined);
     }
     /**
      * Decrypt message
@@ -557,6 +560,9 @@ export class CoreApp {
      * @returns Cached token
      */
     getCacheToken() {
+        // Temp refresh token
+        if (this.cachedRefreshToken)
+            return this.cachedRefreshToken;
         const refreshToken = StorageUtils.getLocalData(this.headerTokenField, '');
         if (refreshToken === '')
             return null;
@@ -737,7 +743,7 @@ export class CoreApp {
             return url;
         // From relative root, like home:/react/, url: /about => /react/about
         if (url.startsWith('/'))
-            return home + url.substr(1);
+            return home + url.substring(1);
         const pathname = window.location.pathname;
         // Relative
         const pos = pathname.indexOf(home);
@@ -761,10 +767,17 @@ export class CoreApp {
      * User login
      * @param user User data
      * @param refreshToken Refresh token
+     * @param keep Keep login or not
      */
-    userLogin(user, refreshToken) {
+    userLogin(user, refreshToken, keep) {
         this.userData = user;
-        this.authorize(user.token, refreshToken);
+        if (keep) {
+            this.authorize(user.token, refreshToken);
+        }
+        else {
+            this.cachedRefreshToken = refreshToken;
+            this.authorize(user.token, undefined);
+        }
     }
     /**
      * User logout

package/lib/mjs/state/User.d.ts

@@ -28,6 +28,10 @@ export interface IUserData {
      */
     readonly token: string;
 }
+/**
+ * User data property keys
+ */
+export declare type UserKey = keyof IUserData;
 /**
  * User interface
  */
@@ -36,4 +40,8 @@ export interface IUser extends IUserData, IState {
      * Authorized or not
      */
     authorized: boolean;
+    /**
+     * Last update changed fields
+     */
+    lastChangedFields?: UserKey[];
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.1.76",
+    "version": "1.1.80",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -54,24 +54,24 @@
     "dependencies": {
         "@etsoo/notificationbase": "^1.0.94",
         "@etsoo/restclient": "^1.0.62",
-        "@etsoo/shared": "^1.0.76",
+        "@etsoo/shared": "^1.0.78",
         "@types/crypto-js": "^4.0.2",
         "crypto-js": "^4.1.1"
     },
     "devDependencies": {
         "@babel/cli": "^7.16.0",
-        "@babel/core": "^7.16.0",
-        "@babel/plugin-transform-runtime": "^7.16.4",
-        "@babel/preset-env": "^7.16.4",
-        "@babel/runtime-corejs3": "^7.16.3",
+        "@babel/core": "^7.16.5",
+        "@babel/plugin-transform-runtime": "^7.16.5",
+        "@babel/preset-env": "^7.16.5",
+        "@babel/runtime-corejs3": "^7.16.5",
         "@types/jest": "^27.0.3",
-        "@typescript-eslint/eslint-plugin": "^5.6.0",
-        "@typescript-eslint/parser": "^5.6.0",
-        "eslint": "^8.4.1",
+        "@typescript-eslint/eslint-plugin": "^5.7.0",
+        "@typescript-eslint/parser": "^5.7.0",
+        "eslint": "^8.5.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.25.3",
-        "jest": "^27.4.4",
-        "ts-jest": "^27.1.1",
-        "typescript": "^4.5.3"
+        "jest": "^27.4.5",
+        "ts-jest": "^27.1.2",
+        "typescript": "^4.5.4"
     }
 }

package/src/app/CoreApp.ts

@@ -411,8 +411,9 @@ export interface ICoreApp<
      * User login
      * @param user User data
      * @param refreshToken Refresh token
+     * @param keep Keep login or not
      */
-    userLogin(user: IUserData, refreshToken: string): void;
+    userLogin(user: IUserData, refreshToken: string, keep?: boolean): void;
 
     /**
      * User logout
@@ -561,6 +562,8 @@ export abstract class CoreApp<
      */
     protected passphrase: string = '***';
 
+    private cachedRefreshToken?: string;
+
     /**
      * Protected constructor
      * @param settings Settings
@@ -777,12 +780,16 @@ export abstract class CoreApp<
             if (refreshToken != null) refreshToken = this.encrypt(refreshToken);
             StorageUtils.setLocalData(this.headerTokenField, refreshToken);
         }
+
         // Reset tryLogin state
         this._isTryingLogin = false;
 
         // Token countdown
         if (this.authorized) this.refreshCountdown(this.userData!.seconds);
-        else this.refreshCountdownClear();
+        else {
+            this.cachedRefreshToken = undefined;
+            this.refreshCountdownClear();
+        }
     }
 
     /**
@@ -858,7 +865,8 @@ export abstract class CoreApp<
      * Clear cached token
      */
     clearCacheToken() {
-        StorageUtils.setLocalData(this.headerTokenField, null);
+        this.cachedRefreshToken = undefined;
+        StorageUtils.setLocalData(this.headerTokenField, undefined);
     }
 
     /**
@@ -1162,6 +1170,9 @@ export abstract class CoreApp<
      * @returns Cached token
      */
     getCacheToken(): string | null {
+        // Temp refresh token
+        if (this.cachedRefreshToken) return this.cachedRefreshToken;
+
         const refreshToken = StorageUtils.getLocalData<string>(
             this.headerTokenField,
             ''
@@ -1364,7 +1375,7 @@ export abstract class CoreApp<
         if (home === '') return url;
 
         // From relative root, like home:/react/, url: /about => /react/about
-        if (url.startsWith('/')) return home + url.substr(1);
+        if (url.startsWith('/')) return home + url.substring(1);
 
         const pathname = window.location.pathname;
 
@@ -1391,10 +1402,17 @@ export abstract class CoreApp<
      * User login
      * @param user User data
      * @param refreshToken Refresh token
+     * @param keep Keep login or not
      */
-    userLogin(user: IUserData, refreshToken: string) {
+    userLogin(user: IUserData, refreshToken: string, keep?: boolean) {
         this.userData = user;
-        this.authorize(user.token, refreshToken);
+
+        if (keep) {
+            this.authorize(user.token, refreshToken);
+        } else {
+            this.cachedRefreshToken = refreshToken;
+            this.authorize(user.token, undefined);
+        }
     }
 
     /**

package/src/state/User.ts

@@ -35,6 +35,11 @@ export interface IUserData {
     readonly token: string;
 }
 
+/**
+ * User data property keys
+ */
+export type UserKey = keyof IUserData;
+
 /**
  * User interface
  */
@@ -43,4 +48,9 @@ export interface IUser extends IUserData, IState {
      * Authorized or not
      */
     authorized: boolean;
+
+    /**
+     * Last update changed fields
+     */
+    lastChangedFields?: UserKey[];
 }