@etsoo/appscript 1.6.7 → 1.6.9

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/api/AuthApi.d.ts

@@ -58,11 +58,12 @@ export declare class AuthApi extends BaseApi {
     exchangeToken(rq: TokenInputRQ, payload?: IApiPayload<ApiRefreshTokenDto>): Promise<ApiRefreshTokenDto | undefined>;
     /**
      * Get log in url
+     * @param deviceId Device ID
      * @param payload Payload
      * @param apiHost API host
      * @returns Result
      */
-    getLogInUrl(payload?: IApiPayload<string>, apiHost?: string): Promise<string | undefined>;
+    getLogInUrl(deviceId?: string, payload?: IApiPayload<string>, apiHost?: string): Promise<string | undefined>;
     /**
      * Login
      * @param rq Request data

package/lib/cjs/api/AuthApi.js

@@ -69,14 +69,15 @@ class AuthApi extends BaseApi_1.BaseApi {
     }
     /**
      * Get log in url
+     * @param deviceId Device ID
      * @param payload Payload
      * @param apiHost API host
      * @returns Result
      */
-    getLogInUrl(payload, apiHost) {
+    getLogInUrl(deviceId, payload, apiHost) {
         const rq = {
             region: this.app.region,
-            device: this.app.deviceId
+            device: deviceId ?? this.app.deviceId
         };
         return this.api.get(`${apiHost ?? ""}Auth/GetLogInUrl`, rq, payload);
     }

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

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

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
      */

package/lib/mjs/api/AuthApi.d.ts

@@ -58,11 +58,12 @@ export declare class AuthApi extends BaseApi {
     exchangeToken(rq: TokenInputRQ, payload?: IApiPayload<ApiRefreshTokenDto>): Promise<ApiRefreshTokenDto | undefined>;
     /**
      * Get log in url
+     * @param deviceId Device ID
      * @param payload Payload
      * @param apiHost API host
      * @returns Result
      */
-    getLogInUrl(payload?: IApiPayload<string>, apiHost?: string): Promise<string | undefined>;
+    getLogInUrl(deviceId?: string, payload?: IApiPayload<string>, apiHost?: string): Promise<string | undefined>;
     /**
      * Login
      * @param rq Request data

package/lib/mjs/api/AuthApi.js

@@ -66,14 +66,15 @@ export class AuthApi extends BaseApi {
     }
     /**
      * Get log in url
+     * @param deviceId Device ID
      * @param payload Payload
      * @param apiHost API host
      * @returns Result
      */
-    getLogInUrl(payload, apiHost) {
+    getLogInUrl(deviceId, payload, apiHost) {
         const rq = {
             region: this.app.region,
-            device: this.app.deviceId
+            device: deviceId ?? this.app.deviceId
         };
         return this.api.get(`${apiHost ?? ""}Auth/GetLogInUrl`, rq, payload);
     }

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

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

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
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/appscript",
-  "version": "1.6.7",
+  "version": "1.6.9",
   "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/api/AuthApi.ts

@@ -101,14 +101,19 @@ export class AuthApi extends BaseApi {
 
   /**
    * Get log in url
+   * @param deviceId Device ID
    * @param payload Payload
    * @param apiHost API host
    * @returns Result
    */
-  getLogInUrl(payload?: IApiPayload<string>, apiHost?: string) {
+  getLogInUrl(
+    deviceId?: string,
+    payload?: IApiPayload<string>,
+    apiHost?: string
+  ) {
     const rq: GetLogInUrlRQ = {
       region: this.app.region,
-      device: this.app.deviceId
+      device: deviceId ?? this.app.deviceId
     };
     return this.api.get(`${apiHost ?? ""}Auth/GetLogInUrl`, rq, payload);
   }

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

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
    */