@etsoo/appscript 1.1.9 → 1.1.13

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

@@ -147,6 +147,20 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
      * Callback where exit a page
      */
     pageExit(): void;
+    /**
+     * Refresh countdown
+     * @param seconds Seconds
+     */
+    refreshCountdown(seconds: number): void;
+    /**
+     * Fresh countdown UI
+     * @param callback Callback
+     */
+    freshCountdownUI(callback: () => void): void;
+    /**
+     * Refresh token
+     */
+    refreshToken(): Promise<boolean>;
     /**
      * Transform URL
      * @param url URL
@@ -228,6 +242,8 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
     get authorized(): boolean;
     private set authorized(value);
     private _isTryingLogin;
+    private _lastCalled;
+    private _refreshCountdownSeed;
     /**
      * Protected constructor
      * @param settings Settings
@@ -330,6 +346,20 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      * Callback where exit a page
      */
     pageExit(): void;
+    /**
+     * Refresh countdown
+     * @param seconds Seconds
+     */
+    refreshCountdown(seconds: number): void;
+    /**
+     * Fresh countdown UI
+     * @param callback Callback
+     */
+    abstract freshCountdownUI(callback: () => void): void;
+    /**
+     * Refresh token
+     */
+    refreshToken(): Promise<boolean>;
     /**
      * Setup callback
      */

package/lib/cjs/app/CoreApp.js

@@ -21,6 +21,8 @@ class CoreApp {
         this.headerTokenField = 'SmartERPRefreshToken';
         this._authorized = false;
         this._isTryingLogin = false;
+        this._lastCalled = false;
+        this._refreshCountdownSeed = 0;
         // onRequest, show loading or not, rewrite the property to override default action
         api.onRequest = (data) => {
             if (data.showLoading == null || data.showLoading) {
@@ -32,6 +34,7 @@ class CoreApp {
             if (data.showLoading == null || data.showLoading) {
                 notifier.hideLoading();
             }
+            this._lastCalled = true;
         };
         // Global API error handler
         api.onError = (error) => {
@@ -305,6 +308,40 @@ class CoreApp {
      * Callback where exit a page
      */
     pageExit() { }
+    /**
+     * Refresh countdown
+     * @param seconds Seconds
+     */
+    refreshCountdown(seconds) {
+        // Make sure is big than 60 seconds
+        // Take action 60 seconds before expiry
+        seconds -= 60;
+        if (seconds <= 0)
+            return;
+        // Clear the current timeout seed
+        if (this._refreshCountdownSeed > 0) {
+            window.clearTimeout(this._refreshCountdownSeed);
+        }
+        // Reset last call flag
+        // Any success call will update it to true
+        this._lastCalled = false;
+        this._refreshCountdownSeed = window.setTimeout(() => {
+            if (this._lastCalled) {
+                // Call refreshToken to update access token
+                this.refreshToken();
+            }
+            else {
+                // Popup countdown for user action
+                this.freshCountdownUI(() => this.refreshToken());
+            }
+        }, 1000 * seconds);
+    }
+    /**
+     * Refresh token
+     */
+    async refreshToken() {
+        return true;
+    }
     /**
      * Setup callback
      */

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

@@ -147,6 +147,20 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
      * Callback where exit a page
      */
     pageExit(): void;
+    /**
+     * Refresh countdown
+     * @param seconds Seconds
+     */
+    refreshCountdown(seconds: number): void;
+    /**
+     * Fresh countdown UI
+     * @param callback Callback
+     */
+    freshCountdownUI(callback: () => void): void;
+    /**
+     * Refresh token
+     */
+    refreshToken(): Promise<boolean>;
     /**
      * Transform URL
      * @param url URL
@@ -228,6 +242,8 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
     get authorized(): boolean;
     private set authorized(value);
     private _isTryingLogin;
+    private _lastCalled;
+    private _refreshCountdownSeed;
     /**
      * Protected constructor
      * @param settings Settings
@@ -330,6 +346,20 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      * Callback where exit a page
      */
     pageExit(): void;
+    /**
+     * Refresh countdown
+     * @param seconds Seconds
+     */
+    refreshCountdown(seconds: number): void;
+    /**
+     * Fresh countdown UI
+     * @param callback Callback
+     */
+    abstract freshCountdownUI(callback: () => void): void;
+    /**
+     * Refresh token
+     */
+    refreshToken(): Promise<boolean>;
     /**
      * Setup callback
      */

package/lib/mjs/app/CoreApp.js

@@ -18,6 +18,8 @@ export class CoreApp {
         this.headerTokenField = 'SmartERPRefreshToken';
         this._authorized = false;
         this._isTryingLogin = false;
+        this._lastCalled = false;
+        this._refreshCountdownSeed = 0;
         // onRequest, show loading or not, rewrite the property to override default action
         api.onRequest = (data) => {
             if (data.showLoading == null || data.showLoading) {
@@ -29,6 +31,7 @@ export class CoreApp {
             if (data.showLoading == null || data.showLoading) {
                 notifier.hideLoading();
             }
+            this._lastCalled = true;
         };
         // Global API error handler
         api.onError = (error) => {
@@ -302,6 +305,40 @@ export class CoreApp {
      * Callback where exit a page
      */
     pageExit() { }
+    /**
+     * Refresh countdown
+     * @param seconds Seconds
+     */
+    refreshCountdown(seconds) {
+        // Make sure is big than 60 seconds
+        // Take action 60 seconds before expiry
+        seconds -= 60;
+        if (seconds <= 0)
+            return;
+        // Clear the current timeout seed
+        if (this._refreshCountdownSeed > 0) {
+            window.clearTimeout(this._refreshCountdownSeed);
+        }
+        // Reset last call flag
+        // Any success call will update it to true
+        this._lastCalled = false;
+        this._refreshCountdownSeed = window.setTimeout(() => {
+            if (this._lastCalled) {
+                // Call refreshToken to update access token
+                this.refreshToken();
+            }
+            else {
+                // Popup countdown for user action
+                this.freshCountdownUI(() => this.refreshToken());
+            }
+        }, 1000 * seconds);
+    }
+    /**
+     * Refresh token
+     */
+    async refreshToken() {
+        return true;
+    }
     /**
      * Setup callback
      */

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.1.9",
+    "version": "1.1.13",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -47,9 +47,9 @@
     },
     "homepage": "https://github.com/ETSOO/NotificationBase#readme",
     "dependencies": {
-        "@etsoo/notificationbase": "^1.0.84",
-        "@etsoo/restclient": "^1.0.54",
-        "@etsoo/shared": "^1.0.51"
+        "@etsoo/notificationbase": "^1.0.86",
+        "@etsoo/restclient": "^1.0.55",
+        "@etsoo/shared": "^1.0.53"
     },
     "devDependencies": {
         "@babel/cli": "^7.15.7",
@@ -58,13 +58,13 @@
         "@babel/preset-env": "^7.15.8",
         "@babel/runtime-corejs3": "^7.15.4",
         "@types/jest": "^27.0.2",
-        "@typescript-eslint/eslint-plugin": "^5.0.0",
-        "@typescript-eslint/parser": "^5.0.0",
+        "@typescript-eslint/eslint-plugin": "^5.1.0",
+        "@typescript-eslint/parser": "^5.1.0",
         "eslint": "^8.0.1",
         "eslint-config-airbnb-base": "^14.2.1",
         "eslint-plugin-import": "^2.25.2",
-        "jest": "^27.2.5",
-        "ts-jest": "^27.0.6",
+        "jest": "^27.3.0",
+        "ts-jest": "^27.0.7",
         "typescript": "^4.4.4"
     }
 }

package/src/app/CoreApp.ts

@@ -195,6 +195,23 @@ export interface ICoreApp<
      */
     pageExit(): void;
 
+    /**
+     * Refresh countdown
+     * @param seconds Seconds
+     */
+    refreshCountdown(seconds: number): void;
+
+    /**
+     * Fresh countdown UI
+     * @param callback Callback
+     */
+    freshCountdownUI(callback: () => void): void;
+
+    /**
+     * Refresh token
+     */
+    refreshToken(): Promise<boolean>;
+
     /**
      * Transform URL
      * @param url URL
@@ -313,6 +330,9 @@ export abstract class CoreApp<
 
     private _isTryingLogin = false;
 
+    private _lastCalled = false;
+    private _refreshCountdownSeed = 0;
+
     /**
      * Protected constructor
      * @param settings Settings
@@ -332,6 +352,7 @@ export abstract class CoreApp<
             if (data.showLoading == null || data.showLoading) {
                 notifier.hideLoading();
             }
+            this._lastCalled = true;
         };
 
         // Global API error handler
@@ -634,6 +655,49 @@ export abstract class CoreApp<
      */
     pageExit() {}
 
+    /**
+     * Refresh countdown
+     * @param seconds Seconds
+     */
+    refreshCountdown(seconds: number) {
+        // Make sure is big than 60 seconds
+        // Take action 60 seconds before expiry
+        seconds -= 60;
+        if (seconds <= 0) return;
+
+        // Clear the current timeout seed
+        if (this._refreshCountdownSeed > 0) {
+            window.clearTimeout(this._refreshCountdownSeed);
+        }
+
+        // Reset last call flag
+        // Any success call will update it to true
+        this._lastCalled = false;
+
+        this._refreshCountdownSeed = window.setTimeout(() => {
+            if (this._lastCalled) {
+                // Call refreshToken to update access token
+                this.refreshToken();
+            } else {
+                // Popup countdown for user action
+                this.freshCountdownUI(() => this.refreshToken());
+            }
+        }, 1000 * seconds);
+    }
+
+    /**
+     * Fresh countdown UI
+     * @param callback Callback
+     */
+    abstract freshCountdownUI(callback: () => void): void;
+
+    /**
+     * Refresh token
+     */
+    async refreshToken(): Promise<boolean> {
+        return true;
+    }
+
     /**
      * Setup callback
      */