@etsoo/appscript 1.6.8 → 1.6.10

package/README.md

@@ -140,8 +140,6 @@ $ yarn add @etsoo/appscript
 - InitCallResultData - Init call result data
 - InitCallResult - Init call result
 
-### erp - SmartERP APIs
-
 ### state - State management
 
 #### Culture.ts

package/__tests__/app/CoreApp.ts

@@ -260,3 +260,15 @@ test("Tests for isValidPassword", () => {
   expect(app.isValidPassword("abcd3")).toBeFalsy();
   expect(app.isValidPassword("1234abcd")).toBeTruthy();
 });
+
+test("Tests for checkSesession", async () => {
+  await app.checkSession((isSame) => {
+    expect(isSame).toBeFalsy();
+    return Promise.resolve();
+  });
+
+  await app.checkSession((isSame) => {
+    expect(isSame).toBeTruthy();
+    return Promise.resolve();
+  });
+});

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

@@ -200,6 +200,11 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @returns Result
      */
     addRootUrl(url: string): string;
+    /**
+     * Check current app is in same session
+     * @param callback Callback
+     */
+    checkSession(callback: (isSame: boolean) => Promise<void | false>): Promise<void>;
     /**
      * Create Auth API
      * @param api Specify the API to use
@@ -671,6 +676,11 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @returns Result
      */
     protected apiRefreshToken(api: IApi, rq: ApiRefreshTokenRQ): Promise<[string, number] | undefined>;
+    /**
+     * Save refresh token to cache
+     * @param token Refresh token
+     */
+    saveCacheToken(token: string | undefined): void;
     /**
      * Setup tasks
      */

package/lib/cjs/app/CoreApp.js

@@ -290,6 +290,22 @@ class CoreApp {
                     ? url
                     : "/" + url));
     }
+    /**
+     * Check current app is in same session
+     * @param callback Callback
+     */
+    async checkSession(callback) {
+        // Session name
+        const sessionName = this.addIdentifier("same-session");
+        // Current session
+        const isSame = this.storage.getData(sessionName) === true;
+        // Callback
+        const result = await callback(isSame);
+        if (!isSame && result !== false) {
+            // Set the session when the callback does not return false
+            this.storage.setData(sessionName, true);
+        }
+    }
     /**
      * Create Auth API
      * @param api Specify the API to use
@@ -722,9 +738,7 @@ class CoreApp {
         this.api.authorize(schema, token);
         // Overwrite the current value
         if (refreshToken !== "") {
-            if (refreshToken != null)
-                refreshToken = this.encrypt(refreshToken);
-            this.storage.setData(this.fields.headerToken, refreshToken);
+            this.saveCacheToken(refreshToken);
         }
         // Reset tryLogin state
         this._isTryingLogin = false;
@@ -1641,6 +1655,15 @@ class CoreApp {
         // Return the new refresh token and access token expiration seconds
         return [data.refreshToken, data.expiresIn];
     }
+    /**
+     * Save refresh token to cache
+     * @param token Refresh token
+     */
+    saveCacheToken(token) {
+        if (token != null)
+            token = this.encrypt(token);
+        this.storage.setData(this.fields.headerToken, token);
+    }
     /**
      * Setup tasks
      */

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

@@ -266,6 +266,11 @@ export interface IApp {
      * @returns Result
      */
     checkLanguage(language?: string): string;
+    /**
+     * Check current app is in same session
+     * @param callback Callback
+     */
+    checkSession(callback: (isSame: boolean) => Promise<void | false>): Promise<void>;
     /**
      * Clear cache data
      */
@@ -570,6 +575,11 @@ export interface IApp {
      * @param callback Callback
      */
     refreshToken(props?: RefreshTokenProps, callback?: (result?: boolean | IActionResult) => boolean | void): Promise<void>;
+    /**
+     * Save refresh token to cache
+     * @param token Refresh token
+     */
+    saveCacheToken(token: string | undefined): void;
     /**
      * Setup Api error handler
      * @param api Api

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

@@ -200,6 +200,11 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @returns Result
      */
     addRootUrl(url: string): string;
+    /**
+     * Check current app is in same session
+     * @param callback Callback
+     */
+    checkSession(callback: (isSame: boolean) => Promise<void | false>): Promise<void>;
     /**
      * Create Auth API
      * @param api Specify the API to use
@@ -671,6 +676,11 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @returns Result
      */
     protected apiRefreshToken(api: IApi, rq: ApiRefreshTokenRQ): Promise<[string, number] | undefined>;
+    /**
+     * Save refresh token to cache
+     * @param token Refresh token
+     */
+    saveCacheToken(token: string | undefined): void;
     /**
      * Setup tasks
      */

package/lib/mjs/app/CoreApp.js

@@ -287,6 +287,22 @@ export class CoreApp {
                     ? url
                     : "/" + url));
     }
+    /**
+     * Check current app is in same session
+     * @param callback Callback
+     */
+    async checkSession(callback) {
+        // Session name
+        const sessionName = this.addIdentifier("same-session");
+        // Current session
+        const isSame = this.storage.getData(sessionName) === true;
+        // Callback
+        const result = await callback(isSame);
+        if (!isSame && result !== false) {
+            // Set the session when the callback does not return false
+            this.storage.setData(sessionName, true);
+        }
+    }
     /**
      * Create Auth API
      * @param api Specify the API to use
@@ -719,9 +735,7 @@ export class CoreApp {
         this.api.authorize(schema, token);
         // Overwrite the current value
         if (refreshToken !== "") {
-            if (refreshToken != null)
-                refreshToken = this.encrypt(refreshToken);
-            this.storage.setData(this.fields.headerToken, refreshToken);
+            this.saveCacheToken(refreshToken);
         }
         // Reset tryLogin state
         this._isTryingLogin = false;
@@ -1638,6 +1652,15 @@ export class CoreApp {
         // Return the new refresh token and access token expiration seconds
         return [data.refreshToken, data.expiresIn];
     }
+    /**
+     * Save refresh token to cache
+     * @param token Refresh token
+     */
+    saveCacheToken(token) {
+        if (token != null)
+            token = this.encrypt(token);
+        this.storage.setData(this.fields.headerToken, token);
+    }
     /**
      * Setup tasks
      */

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

@@ -266,6 +266,11 @@ export interface IApp {
      * @returns Result
      */
     checkLanguage(language?: string): string;
+    /**
+     * Check current app is in same session
+     * @param callback Callback
+     */
+    checkSession(callback: (isSame: boolean) => Promise<void | false>): Promise<void>;
     /**
      * Clear cache data
      */
@@ -570,6 +575,11 @@ export interface IApp {
      * @param callback Callback
      */
     refreshToken(props?: RefreshTokenProps, callback?: (result?: boolean | IActionResult) => boolean | void): Promise<void>;
+    /**
+     * Save refresh token to cache
+     * @param token Refresh token
+     */
+    saveCacheToken(token: string | undefined): void;
     /**
      * Setup Api error handler
      * @param api Api

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/appscript",
-  "version": "1.6.8",
+  "version": "1.6.10",
   "description": "Applications shared TypeScript framework",
   "main": "lib/cjs/index.js",
   "module": "lib/mjs/index.js",
@@ -50,6 +50,6 @@
     "@vitejs/plugin-react": "^4.3.4",
     "jsdom": "^26.0.0",
     "typescript": "^5.7.3",
-    "vitest": "^3.0.5"
+    "vitest": "^3.0.6"
   }
 }

package/src/app/CoreApp.ts

@@ -509,6 +509,26 @@ export abstract class CoreApp<
     );
   }
 
+  /**
+   * Check current app is in same session
+   * @param callback Callback
+   */
+  async checkSession(callback: (isSame: boolean) => Promise<void | false>) {
+    // Session name
+    const sessionName = this.addIdentifier("same-session");
+
+    // Current session
+    const isSame = this.storage.getData<boolean>(sessionName) === true;
+
+    // Callback
+    const result = await callback(isSame);
+
+    if (!isSame && result !== false) {
+      // Set the session when the callback does not return false
+      this.storage.setData(sessionName, true);
+    }
+  }
+
   /**
    * Create Auth API
    * @param api Specify the API to use
@@ -1100,8 +1120,7 @@ export abstract class CoreApp<
 
     // Overwrite the current value
     if (refreshToken !== "") {
-      if (refreshToken != null) refreshToken = this.encrypt(refreshToken);
-      this.storage.setData(this.fields.headerToken, refreshToken);
+      this.saveCacheToken(refreshToken);
     }
 
     // Reset tryLogin state
@@ -2202,6 +2221,15 @@ export abstract class CoreApp<
     return [data.refreshToken, data.expiresIn];
   }
 
+  /**
+   * Save refresh token to cache
+   * @param token Refresh token
+   */
+  saveCacheToken(token: string | undefined) {
+    if (token != null) token = this.encrypt(token);
+    this.storage.setData(this.fields.headerToken, token);
+  }
+
   /**
    * Setup tasks
    */

package/src/app/IApp.ts

@@ -347,6 +347,14 @@ export interface IApp {
    */
   checkLanguage(language?: string): string;
 
+  /**
+   * Check current app is in same session
+   * @param callback Callback
+   */
+  checkSession(
+    callback: (isSame: boolean) => Promise<void | false>
+  ): Promise<void>;
+
   /**
    * Clear cache data
    */
@@ -757,6 +765,12 @@ export interface IApp {
     callback?: (result?: boolean | IActionResult) => boolean | void
   ): Promise<void>;
 
+  /**
+   * Save refresh token to cache
+   * @param token Refresh token
+   */
+  saveCacheToken(token: string | undefined): void;
+
   /**
    * Setup Api error handler
    * @param api Api