Make user password set consistent

agama-project · Jun 11, 2024 · 9f89942 · 9f89942
1 parent aa99978
commit 9f89942
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/web/src/components/users/FirstUserForm.jsx b/web/src/components/users/FirstUserForm.jsx
@@ -131,6 +131,11 @@ export default function FirstUserForm() {
       return user;
     }, user);
 
+    if (!changePassword) {
+      delete user.password;
+      delete user.passwordConfirmation;
+    }
+
     // Preserve current password value if the user was not editing it.
     if (state.isEditing && user.password === "") delete user.password;
     delete user.passwordConfirmation;
@@ -147,6 +152,11 @@ export default function FirstUserForm() {
       return;
     }
 
+    if (state.isEditing && changePassword && !user.password) {
+      setErrors([_("Password is required")]);
+      return;
+    }
+
     const { result, issues = [] } = await client.users.setUser({ ...state.user, ...user });
     if (!result || issues.length) {
       // FIXME: improve error handling. See client.