@etsoo/appscript 1.1.88 → 1.1.92

package/__tests__/app/CoreApp.ts

@@ -7,7 +7,7 @@ import {
     NotificationRenderProps
 } from '@etsoo/notificationbase';
 import { ApiAuthorizationScheme, createClient } from '@etsoo/restclient';
-import { DataTypes, DomUtils, Utils } from '@etsoo/shared';
+import { DataTypes, DomUtils, Utils, WindowStorage } from '@etsoo/shared';
 import { AddressUtils } from '../../src/address/AddressUtils';
 import { IAppSettings } from '../../src/app/AppSettings';
 import { CoreApp } from '../../src/app/CoreApp';
@@ -102,6 +102,7 @@ class CoreAppTest extends CoreApp<IAppSettings, {}, NotificationCallProps> {
             },
             createClient(),
             container,
+            new WindowStorage([]),
             'SmartERP'
         );
     }

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

@@ -1,6 +1,6 @@
 import { INotifier, NotificationAlign, NotificationCallProps, NotificationContent } from '@etsoo/notificationbase';
 import { ApiDataError, IApi, IPData } from '@etsoo/restclient';
-import { DataTypes, DateUtils } from '@etsoo/shared';
+import { DataTypes, DateUtils, IStorage } from '@etsoo/shared';
 import { AddressRegion } from '../address/AddressRegion';
 import { IdLabelDto } from '../dto/IdLabelDto';
 import { InitCallDto } from '../dto/InitCallDto';
@@ -78,6 +78,10 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
      * Country or region, like CN
      */
     readonly region: string;
+    /**
+     * Storage
+     */
+    readonly storage: IStorage;
     /**
      * Is current authorized
      */
@@ -280,9 +284,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 +295,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
      */
@@ -354,6 +358,10 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      * Notifier
      */
     readonly notifier: INotifier<N, C>;
+    /**
+     * Storage
+     */
+    readonly storage: IStorage;
     private _culture;
     /**
      * Culture, like zh-CN
@@ -374,7 +382,6 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      * Country or region, like CN
      */
     get deviceId(): string;
-    protected set deviceId(value: string);
     /**
      * Label delegate
      */
@@ -422,15 +429,11 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
     /**
      * Device id field name
      */
-    private readonly deviceIdField;
+    protected readonly deviceIdField: string;
     /**
      * Device passphrase field name
      */
     private readonly devicePassphraseField;
-    /**
-     * Device id update time field name
-     */
-    private readonly deviceIdUpdateTimeField;
     /**
      * Init call Api URL
      */
@@ -445,26 +448,17 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      * @param settings Settings
      * @param api API
      * @param notifier Notifier
+     * @param storage Storage
      * @param name Application name
      */
-    protected constructor(settings: S, api: IApi, notifier: INotifier<N, C>, name: string);
+    protected constructor(settings: S, api: IApi, notifier: INotifier<N, C>, storage: IStorage, name: string);
     protected setApi(api: IApi): void;
-    /**
-     * Setup device
-     * @returns Device id
-     */
-    protected setupDevice(): string;
     /**
      * Api init call
      * @param data Data
      * @returns Result
      */
     protected apiInitCall(data: InitCallDto): Promise<InitCallResult | undefined>;
-    /**
-     * Get device last updte miliseconds
-     * @returns Miliseconds
-     */
-    protected getDeviceUpdateTime(): number;
     /**
      * Init call
      * @param callback Callback
@@ -478,10 +472,10 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      */
     protected initCallUpdate(data: InitCallResultData, timestamp: number): void;
     /**
-     * Init call update fields in local storage
+     * Init call encrypted fields update
      * @returns Fields
      */
-    protected initCallUpdateFields(): string[];
+    protected initCallEncryptedUpdateFields(): string[];
     /**
      * Alert action result
      * @param result Action result
@@ -678,7 +672,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
@@ -689,8 +683,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

@@ -17,10 +17,11 @@ class CoreApp {
      * @param settings Settings
      * @param api API
      * @param notifier Notifier
+     * @param storage Storage
      * @param name Application name
      */
-    constructor(settings, api, notifier, name) {
-        this._deviceId = '';
+    constructor(settings, api, notifier, storage, name) {
+        var _a;
         /**
          * Response token header field name
          */
@@ -47,10 +48,6 @@ class CoreApp {
          * Device passphrase field name
          */
         this.devicePassphraseField = 'SmartERPDevicePassphrase';
-        /**
-         * Device id update time field name
-         */
-        this.deviceIdUpdateTimeField = 'SmartERPDeviceIdUpdateTime';
         /**
          * Init call Api URL
          */
@@ -62,8 +59,10 @@ class CoreApp {
         this.settings = settings;
         this.api = api;
         this.notifier = notifier;
+        this.storage = storage;
         this.name = name;
-        this.deviceId = this.setupDevice();
+        // Device id
+        this._deviceId = (_a = storage.getData(this.deviceIdField)) !== null && _a !== void 0 ? _a : '';
         this.setApi(api);
         const { currentCulture, currentRegion } = settings;
         this.changeCulture(currentCulture);
@@ -95,9 +94,6 @@ class CoreApp {
     get deviceId() {
         return this._deviceId;
     }
-    set deviceId(value) {
-        this._deviceId = value;
-    }
     /**
      * Label delegate
      */
@@ -161,25 +157,6 @@ 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
@@ -188,13 +165,6 @@ class CoreApp {
     async apiInitCall(data) {
         return await this.api.put(this.initCallApi, data);
     }
-    /**
-     * Get device last updte miliseconds
-     * @returns Miliseconds
-     */
-    getDeviceUpdateTime() {
-        return shared_1.StorageUtils.getLocalData(this.deviceIdUpdateTimeField, 0);
-    }
     /**
      * Init call
      * @param callback Callback
@@ -202,24 +172,27 @@ class CoreApp {
      */
     async initCall(callback) {
         var _a;
-        // Device
-        let hasDeviceId = this.deviceId != null && this.deviceId !== '';
-        const timestamp = new Date().getTime();
-        const lastTimestamp = this.getDeviceUpdateTime();
-        if (hasDeviceId &&
-            lastTimestamp > 0 &&
-            timestamp - lastTimestamp <= 1296000000) {
-            // When deviceId is there and less than 15 days = 1000 * 60 * 60 * 24 * 15
-            if (callback)
-                callback(true);
-            return;
+        // Passphrase exists?
+        // Same session should avoid multiple init calls
+        const passphraseEncrypted = this.storage.getData(this.devicePassphraseField);
+        if (passphraseEncrypted) {
+            const passphraseDecrypted = this.decrypt(passphraseEncrypted, this.name);
+            if (passphraseDecrypted != null) {
+                this.passphrase = passphraseDecrypted;
+                if (callback)
+                    callback(true);
+                return;
+            }
         }
         // Serverside encrypted device id
-        const identifier = shared_1.StorageUtils.getLocalData(this.serversideDeviceIdField);
+        const identifier = this.storage.getData(this.serversideDeviceIdField);
+        // Timestamp
+        const timestamp = new Date().getTime();
+        // Request data
         const data = {
             timestamp,
             identifier,
-            deviceId: hasDeviceId ? this.deviceId : undefined
+            deviceId: this.deviceId ? this.deviceId : undefined
         };
         const result = await this.apiInitCall(data);
         if (result == null) {
@@ -248,7 +221,7 @@ class CoreApp {
             if (callback)
                 callback(false);
             // Clear device id
-            shared_1.StorageUtils.setLocalData(this.deviceIdField, null);
+            this.storage.setData(this.deviceIdField, undefined);
             return;
         }
         this.initCallUpdate(result.data, data.timestamp);
@@ -261,6 +234,7 @@ class CoreApp {
      * @param timestamp Timestamp
      */
     initCallUpdate(data, timestamp) {
+        // Data check
         if (data.deviceId == null || data.passphrase == null)
             return;
         // Decrypt
@@ -269,19 +243,18 @@ class CoreApp {
         if (passphrase == null)
             return;
         // 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);
+        this._deviceId = data.deviceId;
+        this.storage.setData(this.deviceIdField, this.deviceId);
         // Current passphrase
         this.passphrase = passphrase;
+        this.storage.setData(this.devicePassphraseField, this.encrypt(passphrase, this.name));
         // Previous passphrase
         if (data.previousPassphrase) {
             const prev = this.decrypt(data.previousPassphrase, timestamp.toString());
             // Update
-            const fields = this.initCallUpdateFields();
+            const fields = this.initCallEncryptedUpdateFields();
             for (const field of fields) {
-                const currentValue = shared_1.StorageUtils.getLocalData(field);
+                const currentValue = this.storage.getData(field);
                 if (currentValue == null || currentValue === '')
                     continue;
                 const enhanced = currentValue.indexOf('!') >= 8;
@@ -297,15 +270,15 @@ class CoreApp {
                 const newValue = enhanced
                     ? this.encryptEnhanced(newValueSource)
                     : this.encrypt(newValueSource);
-                shared_1.StorageUtils.setLocalData(field, newValue);
+                this.storage.setData(field, newValue);
             }
         }
     }
     /**
-     * Init call update fields in local storage
+     * Init call encrypted fields update
      * @returns Fields
      */
-    initCallUpdateFields() {
+    initCallEncryptedUpdateFields() {
         return [this.headerTokenField];
     }
     /**
@@ -330,7 +303,7 @@ class CoreApp {
         if (refreshToken !== '') {
             if (refreshToken != null)
                 refreshToken = this.encrypt(refreshToken);
-            shared_1.StorageUtils.setLocalData(this.headerTokenField, refreshToken);
+            this.storage.setData(this.headerTokenField, refreshToken);
         }
         // Reset tryLogin state
         this._isTryingLogin = false;
@@ -402,18 +375,17 @@ class CoreApp {
      * Clear cache data
      */
     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);
+        this.storage.setData(this.serversideDeviceIdField, undefined);
+        this.storage.setData(this.deviceIdField, undefined);
+        this.storage.setData(this.devicePassphraseField, undefined);
+        this.storage.setData(this.headerTokenField, undefined);
     }
     /**
      * Clear cached token
      */
     clearCacheToken() {
         this.cachedRefreshToken = undefined;
-        shared_1.StorageUtils.setLocalData(this.headerTokenField, undefined);
+        this.storage.setData(this.headerTokenField, undefined);
     }
     /**
      * Decrypt message
@@ -661,7 +633,7 @@ class CoreApp {
         // Temp refresh token
         if (this.cachedRefreshToken)
             return this.cachedRefreshToken;
-        return shared_1.StorageUtils.getLocalData(this.headerTokenField);
+        return this.storage.getData(this.headerTokenField);
     }
     /**
      * Get all regions
@@ -790,8 +762,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
@@ -818,10 +790,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;
@@ -874,7 +851,7 @@ class CoreApp {
     userLogin(user, refreshToken, keep) {
         this.userData = user;
         // Cache the encrypted serverside device id
-        shared_1.StorageUtils.setLocalData(this.serversideDeviceIdField, user.deviceId);
+        this.storage.setData(this.serversideDeviceIdField, user.deviceId);
         if (keep) {
             this.authorize(user.token, refreshToken);
         }

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

@@ -1,6 +1,6 @@
 import { INotifier, NotificationAlign, NotificationCallProps, NotificationContent } from '@etsoo/notificationbase';
 import { ApiDataError, IApi, IPData } from '@etsoo/restclient';
-import { DataTypes, DateUtils } from '@etsoo/shared';
+import { DataTypes, DateUtils, IStorage } from '@etsoo/shared';
 import { AddressRegion } from '../address/AddressRegion';
 import { IdLabelDto } from '../dto/IdLabelDto';
 import { InitCallDto } from '../dto/InitCallDto';
@@ -78,6 +78,10 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
      * Country or region, like CN
      */
     readonly region: string;
+    /**
+     * Storage
+     */
+    readonly storage: IStorage;
     /**
      * Is current authorized
      */
@@ -280,9 +284,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 +295,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
      */
@@ -354,6 +358,10 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      * Notifier
      */
     readonly notifier: INotifier<N, C>;
+    /**
+     * Storage
+     */
+    readonly storage: IStorage;
     private _culture;
     /**
      * Culture, like zh-CN
@@ -374,7 +382,6 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      * Country or region, like CN
      */
     get deviceId(): string;
-    protected set deviceId(value: string);
     /**
      * Label delegate
      */
@@ -422,15 +429,11 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
     /**
      * Device id field name
      */
-    private readonly deviceIdField;
+    protected readonly deviceIdField: string;
     /**
      * Device passphrase field name
      */
     private readonly devicePassphraseField;
-    /**
-     * Device id update time field name
-     */
-    private readonly deviceIdUpdateTimeField;
     /**
      * Init call Api URL
      */
@@ -445,26 +448,17 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      * @param settings Settings
      * @param api API
      * @param notifier Notifier
+     * @param storage Storage
      * @param name Application name
      */
-    protected constructor(settings: S, api: IApi, notifier: INotifier<N, C>, name: string);
+    protected constructor(settings: S, api: IApi, notifier: INotifier<N, C>, storage: IStorage, name: string);
     protected setApi(api: IApi): void;
-    /**
-     * Setup device
-     * @returns Device id
-     */
-    protected setupDevice(): string;
     /**
      * Api init call
      * @param data Data
      * @returns Result
      */
     protected apiInitCall(data: InitCallDto): Promise<InitCallResult | undefined>;
-    /**
-     * Get device last updte miliseconds
-     * @returns Miliseconds
-     */
-    protected getDeviceUpdateTime(): number;
     /**
      * Init call
      * @param callback Callback
@@ -478,10 +472,10 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      */
     protected initCallUpdate(data: InitCallResultData, timestamp: number): void;
     /**
-     * Init call update fields in local storage
+     * Init call encrypted fields update
      * @returns Fields
      */
-    protected initCallUpdateFields(): string[];
+    protected initCallEncryptedUpdateFields(): string[];
     /**
      * Alert action result
      * @param result Action result
@@ -678,7 +672,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
@@ -689,8 +683,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

@@ -1,6 +1,6 @@
 import { NotificationAlign, NotificationMessageType } from '@etsoo/notificationbase';
 import { ApiDataError } from '@etsoo/restclient';
-import { DateUtils, DomUtils, NumberUtils, StorageUtils, Utils } from '@etsoo/shared';
+import { DateUtils, DomUtils, NumberUtils, Utils } from '@etsoo/shared';
 import { AES, algo, enc, HmacSHA512, lib, mode, pad, PBKDF2, SHA3 } from 'crypto-js';
 import { AddressRegion } from '../address/AddressRegion';
 import { AddressUtils } from '../address/AddressUtils';
@@ -14,10 +14,11 @@ export class CoreApp {
      * @param settings Settings
      * @param api API
      * @param notifier Notifier
+     * @param storage Storage
      * @param name Application name
      */
-    constructor(settings, api, notifier, name) {
-        this._deviceId = '';
+    constructor(settings, api, notifier, storage, name) {
+        var _a;
         /**
          * Response token header field name
          */
@@ -44,10 +45,6 @@ export class CoreApp {
          * Device passphrase field name
          */
         this.devicePassphraseField = 'SmartERPDevicePassphrase';
-        /**
-         * Device id update time field name
-         */
-        this.deviceIdUpdateTimeField = 'SmartERPDeviceIdUpdateTime';
         /**
          * Init call Api URL
          */
@@ -59,8 +56,10 @@ export class CoreApp {
         this.settings = settings;
         this.api = api;
         this.notifier = notifier;
+        this.storage = storage;
         this.name = name;
-        this.deviceId = this.setupDevice();
+        // Device id
+        this._deviceId = (_a = storage.getData(this.deviceIdField)) !== null && _a !== void 0 ? _a : '';
         this.setApi(api);
         const { currentCulture, currentRegion } = settings;
         this.changeCulture(currentCulture);
@@ -92,9 +91,6 @@ export class CoreApp {
     get deviceId() {
         return this._deviceId;
     }
-    set deviceId(value) {
-        this._deviceId = value;
-    }
     /**
      * Label delegate
      */
@@ -158,25 +154,6 @@ 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
@@ -185,13 +162,6 @@ export class CoreApp {
     async apiInitCall(data) {
         return await this.api.put(this.initCallApi, data);
     }
-    /**
-     * Get device last updte miliseconds
-     * @returns Miliseconds
-     */
-    getDeviceUpdateTime() {
-        return StorageUtils.getLocalData(this.deviceIdUpdateTimeField, 0);
-    }
     /**
      * Init call
      * @param callback Callback
@@ -199,24 +169,27 @@ export class CoreApp {
      */
     async initCall(callback) {
         var _a;
-        // Device
-        let hasDeviceId = this.deviceId != null && this.deviceId !== '';
-        const timestamp = new Date().getTime();
-        const lastTimestamp = this.getDeviceUpdateTime();
-        if (hasDeviceId &&
-            lastTimestamp > 0 &&
-            timestamp - lastTimestamp <= 1296000000) {
-            // When deviceId is there and less than 15 days = 1000 * 60 * 60 * 24 * 15
-            if (callback)
-                callback(true);
-            return;
+        // Passphrase exists?
+        // Same session should avoid multiple init calls
+        const passphraseEncrypted = this.storage.getData(this.devicePassphraseField);
+        if (passphraseEncrypted) {
+            const passphraseDecrypted = this.decrypt(passphraseEncrypted, this.name);
+            if (passphraseDecrypted != null) {
+                this.passphrase = passphraseDecrypted;
+                if (callback)
+                    callback(true);
+                return;
+            }
         }
         // Serverside encrypted device id
-        const identifier = StorageUtils.getLocalData(this.serversideDeviceIdField);
+        const identifier = this.storage.getData(this.serversideDeviceIdField);
+        // Timestamp
+        const timestamp = new Date().getTime();
+        // Request data
         const data = {
             timestamp,
             identifier,
-            deviceId: hasDeviceId ? this.deviceId : undefined
+            deviceId: this.deviceId ? this.deviceId : undefined
         };
         const result = await this.apiInitCall(data);
         if (result == null) {
@@ -245,7 +218,7 @@ export class CoreApp {
             if (callback)
                 callback(false);
             // Clear device id
-            StorageUtils.setLocalData(this.deviceIdField, null);
+            this.storage.setData(this.deviceIdField, undefined);
             return;
         }
         this.initCallUpdate(result.data, data.timestamp);
@@ -258,6 +231,7 @@ export class CoreApp {
      * @param timestamp Timestamp
      */
     initCallUpdate(data, timestamp) {
+        // Data check
         if (data.deviceId == null || data.passphrase == null)
             return;
         // Decrypt
@@ -266,19 +240,18 @@ export class CoreApp {
         if (passphrase == null)
             return;
         // 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);
+        this._deviceId = data.deviceId;
+        this.storage.setData(this.deviceIdField, this.deviceId);
         // Current passphrase
         this.passphrase = passphrase;
+        this.storage.setData(this.devicePassphraseField, this.encrypt(passphrase, this.name));
         // Previous passphrase
         if (data.previousPassphrase) {
             const prev = this.decrypt(data.previousPassphrase, timestamp.toString());
             // Update
-            const fields = this.initCallUpdateFields();
+            const fields = this.initCallEncryptedUpdateFields();
             for (const field of fields) {
-                const currentValue = StorageUtils.getLocalData(field);
+                const currentValue = this.storage.getData(field);
                 if (currentValue == null || currentValue === '')
                     continue;
                 const enhanced = currentValue.indexOf('!') >= 8;
@@ -294,15 +267,15 @@ export class CoreApp {
                 const newValue = enhanced
                     ? this.encryptEnhanced(newValueSource)
                     : this.encrypt(newValueSource);
-                StorageUtils.setLocalData(field, newValue);
+                this.storage.setData(field, newValue);
             }
         }
     }
     /**
-     * Init call update fields in local storage
+     * Init call encrypted fields update
      * @returns Fields
      */
-    initCallUpdateFields() {
+    initCallEncryptedUpdateFields() {
         return [this.headerTokenField];
     }
     /**
@@ -327,7 +300,7 @@ export class CoreApp {
         if (refreshToken !== '') {
             if (refreshToken != null)
                 refreshToken = this.encrypt(refreshToken);
-            StorageUtils.setLocalData(this.headerTokenField, refreshToken);
+            this.storage.setData(this.headerTokenField, refreshToken);
         }
         // Reset tryLogin state
         this._isTryingLogin = false;
@@ -399,18 +372,17 @@ export class CoreApp {
      * Clear cache data
      */
     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);
+        this.storage.setData(this.serversideDeviceIdField, undefined);
+        this.storage.setData(this.deviceIdField, undefined);
+        this.storage.setData(this.devicePassphraseField, undefined);
+        this.storage.setData(this.headerTokenField, undefined);
     }
     /**
      * Clear cached token
      */
     clearCacheToken() {
         this.cachedRefreshToken = undefined;
-        StorageUtils.setLocalData(this.headerTokenField, undefined);
+        this.storage.setData(this.headerTokenField, undefined);
     }
     /**
      * Decrypt message
@@ -658,7 +630,7 @@ export class CoreApp {
         // Temp refresh token
         if (this.cachedRefreshToken)
             return this.cachedRefreshToken;
-        return StorageUtils.getLocalData(this.headerTokenField);
+        return this.storage.getData(this.headerTokenField);
     }
     /**
      * Get all regions
@@ -787,8 +759,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
@@ -815,10 +787,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;
@@ -871,7 +848,7 @@ export class CoreApp {
     userLogin(user, refreshToken, keep) {
         this.userData = user;
         // Cache the encrypted serverside device id
-        StorageUtils.setLocalData(this.serversideDeviceIdField, user.deviceId);
+        this.storage.setData(this.serversideDeviceIdField, user.deviceId);
         if (keep) {
             this.authorize(user.token, refreshToken);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.1.88",
+    "version": "1.1.92",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -54,7 +54,7 @@
     "dependencies": {
         "@etsoo/notificationbase": "^1.0.95",
         "@etsoo/restclient": "^1.0.63",
-        "@etsoo/shared": "^1.0.82",
+        "@etsoo/shared": "^1.0.83",
         "@types/crypto-js": "^4.0.2",
         "crypto-js": "^4.1.1"
     },

package/src/app/CoreApp.ts

@@ -11,8 +11,8 @@ import {
     DataTypes,
     DateUtils,
     DomUtils,
+    IStorage,
     NumberUtils,
-    StorageUtils,
     Utils
 } from '@etsoo/shared';
 import {
@@ -128,6 +128,11 @@ export interface ICoreApp<
      */
     readonly region: string;
 
+    /**
+     * Storage
+     */
+    readonly storage: IStorage;
+
     /**
      * Is current authorized
      */
@@ -384,9 +389,8 @@ export interface ICoreApp<
 
     /**
      * Signout
-     * @param apiUrl Signout API URL
      */
-    signout(apiUrl?: string): Promise<void>;
+    signout(): Promise<void>;
 
     /**
      * Get organization list
@@ -401,9 +405,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
@@ -480,6 +485,11 @@ export abstract class CoreApp<
      */
     readonly notifier: INotifier<N, C>;
 
+    /**
+     * Storage
+     */
+    readonly storage: IStorage;
+
     private _culture!: string;
     /**
      * Culture, like zh-CN
@@ -504,16 +514,13 @@ export abstract class CoreApp<
         return this._region;
     }
 
-    private _deviceId: string = '';
+    private _deviceId: string;
     /**
      * Country or region, like CN
      */
     get deviceId() {
         return this._deviceId;
     }
-    protected set deviceId(value: string) {
-        this._deviceId = value;
-    }
 
     /**
      * Label delegate
@@ -589,19 +596,13 @@ export abstract class CoreApp<
     /**
      * Device id field name
      */
-    private readonly deviceIdField: string = 'SmartERPDeviceId';
+    protected readonly deviceIdField: string = 'SmartERPDeviceId';
 
     /**
      * Device passphrase field name
      */
     private readonly devicePassphraseField: string = 'SmartERPDevicePassphrase';
 
-    /**
-     * Device id update time field name
-     */
-    private readonly deviceIdUpdateTimeField: string =
-        'SmartERPDeviceIdUpdateTime';
-
     /**
      * Init call Api URL
      */
@@ -619,20 +620,24 @@ export abstract class CoreApp<
      * @param settings Settings
      * @param api API
      * @param notifier Notifier
+     * @param storage Storage
      * @param name Application name
      */
     protected constructor(
         settings: S,
         api: IApi,
         notifier: INotifier<N, C>,
+        storage: IStorage,
         name: string
     ) {
         this.settings = settings;
         this.api = api;
         this.notifier = notifier;
+        this.storage = storage;
         this.name = name;
 
-        this.deviceId = this.setupDevice();
+        // Device id
+        this._deviceId = storage.getData<string>(this.deviceIdField) ?? '';
 
         this.setApi(api);
 
@@ -678,33 +683,6 @@ 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
@@ -714,44 +692,44 @@ export abstract class CoreApp<
         return await this.api.put<InitCallResult>(this.initCallApi, data);
     }
 
-    /**
-     * Get device last updte miliseconds
-     * @returns Miliseconds
-     */
-    protected getDeviceUpdateTime() {
-        return StorageUtils.getLocalData(this.deviceIdUpdateTimeField, 0);
-    }
-
     /**
      * Init call
      * @param callback Callback
      * @returns Result
      */
     async initCall(callback?: (result: boolean) => void) {
-        // Device
-        let hasDeviceId = this.deviceId != null && this.deviceId !== '';
-        const timestamp = new Date().getTime();
-        const lastTimestamp = this.getDeviceUpdateTime();
-        if (
-            hasDeviceId &&
-            lastTimestamp > 0 &&
-            timestamp - lastTimestamp <= 1296000000
-        ) {
-            // When deviceId is there and less than 15 days = 1000 * 60 * 60 * 24 * 15
-            if (callback) callback(true);
-            return;
+        // Passphrase exists?
+        // Same session should avoid multiple init calls
+        const passphraseEncrypted = this.storage.getData<string>(
+            this.devicePassphraseField
+        );
+        if (passphraseEncrypted) {
+            const passphraseDecrypted = this.decrypt(
+                passphraseEncrypted,
+                this.name
+            );
+            if (passphraseDecrypted != null) {
+                this.passphrase = passphraseDecrypted;
+                if (callback) callback(true);
+                return;
+            }
         }
 
         // Serverside encrypted device id
-        const identifier = StorageUtils.getLocalData<string>(
+        const identifier = this.storage.getData<string>(
             this.serversideDeviceIdField
         );
 
+        // Timestamp
+        const timestamp = new Date().getTime();
+
+        // Request data
         const data: InitCallDto = {
             timestamp,
             identifier,
-            deviceId: hasDeviceId ? this.deviceId : undefined
+            deviceId: this.deviceId ? this.deviceId : undefined
         };
+
         const result = await this.apiInitCall(data);
         if (result == null) {
             if (callback) callback(false);
@@ -784,7 +762,7 @@ export abstract class CoreApp<
             if (callback) callback(false);
 
             // Clear device id
-            StorageUtils.setLocalData(this.deviceIdField, null);
+            this.storage.setData(this.deviceIdField, undefined);
 
             return;
         }
@@ -800,6 +778,7 @@ export abstract class CoreApp<
      * @param timestamp Timestamp
      */
     protected initCallUpdate(data: InitCallResultData, timestamp: number) {
+        // Data check
         if (data.deviceId == null || data.passphrase == null) return;
 
         // Decrypt
@@ -808,13 +787,15 @@ export abstract class CoreApp<
         if (passphrase == null) return;
 
         // 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);
+        this._deviceId = data.deviceId;
+        this.storage.setData(this.deviceIdField, this.deviceId);
 
         // Current passphrase
         this.passphrase = passphrase;
+        this.storage.setData(
+            this.devicePassphraseField,
+            this.encrypt(passphrase, this.name)
+        );
 
         // Previous passphrase
         if (data.previousPassphrase) {
@@ -824,9 +805,9 @@ export abstract class CoreApp<
             );
 
             // Update
-            const fields = this.initCallUpdateFields();
+            const fields = this.initCallEncryptedUpdateFields();
             for (const field of fields) {
-                const currentValue = StorageUtils.getLocalData<string>(field);
+                const currentValue = this.storage.getData<string>(field);
                 if (currentValue == null || currentValue === '') continue;
 
                 const enhanced = currentValue.indexOf('!') >= 8;
@@ -848,16 +829,16 @@ export abstract class CoreApp<
                     ? this.encryptEnhanced(newValueSource)
                     : this.encrypt(newValueSource);
 
-                StorageUtils.setLocalData(field, newValue);
+                this.storage.setData(field, newValue);
             }
         }
     }
 
     /**
-     * Init call update fields in local storage
+     * Init call encrypted fields update
      * @returns Fields
      */
-    protected initCallUpdateFields(): string[] {
+    protected initCallEncryptedUpdateFields(): string[] {
         return [this.headerTokenField];
     }
 
@@ -885,7 +866,7 @@ export abstract class CoreApp<
         // Cover the current value
         if (refreshToken !== '') {
             if (refreshToken != null) refreshToken = this.encrypt(refreshToken);
-            StorageUtils.setLocalData(this.headerTokenField, refreshToken);
+            this.storage.setData(this.headerTokenField, refreshToken);
         }
 
         // Reset tryLogin state
@@ -972,13 +953,12 @@ export abstract class CoreApp<
      * Clear cache data
      */
     clearCacheData() {
-        StorageUtils.setLocalData(this.serversideDeviceIdField, undefined);
+        this.storage.setData(this.serversideDeviceIdField, undefined);
 
-        StorageUtils.setLocalData(this.deviceIdField, undefined);
-        StorageUtils.setLocalData(this.devicePassphraseField, undefined);
-        StorageUtils.setLocalData(this.deviceIdUpdateTimeField, undefined);
+        this.storage.setData(this.deviceIdField, undefined);
+        this.storage.setData(this.devicePassphraseField, undefined);
 
-        StorageUtils.setLocalData(this.headerTokenField, undefined);
+        this.storage.setData(this.headerTokenField, undefined);
     }
 
     /**
@@ -986,7 +966,7 @@ export abstract class CoreApp<
      */
     clearCacheToken() {
         this.cachedRefreshToken = undefined;
-        StorageUtils.setLocalData(this.headerTokenField, undefined);
+        this.storage.setData(this.headerTokenField, undefined);
     }
 
     /**
@@ -1292,7 +1272,7 @@ export abstract class CoreApp<
     getCacheToken(): string | undefined {
         // Temp refresh token
         if (this.cachedRefreshToken) return this.cachedRefreshToken;
-        return StorageUtils.getLocalData<string>(this.headerTokenField);
+        return this.storage.getData<string>(this.headerTokenField);
     }
 
     /**
@@ -1435,14 +1415,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();
@@ -1471,10 +1455,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;
     }
@@ -1532,7 +1521,7 @@ export abstract class CoreApp<
         this.userData = user;
 
         // Cache the encrypted serverside device id
-        StorageUtils.setLocalData(this.serversideDeviceIdField, user.deviceId);
+        this.storage.setData(this.serversideDeviceIdField, user.deviceId);
 
         if (keep) {
             this.authorize(user.token, refreshToken);