Merge branch 'feat/new-logic-change-mp' into 'dev'

fix: bugs unlock

See merge request locker/web-selfhosted!126

Author: NguyenTienQuyet

src/pages/admin/settings/components/security/drawers/UpdateEncryptionSettings.jsx

@@ -60,24 +60,6 @@ function UpdateEncryptionSettingsDrawer(props) {
     }
   }, [visible, userInfo]);
 
-  useEffect(() => {
-    if (kdf === KdfType.ARGON2ID) {
-      form.setFieldsValue({
-        kdf: kdf,
-        kdf_iterations: 2,
-        kdf_memory: 16,
-        kdf_parallelism: 1
-      })
-    } else {
-      form.setFieldsValue({
-        kdf: kdf,
-        kdf_iterations: 600000,
-        kdf_memory: null,
-        kdf_parallelism: null
-      })
-    }
-  }, [kdf])
-
   const handleUpdate = () => {
     if (userInfo.is_require_passwordless) {
       return;
@@ -202,6 +184,23 @@ function UpdateEncryptionSettingsDrawer(props) {
                   label: 'ARGON2ID'
                 }
               ]}
+              onChange={(v) => {
+                if (v === KdfType.ARGON2ID) {
+                  form.setFieldsValue({
+                    kdf: v,
+                    kdf_iterations: 2,
+                    kdf_memory: 16,
+                    kdf_parallelism: 1
+                  })
+                } else {
+                  form.setFieldsValue({
+                    kdf: v,
+                    kdf_iterations: 600000,
+                    kdf_memory: null,
+                    kdf_parallelism: null
+                  })
+                }
+              }}
             />
           </Form.Item>
           {

src/services/user.js

@@ -122,8 +122,11 @@ async function users_access_token(token) {
 async function users_session(data = {
   email,
   password,
+  hashedPassword,
   kdf,
-  kdf_iterations
+  kdf_iterations,
+  kdf_memory,
+  kdf_parallelism
 }) {
   global.jsCore.cryptoService.clearKeys();
   let hashedPassword = data?.hashedPassword || null;
@@ -157,11 +160,13 @@ async function users_session_otp(data = {
   hashedPassword,
   password,
   email,
-  kdf,
-  kdf_iterations,
   method,
   save_device,
-  otp
+  otp,
+  kdf,
+  kdf_iterations,
+  kdf_memory,
+  kdf_parallelism,
 }) {
   global.jsCore.cryptoService.clearKeys();
   let hashedPassword = data?.hashedPassword || null;

src/utils/common/auth.js

@@ -43,21 +43,12 @@ const remakeBackupPWL = async (response, payload) => {
         })
       }
       if (remakeResponse) {
-        await coreServices.unlock({
-          username: userInfo.email,
-          keyB64: remakeResponse.key.keyB64,
-          hashedPassword: remakeResponse.hashedPassword,
-          key: response.key,
-          access_token: response.access_token,
-          private_key: response.private_key,
-          kdf: userInfo.kdf,
-          kdf_iterations: userInfo.kdf_iterations,
-          kdf_memory: userInfo.kdf_memory,
-          kdf_parallelism: userInfo.kdf_parallelism
-        });
+        await coreServices.logout();
+        return remakeResponse;
       }
     }
   }
+  return null;
 }
 
 const unlockToVault = async (
@@ -83,13 +74,27 @@ const unlockToVault = async (
         ...response,
         ...payload
       });
-      await remakeBackupPWL(response, payload);
-      const isSynced = await commonServices.sync_data();
-      if (isSynced) {
-        if (query) {
-          callback();
-        } else {
-          global.navigate(global.keys.VAULT);
+      const remakeResponse = await remakeBackupPWL(response, payload);
+      if (remakeResponse) {
+        const newPayload = {
+          ...payload,
+          password: null,
+          hashedPassword: remakeResponse.hashedPassword,
+          keyB64: remakeResponse.key.keyB64,
+          kdf: remakeResponse.kdf,
+          kdf_iterations: remakeResponse.kdf_iterations,
+          kdf_memory: remakeResponse.kdf_memory,
+          kdf_parallelism: remakeResponse.kdf_parallelism
+        }
+        await unlockToVault(newPayload, query, callback)
+      } else {
+        const isSynced = await commonServices.sync_data();
+        if (isSynced) {
+          if (query) {
+            callback();
+          } else {
+            global.navigate(global.keys.VAULT);
+          }
         }
       }
     }