@etsoo/appscript 1.1.87 → 1.1.91

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

@@ -280,9 +280,8 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
     refreshToken<D extends {} = {}>(props?: RefreshTokenProps<D>): Promise<boolean>;
     /**
      * Signout
-     * @param apiUrl Signout API URL
      */
-    signout(apiUrl?: string): Promise<void>;
+    signout(): Promise<void>;
     /**
      * Get organization list
      * @param items Max items
@@ -292,9 +291,10 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
     orgList(items?: number, serviceId?: number): Promise<IdLabelDto[] | undefined>;
     /**
      * Switch organization
-     * @param apiOrOrg API URL or organization id
+     * @param id Organization id
+     * @param serviceId Service id
      */
-    switchOrg(apiOrOrg: string | number): Promise<boolean | undefined>;
+    switchOrg(id: number, serviceId?: number): Promise<boolean | undefined>;
     /**
      * Go to the login page
      */
@@ -422,11 +422,15 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
     /**
      * Device id field name
      */
-    protected readonly deviceIdField: string;
+    private readonly deviceIdField;
+    /**
+     * Device passphrase field name
+     */
+    private readonly devicePassphraseField;
     /**
      * Device id update time field name
      */
-    protected readonly deviceIdUpdateTimeField: string;
+    private readonly deviceIdUpdateTimeField;
     /**
      * Init call Api URL
      */
@@ -445,6 +449,11 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      */
     protected constructor(settings: S, api: IApi, notifier: INotifier<N, C>, name: string);
     protected setApi(api: IApi): void;
+    /**
+     * Setup device
+     * @returns Device id
+     */
+    protected setupDevice(): string;
     /**
      * Api init call
      * @param data Data
@@ -669,7 +678,7 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      * Signout
      * @param apiUrl Signout API URL
      */
-    signout(apiUrl?: string): Promise<void>;
+    signout(): Promise<void>;
     /**
      * Get organization list
      * @param items Max items
@@ -680,8 +689,9 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
     /**
      * Switch organization
      * @param id Organization id
+     * @param serviceId Service id
      */
-    switchOrg(id: number): Promise<boolean | undefined>;
+    switchOrg(id: number, serviceId?: number): Promise<boolean | undefined>;
     /**
      * Go to the login page
      */

package/lib/cjs/app/CoreApp.js

@@ -43,6 +43,10 @@ class CoreApp {
          * Device id field name
          */
         this.deviceIdField = 'SmartERPDeviceId';
+        /**
+         * Device passphrase field name
+         */
+        this.devicePassphraseField = 'SmartERPDevicePassphrase';
         /**
          * Device id update time field name
          */
@@ -59,7 +63,7 @@ class CoreApp {
         this.api = api;
         this.notifier = notifier;
         this.name = name;
-        this.deviceId = shared_1.StorageUtils.getLocalData(this.deviceIdField, '');
+        this.deviceId = this.setupDevice();
         this.setApi(api);
         const { currentCulture, currentRegion } = settings;
         this.changeCulture(currentCulture);
@@ -157,6 +161,25 @@ class CoreApp {
             }
         };
     }
+    /**
+     * Setup device
+     * @returns Device id
+     */
+    setupDevice() {
+        const deviceId = shared_1.StorageUtils.getLocalData(this.deviceIdField);
+        if (deviceId != null && deviceId !== '') {
+            const passphraseEncrypted = shared_1.StorageUtils.getLocalData(this.devicePassphraseField);
+            if (passphraseEncrypted != null && passphraseEncrypted !== '') {
+                const timestamp = this.getDeviceUpdateTime();
+                if (timestamp > 0) {
+                    const passphraseDecrypted = this.decrypt(passphraseEncrypted, timestamp.toString());
+                    if (passphraseDecrypted != null)
+                        this.passphrase = passphraseDecrypted;
+                }
+            }
+        }
+        return deviceId !== null && deviceId !== void 0 ? deviceId : '';
+    }
     /**
      * Api init call
      * @param data Data
@@ -248,6 +271,7 @@ class CoreApp {
         // Update device id and cache it
         this.deviceId = data.deviceId;
         shared_1.StorageUtils.setLocalData(this.deviceIdField, this.deviceId);
+        shared_1.StorageUtils.setLocalData(this.devicePassphraseField, data.passphrase);
         shared_1.StorageUtils.setLocalData(this.deviceIdUpdateTimeField, timestamp);
         // Current passphrase
         this.passphrase = passphrase;
@@ -380,6 +404,7 @@ class CoreApp {
     clearCacheData() {
         shared_1.StorageUtils.setLocalData(this.serversideDeviceIdField, undefined);
         shared_1.StorageUtils.setLocalData(this.deviceIdField, undefined);
+        shared_1.StorageUtils.setLocalData(this.devicePassphraseField, undefined);
         shared_1.StorageUtils.setLocalData(this.deviceIdUpdateTimeField, undefined);
         shared_1.StorageUtils.setLocalData(this.headerTokenField, undefined);
     }
@@ -765,8 +790,8 @@ class CoreApp {
      * Signout
      * @param apiUrl Signout API URL
      */
-    async signout(apiUrl) {
-        await this.api.put(apiUrl !== null && apiUrl !== void 0 ? apiUrl : 'User/Signout', undefined, {
+    async signout() {
+        await this.api.put('User/Signout', { deviceId: this.deviceId }, {
             onError: (error) => {
                 console.log(error);
                 // Prevent further processing
@@ -793,10 +818,15 @@ class CoreApp {
     /**
      * Switch organization
      * @param id Organization id
+     * @param serviceId Service id
      */
-    async switchOrg(id) {
-        const api = `Organization/Switch/${id}`;
-        const result = await this.api.put(api);
+    async switchOrg(id, serviceId) {
+        const api = `Organization/Switch`;
+        const result = await this.api.put(api, {
+            id,
+            serviceId,
+            deviceId: this.deviceId
+        });
         if (result)
             return await this.refreshToken();
         return result;
@@ -854,7 +884,7 @@ class CoreApp {
             this.authorize(user.token, refreshToken);
         }
         else {
-            this.cachedRefreshToken = refreshToken;
+            this.cachedRefreshToken = this.encrypt(refreshToken);
             this.authorize(user.token, undefined);
         }
     }

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

@@ -280,9 +280,8 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
     refreshToken<D extends {} = {}>(props?: RefreshTokenProps<D>): Promise<boolean>;
     /**
      * Signout
-     * @param apiUrl Signout API URL
      */
-    signout(apiUrl?: string): Promise<void>;
+    signout(): Promise<void>;
     /**
      * Get organization list
      * @param items Max items
@@ -292,9 +291,10 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
     orgList(items?: number, serviceId?: number): Promise<IdLabelDto[] | undefined>;
     /**
      * Switch organization
-     * @param apiOrOrg API URL or organization id
+     * @param id Organization id
+     * @param serviceId Service id
      */
-    switchOrg(apiOrOrg: string | number): Promise<boolean | undefined>;
+    switchOrg(id: number, serviceId?: number): Promise<boolean | undefined>;
     /**
      * Go to the login page
      */
@@ -422,11 +422,15 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
     /**
      * Device id field name
      */
-    protected readonly deviceIdField: string;
+    private readonly deviceIdField;
+    /**
+     * Device passphrase field name
+     */
+    private readonly devicePassphraseField;
     /**
      * Device id update time field name
      */
-    protected readonly deviceIdUpdateTimeField: string;
+    private readonly deviceIdUpdateTimeField;
     /**
      * Init call Api URL
      */
@@ -445,6 +449,11 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      */
     protected constructor(settings: S, api: IApi, notifier: INotifier<N, C>, name: string);
     protected setApi(api: IApi): void;
+    /**
+     * Setup device
+     * @returns Device id
+     */
+    protected setupDevice(): string;
     /**
      * Api init call
      * @param data Data
@@ -669,7 +678,7 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      * Signout
      * @param apiUrl Signout API URL
      */
-    signout(apiUrl?: string): Promise<void>;
+    signout(): Promise<void>;
     /**
      * Get organization list
      * @param items Max items
@@ -680,8 +689,9 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
     /**
      * Switch organization
      * @param id Organization id
+     * @param serviceId Service id
      */
-    switchOrg(id: number): Promise<boolean | undefined>;
+    switchOrg(id: number, serviceId?: number): Promise<boolean | undefined>;
     /**
      * Go to the login page
      */

package/lib/mjs/app/CoreApp.js

@@ -40,6 +40,10 @@ export class CoreApp {
          * Device id field name
          */
         this.deviceIdField = 'SmartERPDeviceId';
+        /**
+         * Device passphrase field name
+         */
+        this.devicePassphraseField = 'SmartERPDevicePassphrase';
         /**
          * Device id update time field name
          */
@@ -56,7 +60,7 @@ export class CoreApp {
         this.api = api;
         this.notifier = notifier;
         this.name = name;
-        this.deviceId = StorageUtils.getLocalData(this.deviceIdField, '');
+        this.deviceId = this.setupDevice();
         this.setApi(api);
         const { currentCulture, currentRegion } = settings;
         this.changeCulture(currentCulture);
@@ -154,6 +158,25 @@ export class CoreApp {
             }
         };
     }
+    /**
+     * Setup device
+     * @returns Device id
+     */
+    setupDevice() {
+        const deviceId = StorageUtils.getLocalData(this.deviceIdField);
+        if (deviceId != null && deviceId !== '') {
+            const passphraseEncrypted = StorageUtils.getLocalData(this.devicePassphraseField);
+            if (passphraseEncrypted != null && passphraseEncrypted !== '') {
+                const timestamp = this.getDeviceUpdateTime();
+                if (timestamp > 0) {
+                    const passphraseDecrypted = this.decrypt(passphraseEncrypted, timestamp.toString());
+                    if (passphraseDecrypted != null)
+                        this.passphrase = passphraseDecrypted;
+                }
+            }
+        }
+        return deviceId !== null && deviceId !== void 0 ? deviceId : '';
+    }
     /**
      * Api init call
      * @param data Data
@@ -245,6 +268,7 @@ export class CoreApp {
         // Update device id and cache it
         this.deviceId = data.deviceId;
         StorageUtils.setLocalData(this.deviceIdField, this.deviceId);
+        StorageUtils.setLocalData(this.devicePassphraseField, data.passphrase);
         StorageUtils.setLocalData(this.deviceIdUpdateTimeField, timestamp);
         // Current passphrase
         this.passphrase = passphrase;
@@ -377,6 +401,7 @@ export class CoreApp {
     clearCacheData() {
         StorageUtils.setLocalData(this.serversideDeviceIdField, undefined);
         StorageUtils.setLocalData(this.deviceIdField, undefined);
+        StorageUtils.setLocalData(this.devicePassphraseField, undefined);
         StorageUtils.setLocalData(this.deviceIdUpdateTimeField, undefined);
         StorageUtils.setLocalData(this.headerTokenField, undefined);
     }
@@ -762,8 +787,8 @@ export class CoreApp {
      * Signout
      * @param apiUrl Signout API URL
      */
-    async signout(apiUrl) {
-        await this.api.put(apiUrl !== null && apiUrl !== void 0 ? apiUrl : 'User/Signout', undefined, {
+    async signout() {
+        await this.api.put('User/Signout', { deviceId: this.deviceId }, {
             onError: (error) => {
                 console.log(error);
                 // Prevent further processing
@@ -790,10 +815,15 @@ export class CoreApp {
     /**
      * Switch organization
      * @param id Organization id
+     * @param serviceId Service id
      */
-    async switchOrg(id) {
-        const api = `Organization/Switch/${id}`;
-        const result = await this.api.put(api);
+    async switchOrg(id, serviceId) {
+        const api = `Organization/Switch`;
+        const result = await this.api.put(api, {
+            id,
+            serviceId,
+            deviceId: this.deviceId
+        });
         if (result)
             return await this.refreshToken();
         return result;
@@ -851,7 +881,7 @@ export class CoreApp {
             this.authorize(user.token, refreshToken);
         }
         else {
-            this.cachedRefreshToken = refreshToken;
+            this.cachedRefreshToken = this.encrypt(refreshToken);
             this.authorize(user.token, undefined);
         }
     }

package/package.json

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

package/src/app/CoreApp.ts

@@ -384,9 +384,8 @@ export interface ICoreApp<
 
     /**
      * Signout
-     * @param apiUrl Signout API URL
      */
-    signout(apiUrl?: string): Promise<void>;
+    signout(): Promise<void>;
 
     /**
      * Get organization list
@@ -401,9 +400,10 @@ export interface ICoreApp<
 
     /**
      * Switch organization
-     * @param apiOrOrg API URL or organization id
+     * @param id Organization id
+     * @param serviceId Service id
      */
-    switchOrg(apiOrOrg: string | number): Promise<boolean | undefined>;
+    switchOrg(id: number, serviceId?: number): Promise<boolean | undefined>;
 
     /**
      * Go to the login page
@@ -589,12 +589,17 @@ export abstract class CoreApp<
     /**
      * Device id field name
      */
-    protected readonly deviceIdField: string = 'SmartERPDeviceId';
+    private readonly deviceIdField: string = 'SmartERPDeviceId';
+
+    /**
+     * Device passphrase field name
+     */
+    private readonly devicePassphraseField: string = 'SmartERPDevicePassphrase';
 
     /**
      * Device id update time field name
      */
-    protected readonly deviceIdUpdateTimeField: string =
+    private readonly deviceIdUpdateTimeField: string =
         'SmartERPDeviceIdUpdateTime';
 
     /**
@@ -627,10 +632,7 @@ export abstract class CoreApp<
         this.notifier = notifier;
         this.name = name;
 
-        this.deviceId = StorageUtils.getLocalData<string>(
-            this.deviceIdField,
-            ''
-        );
+        this.deviceId = this.setupDevice();
 
         this.setApi(api);
 
@@ -676,6 +678,33 @@ export abstract class CoreApp<
         };
     }
 
+    /**
+     * Setup device
+     * @returns Device id
+     */
+    protected setupDevice() {
+        const deviceId = StorageUtils.getLocalData<string>(this.deviceIdField);
+
+        if (deviceId != null && deviceId !== '') {
+            const passphraseEncrypted = StorageUtils.getLocalData<string>(
+                this.devicePassphraseField
+            );
+            if (passphraseEncrypted != null && passphraseEncrypted !== '') {
+                const timestamp = this.getDeviceUpdateTime();
+                if (timestamp > 0) {
+                    const passphraseDecrypted = this.decrypt(
+                        passphraseEncrypted,
+                        timestamp.toString()
+                    );
+                    if (passphraseDecrypted != null)
+                        this.passphrase = passphraseDecrypted;
+                }
+            }
+        }
+
+        return deviceId ?? '';
+    }
+
     /**
      * Api init call
      * @param data Data
@@ -781,6 +810,7 @@ export abstract class CoreApp<
         // Update device id and cache it
         this.deviceId = data.deviceId;
         StorageUtils.setLocalData(this.deviceIdField, this.deviceId);
+        StorageUtils.setLocalData(this.devicePassphraseField, data.passphrase);
         StorageUtils.setLocalData(this.deviceIdUpdateTimeField, timestamp);
 
         // Current passphrase
@@ -945,6 +975,7 @@ export abstract class CoreApp<
         StorageUtils.setLocalData(this.serversideDeviceIdField, undefined);
 
         StorageUtils.setLocalData(this.deviceIdField, undefined);
+        StorageUtils.setLocalData(this.devicePassphraseField, undefined);
         StorageUtils.setLocalData(this.deviceIdUpdateTimeField, undefined);
 
         StorageUtils.setLocalData(this.headerTokenField, undefined);
@@ -1404,14 +1435,18 @@ export abstract class CoreApp<
      * Signout
      * @param apiUrl Signout API URL
      */
-    async signout(apiUrl?: string) {
-        await this.api.put<boolean>(apiUrl ?? 'User/Signout', undefined, {
-            onError: (error) => {
-                console.log(error);
-                // Prevent further processing
-                return false;
+    async signout() {
+        await this.api.put<boolean>(
+            'User/Signout',
+            { deviceId: this.deviceId },
+            {
+                onError: (error) => {
+                    console.log(error);
+                    // Prevent further processing
+                    return false;
+                }
             }
-        });
+        );
 
         // Clear
         this.userLogout();
@@ -1440,10 +1475,15 @@ export abstract class CoreApp<
     /**
      * Switch organization
      * @param id Organization id
+     * @param serviceId Service id
      */
-    async switchOrg(id: number) {
-        const api = `Organization/Switch/${id}`;
-        const result = await this.api.put<boolean>(api);
+    async switchOrg(id: number, serviceId?: number) {
+        const api = `Organization/Switch`;
+        const result = await this.api.put<boolean>(api, {
+            id,
+            serviceId,
+            deviceId: this.deviceId
+        });
         if (result) return await this.refreshToken();
         return result;
     }
@@ -1506,7 +1546,7 @@ export abstract class CoreApp<
         if (keep) {
             this.authorize(user.token, refreshToken);
         } else {
-            this.cachedRefreshToken = refreshToken;
+            this.cachedRefreshToken = this.encrypt(refreshToken);
             this.authorize(user.token, undefined);
         }
     }