@etsoo/appscript 1.6.11 → 1.6.13

package/__tests__/app/CoreApp.ts

@@ -271,4 +271,11 @@ test("Tests for checkSesession", async () => {
     expect(isSame).toBeTruthy();
     return Promise.resolve();
   });
+
+  app.clearSession();
+
+  await app.checkSession((isSame) => {
+    expect(isSame).toBeFalsy();
+    return Promise.resolve();
+  });
 });

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

@@ -71,8 +71,8 @@ export declare class AuthApi extends BaseApi {
      * @param tokenKey Refresh token key
      * @returns Result
      */
-    login<T extends IUser, A extends AuthRequest | undefined>(rq: LoginInputRQ, auth: A, payload?: IApiPayload<IActionResult<A extends undefined ? T : LoginInputAuthResult>>, tokenKey?: string): Promise<[
-        IActionResult<A extends undefined ? T : LoginInputAuthResult> | undefined,
+    login<T extends IUser>(rq: LoginInputRQ, payload?: IApiPayload<IActionResult<T | LoginInputAuthResult>>, tokenKey?: string): Promise<[
+        IActionResult<T | LoginInputAuthResult> | undefined,
         string | null
     ]>;
     /**

package/lib/cjs/api/AuthApi.js

@@ -88,13 +88,12 @@ class AuthApi extends BaseApi_1.BaseApi {
      * @param tokenKey Refresh token key
      * @returns Result
      */
-    async login(rq, auth, payload, tokenKey) {
+    async login(rq, payload, tokenKey) {
         // Default values
         payload ?? (payload = {});
         tokenKey ?? (tokenKey = AuthApi.HeaderTokenField);
         const data = {
             ...rq,
-            auth,
             deviceId: this.app.deviceId,
             region: this.app.region,
             timeZone: this.app.getTimeZone()

package/lib/cjs/api/rq/LoginRQ.d.ts

@@ -12,6 +12,10 @@ export type LoginInputRQ = LoginIdInputRQ & {
      * Organization
      */
     org?: number;
+    /**
+     * Authorization request data
+     */
+    auth?: AuthRequest;
 };
 /**
  * Login input auth result
@@ -25,9 +29,4 @@ export type LoginInputAuthResult = {
 /**
  * Login request data
  */
-export type LoginRQ = LoginIdRQ & LoginInputRQ & {
-    /**
-     * Authorization request data
-     */
-    auth?: AuthRequest;
-};
+export type LoginRQ = LoginIdRQ & LoginInputRQ;

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

@@ -205,6 +205,10 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @param callback Callback
      */
     checkSession(callback: (isSame: boolean) => Promise<void | false>): Promise<void>;
+    /**
+     * Clear user session
+     */
+    clearSession(): void;
     /**
      * Create Auth API
      * @param api Specify the API to use

package/lib/cjs/app/CoreApp.js

@@ -306,6 +306,12 @@ class CoreApp {
             this.storage.setData(sessionName, true);
         }
     }
+    /**
+     * Clear user session
+     */
+    clearSession() {
+        this.storage.setData(this.addIdentifier("same-session"), undefined);
+    }
     /**
      * Create Auth API
      * @param api Specify the API to use

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

@@ -283,6 +283,10 @@ export interface IApp {
      * Clear device id
      */
     clearDeviceId(): void;
+    /**
+     * Clear user session
+     */
+    clearSession(): void;
     /**
      * Create API client, override to implement custom client creation by name
      * @param name Client name

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

@@ -71,8 +71,8 @@ export declare class AuthApi extends BaseApi {
      * @param tokenKey Refresh token key
      * @returns Result
      */
-    login<T extends IUser, A extends AuthRequest | undefined>(rq: LoginInputRQ, auth: A, payload?: IApiPayload<IActionResult<A extends undefined ? T : LoginInputAuthResult>>, tokenKey?: string): Promise<[
-        IActionResult<A extends undefined ? T : LoginInputAuthResult> | undefined,
+    login<T extends IUser>(rq: LoginInputRQ, payload?: IApiPayload<IActionResult<T | LoginInputAuthResult>>, tokenKey?: string): Promise<[
+        IActionResult<T | LoginInputAuthResult> | undefined,
         string | null
     ]>;
     /**

package/lib/mjs/api/AuthApi.js

@@ -85,13 +85,12 @@ export class AuthApi extends BaseApi {
      * @param tokenKey Refresh token key
      * @returns Result
      */
-    async login(rq, auth, payload, tokenKey) {
+    async login(rq, payload, tokenKey) {
         // Default values
         payload ?? (payload = {});
         tokenKey ?? (tokenKey = AuthApi.HeaderTokenField);
         const data = {
             ...rq,
-            auth,
             deviceId: this.app.deviceId,
             region: this.app.region,
             timeZone: this.app.getTimeZone()

package/lib/mjs/api/rq/LoginRQ.d.ts

@@ -12,6 +12,10 @@ export type LoginInputRQ = LoginIdInputRQ & {
      * Organization
      */
     org?: number;
+    /**
+     * Authorization request data
+     */
+    auth?: AuthRequest;
 };
 /**
  * Login input auth result
@@ -25,9 +29,4 @@ export type LoginInputAuthResult = {
 /**
  * Login request data
  */
-export type LoginRQ = LoginIdRQ & LoginInputRQ & {
-    /**
-     * Authorization request data
-     */
-    auth?: AuthRequest;
-};
+export type LoginRQ = LoginIdRQ & LoginInputRQ;

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

@@ -205,6 +205,10 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @param callback Callback
      */
     checkSession(callback: (isSame: boolean) => Promise<void | false>): Promise<void>;
+    /**
+     * Clear user session
+     */
+    clearSession(): void;
     /**
      * Create Auth API
      * @param api Specify the API to use

package/lib/mjs/app/CoreApp.js

@@ -303,6 +303,12 @@ export class CoreApp {
             this.storage.setData(sessionName, true);
         }
     }
+    /**
+     * Clear user session
+     */
+    clearSession() {
+        this.storage.setData(this.addIdentifier("same-session"), undefined);
+    }
     /**
      * Create Auth API
      * @param api Specify the API to use

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

@@ -283,6 +283,10 @@ export interface IApp {
      * Clear device id
      */
     clearDeviceId(): void;
+    /**
+     * Clear user session
+     */
+    clearSession(): void;
     /**
      * Create API client, override to implement custom client creation by name
      * @param name Client name

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/appscript",
-  "version": "1.6.11",
+  "version": "1.6.13",
   "description": "Applications shared TypeScript framework",
   "main": "lib/cjs/index.js",
   "module": "lib/mjs/index.js",
@@ -35,9 +35,9 @@
   },
   "homepage": "https://github.com/ETSOO/AppScript#readme",
   "dependencies": {
-    "@etsoo/notificationbase": "^1.1.58",
-    "@etsoo/restclient": "^1.1.23",
-    "@etsoo/shared": "^1.2.61",
+    "@etsoo/notificationbase": "^1.1.59",
+    "@etsoo/restclient": "^1.1.24",
+    "@etsoo/shared": "^1.2.62",
     "crypto-js": "^4.2.0"
   },
   "devDependencies": {
@@ -50,6 +50,6 @@
     "@vitejs/plugin-react": "^4.3.4",
     "jsdom": "^26.0.0",
     "typescript": "^5.7.3",
-    "vitest": "^3.0.6"
+    "vitest": "^3.0.7"
   }
 }

package/src/api/AuthApi.ts

@@ -125,18 +125,12 @@ export class AuthApi extends BaseApi {
    * @param tokenKey Refresh token key
    * @returns Result
    */
-  async login<T extends IUser, A extends AuthRequest | undefined>(
+  async login<T extends IUser>(
     rq: LoginInputRQ,
-    auth: A,
-    payload?: IApiPayload<
-      IActionResult<A extends undefined ? T : LoginInputAuthResult>
-    >,
+    payload?: IApiPayload<IActionResult<T | LoginInputAuthResult>>,
     tokenKey?: string
   ): Promise<
-    [
-      IActionResult<A extends undefined ? T : LoginInputAuthResult> | undefined,
-      string | null
-    ]
+    [IActionResult<T | LoginInputAuthResult> | undefined, string | null]
   > {
     // Default values
     payload ??= {};
@@ -144,7 +138,6 @@ export class AuthApi extends BaseApi {
 
     const data: LoginRQ = {
       ...rq,
-      auth,
       deviceId: this.app.deviceId,
       region: this.app.region,
       timeZone: this.app.getTimeZone()

package/src/api/rq/LoginRQ.ts

@@ -14,6 +14,11 @@ export type LoginInputRQ = LoginIdInputRQ & {
    * Organization
    */
   org?: number;
+
+  /**
+   * Authorization request data
+   */
+  auth?: AuthRequest;
 };
 
 /**
@@ -29,10 +34,4 @@ export type LoginInputAuthResult = {
 /**
  * Login request data
  */
-export type LoginRQ = LoginIdRQ &
-  LoginInputRQ & {
-    /**
-     * Authorization request data
-     */
-    auth?: AuthRequest;
-  };
+export type LoginRQ = LoginIdRQ & LoginInputRQ;

package/src/app/CoreApp.ts

@@ -529,6 +529,13 @@ export abstract class CoreApp<
     }
   }
 
+  /**
+   * Clear user session
+   */
+  clearSession() {
+    this.storage.setData(this.addIdentifier("same-session"), undefined);
+  }
+
   /**
    * Create Auth API
    * @param api Specify the API to use

package/src/app/IApp.ts

@@ -370,6 +370,11 @@ export interface IApp {
    */
   clearDeviceId(): void;
 
+  /**
+   * Clear user session
+   */
+  clearSession(): void;
+
   /**
    * Create API client, override to implement custom client creation by name
    * @param name Client name