@etsoo/react 1.3.68 → 1.3.69

package/lib/app/ServiceApp.d.ts

@@ -21,9 +21,9 @@ export declare class ServiceApp<P extends IServicePageData = IServicePageData, U
      */
     coreUser?: ISmartERPUser;
     /**
-     * Service device id
+     * Service passphrase
      */
-    protected serviceDeviceId: string;
+    servicePassphrase: string;
     /**
      * Constructor
      * @param settings Settings

package/lib/app/ServiceApp.js

@@ -17,9 +17,9 @@ export class ServiceApp extends ReactApp {
     constructor(settings, name) {
         super(settings, name);
         /**
-         * Service device id
+         * Service passphrase
          */
-        this.serviceDeviceId = '';
+        this.servicePassphrase = '';
         // Check
         if (settings.serviceId == null || settings.coreApi == null) {
             throw new Error('No service settings');
@@ -183,7 +183,7 @@ export class ServiceApp extends ReactApp {
      * @returns Pure text
      */
     serviceDecrypt(messageEncrypted, passphrase) {
-        return this.decrypt(messageEncrypted, passphrase !== null && passphrase !== void 0 ? passphrase : this.serviceDeviceId);
+        return this.decrypt(messageEncrypted, passphrase !== null && passphrase !== void 0 ? passphrase : this.servicePassphrase);
     }
     /**
      * Service encrypt message
@@ -193,7 +193,7 @@ export class ServiceApp extends ReactApp {
      * @returns Result
      */
     serviceEncrypt(message, passphrase, iterations) {
-        return this.encrypt(message, passphrase !== null && passphrase !== void 0 ? passphrase : this.serviceDeviceId, iterations);
+        return this.encrypt(message, passphrase !== null && passphrase !== void 0 ? passphrase : this.servicePassphrase, iterations);
     }
     /**
      * Try login
@@ -229,8 +229,10 @@ export class ServiceApp extends ReactApp {
      * @param coreUser Core system user
      */
     userLoginEx(user, refreshToken, coreUser) {
+        var _a;
         // Service user login
-        this.serviceDeviceId = user.serviceDeviceId;
+        this.servicePassphrase =
+            (_a = this.decrypt(user.serviceDeviceId, this.settings.serviceId.toString())) !== null && _a !== void 0 ? _a : '';
         super.userLogin(user, refreshToken, false);
         // Core system user
         this.coreUser = coreUser;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/react",
-    "version": "1.3.68",
+    "version": "1.3.69",
     "description": "TypeScript ReactJs framework",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",

package/src/app/ServiceApp.ts

@@ -38,9 +38,9 @@ export class ServiceApp<
     coreUser?: ISmartERPUser;
 
     /**
-     * Service device id
+     * Service passphrase
      */
-    protected serviceDeviceId: string = '';
+    servicePassphrase: string = '';
 
     /**
      * Constructor
@@ -271,7 +271,7 @@ export class ServiceApp<
     serviceDecrypt(messageEncrypted: string, passphrase?: string) {
         return this.decrypt(
             messageEncrypted,
-            passphrase ?? this.serviceDeviceId
+            passphrase ?? this.servicePassphrase
         );
     }
 
@@ -285,7 +285,7 @@ export class ServiceApp<
     serviceEncrypt(message: string, passphrase?: string, iterations?: number) {
         return this.encrypt(
             message,
-            passphrase ?? this.serviceDeviceId,
+            passphrase ?? this.servicePassphrase,
             iterations
         );
     }
@@ -331,7 +331,11 @@ export class ServiceApp<
         coreUser: ISmartERPUser
     ): void {
         // Service user login
-        this.serviceDeviceId = user.serviceDeviceId;
+        this.servicePassphrase =
+            this.decrypt(
+                user.serviceDeviceId,
+                this.settings.serviceId.toString()
+            ) ?? '';
         super.userLogin(user, refreshToken, false);
 
         // Core system user