@etsoo/appscript 1.5.29 → 1.5.31

package/lib/cjs/app/CoreApp.js

@@ -1549,13 +1549,19 @@ class CoreApp {
      * @param apiUrl Signout API URL
      */
     async signout() {
-        await this.api.put('User/Signout', { deviceId: this.deviceId }, {
-            onError: (error) => {
-                console.error('CoreApp.signout error', error);
-                // Prevent further processing
-                return false;
-            }
-        });
+        const token = this.getCacheToken();
+        if (token) {
+            await this.api.put('Auth/Signout', {
+                deviceId: this.deviceId,
+                token: this.encrypt(token)
+            }, {
+                onError: (error) => {
+                    console.error('CoreApp.signout error', error);
+                    // Prevent further processing
+                    return false;
+                }
+            });
+        }
         // Clear, noTrigger = true, avoid state update
         this.userLogout(true, true);
         // Go to login page

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

@@ -17,11 +17,6 @@ export declare class AuthApi extends BaseApi {
      * @returns Result
      */
     protected loginBase<T extends IUser>(rq: LoginRQ, payload?: IApiPayload<IActionResult<T>>, tokenKey?: string): Promise<[IActionResult<T> | undefined, string | null]>;
-    /**
-     * Get log in url
-     * @returns Url
-     */
-    getLogInUrl(): Promise<string | undefined>;
     /**
      * Login id check
      * @param id Check id
@@ -29,10 +24,6 @@ export declare class AuthApi extends BaseApi {
      * @returns Result
      */
     loginId(id: string, payload?: ResultPayload): Promise<IActionResult<{}> | undefined>;
-    /**
-     * Redirect to log in url
-     */
-    redirectToLogInUrl(): Promise<void>;
     /**
      * Reset password
      * @param rq Request data

package/lib/cjs/erp/AuthApi.js

@@ -21,16 +21,6 @@ class AuthApi extends BaseApi_1.BaseApi {
             : null;
         return [result, refreshToken];
     }
-    /**
-     * Get log in url
-     * @returns Url
-     */
-    getLogInUrl() {
-        return this.api.get('Auth/GetLogInUrl', {
-            region: this.app.region,
-            device: this.app.deviceId
-        });
-    }
     /**
      * Login id check
      * @param id Check id
@@ -47,15 +37,6 @@ class AuthApi extends BaseApi_1.BaseApi {
         };
         return this.api.post('Auth/LoginId', rq, payload);
     }
-    /**
-     * Redirect to log in url
-     */
-    async redirectToLogInUrl() {
-        const url = await this.getLogInUrl();
-        if (url == null)
-            return;
-        globalThis.location.replace(url);
-    }
     /**
      * Reset password
      * @param rq Request data

package/lib/mjs/app/CoreApp.js

@@ -1546,13 +1546,19 @@ export class CoreApp {
      * @param apiUrl Signout API URL
      */
     async signout() {
-        await this.api.put('User/Signout', { deviceId: this.deviceId }, {
-            onError: (error) => {
-                console.error('CoreApp.signout error', error);
-                // Prevent further processing
-                return false;
-            }
-        });
+        const token = this.getCacheToken();
+        if (token) {
+            await this.api.put('Auth/Signout', {
+                deviceId: this.deviceId,
+                token: this.encrypt(token)
+            }, {
+                onError: (error) => {
+                    console.error('CoreApp.signout error', error);
+                    // Prevent further processing
+                    return false;
+                }
+            });
+        }
         // Clear, noTrigger = true, avoid state update
         this.userLogout(true, true);
         // Go to login page

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

@@ -17,11 +17,6 @@ export declare class AuthApi extends BaseApi {
      * @returns Result
      */
     protected loginBase<T extends IUser>(rq: LoginRQ, payload?: IApiPayload<IActionResult<T>>, tokenKey?: string): Promise<[IActionResult<T> | undefined, string | null]>;
-    /**
-     * Get log in url
-     * @returns Url
-     */
-    getLogInUrl(): Promise<string | undefined>;
     /**
      * Login id check
      * @param id Check id
@@ -29,10 +24,6 @@ export declare class AuthApi extends BaseApi {
      * @returns Result
      */
     loginId(id: string, payload?: ResultPayload): Promise<IActionResult<{}> | undefined>;
-    /**
-     * Redirect to log in url
-     */
-    redirectToLogInUrl(): Promise<void>;
     /**
      * Reset password
      * @param rq Request data

package/lib/mjs/erp/AuthApi.js

@@ -18,16 +18,6 @@ export class AuthApi extends BaseApi {
             : null;
         return [result, refreshToken];
     }
-    /**
-     * Get log in url
-     * @returns Url
-     */
-    getLogInUrl() {
-        return this.api.get('Auth/GetLogInUrl', {
-            region: this.app.region,
-            device: this.app.deviceId
-        });
-    }
     /**
      * Login id check
      * @param id Check id
@@ -44,15 +34,6 @@ export class AuthApi extends BaseApi {
         };
         return this.api.post('Auth/LoginId', rq, payload);
     }
-    /**
-     * Redirect to log in url
-     */
-    async redirectToLogInUrl() {
-        const url = await this.getLogInUrl();
-        if (url == null)
-            return;
-        globalThis.location.replace(url);
-    }
     /**
      * Reset password
      * @param rq Request data

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.5.29",
+    "version": "1.5.31",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",

package/src/app/CoreApp.ts

@@ -2126,17 +2126,23 @@ export abstract class CoreApp<
      * @param apiUrl Signout API URL
      */
     async signout() {
-        await this.api.put<boolean>(
-            'User/Signout',
-            { deviceId: this.deviceId },
-            {
-                onError: (error) => {
-                    console.error('CoreApp.signout error', error);
-                    // Prevent further processing
-                    return false;
+        const token = this.getCacheToken();
+        if (token) {
+            await this.api.put<boolean>(
+                'Auth/Signout',
+                {
+                    deviceId: this.deviceId,
+                    token: this.encrypt(token)
+                },
+                {
+                    onError: (error) => {
+                        console.error('CoreApp.signout error', error);
+                        // Prevent further processing
+                        return false;
+                    }
                 }
-            }
-        );
+            );
+        }
 
         // Clear, noTrigger = true, avoid state update
         this.userLogout(true, true);

package/src/erp/AuthApi.ts

@@ -31,17 +31,6 @@ export class AuthApi extends BaseApi {
         return [result, refreshToken];
     }
 
-    /**
-     * Get log in url
-     * @returns Url
-     */
-    getLogInUrl() {
-        return this.api.get<string>('Auth/GetLogInUrl', {
-            region: this.app.region,
-            device: this.app.deviceId
-        });
-    }
-
     /**
      * Login id check
      * @param id Check id
@@ -59,15 +48,6 @@ export class AuthApi extends BaseApi {
         return this.api.post('Auth/LoginId', rq, payload);
     }
 
-    /**
-     * Redirect to log in url
-     */
-    async redirectToLogInUrl() {
-        const url = await this.getLogInUrl();
-        if (url == null) return;
-        globalThis.location.replace(url);
-    }
-
     /**
      * Reset password
      * @param rq Request data