Skip to content

fix(ui): fix change password behavior when confirming new password #5223

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
otavio merged 1 commit into from
Sep 11, 2025
Merged

fix(ui): fix change password behavior when confirming new password #5223

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
83 changes: 48 additions & 35 deletions ui/src/components/User/ChangePassword.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@

<v-text-field
v-model="newPassword"
@update:model-value="handleNewPasswordChange"
label="New password"
:append-icon="showNewPassword ? 'mdi-eye' : 'mdi-eye-off'"
:type="showNewPassword ? 'text' : 'password'"
Expand All @@ -35,6 +36,7 @@

<v-text-field
v-model="newPasswordConfirm"
@update:model-value="handleNewPasswordChange"
label="Confirm new password"
:append-icon="showConfirmPassword ? 'mdi-eye' : 'mdi-eye-off'"
:type="showConfirmPassword ? 'text' : 'password'"
Expand Down Expand Up @@ -73,7 +75,7 @@
import * as yup from "yup";
import { useField } from "vee-validate";
import { computed, ref } from "vue";
import axios, { AxiosError } from "axios";
import axios from "axios";
import handleError from "@/utils/handleError";
import useSnackbar from "@/helpers/snackbar";
import BaseDialog from "../BaseDialog.vue";
Expand All @@ -88,8 +90,9 @@ const showDialog = defineModel({ default: false });
const {
value: currentPassword,
errorMessage: currentPasswordError,
setErrors: setCurrentPasswordError,
resetField: resetCurrentPassword,
} = useField<string>("currentPassword", yup.string().required(), {
} = useField<string>("currentPassword", yup.string().required("This field is required"), {
initialValue: "",
});

Expand All @@ -102,7 +105,7 @@ const {
"newPassword",
yup
.string()
.required()
.required("This field is required")
.min(5, "Your password should be 5-32 characters long")
.max(32, "Your password should be 5-32 characters long"),
{
Expand All @@ -119,7 +122,7 @@ const {
"newPasswordConfirm",
yup
.string()
.required()
.required("This field is required")
.test(
"passwords-match",
"Passwords do not match",
Expand All @@ -135,6 +138,17 @@ const showNewPassword = ref(false);
const showConfirmPassword = ref(false);
const { name, email, username, recoveryEmail } = authStore;

const handleNewPasswordChange = () => {
if (!newPasswordConfirm.value || !newPassword.value) return;

if (newPassword.value !== newPasswordConfirm.value) {
setNewPasswordConfirmError("Passwords do not match");
return;
}

setNewPasswordConfirmError("");
};

const close = () => {
showDialog.value = false;
resetCurrentPassword();
Expand All @@ -143,42 +157,41 @@ const close = () => {
};

const hasUpdatePasswordError = computed(() => (
Boolean(currentPasswordError.value)
|| Boolean(newPasswordError.value)
|| Boolean(newPasswordConfirmError.value)
|| newPassword.value === ""
|| newPasswordConfirm.value === ""
|| currentPassword.value === ""
!!currentPasswordError.value
|| !!newPasswordError.value
|| !!newPasswordConfirmError.value
|| !currentPassword.value
|| !newPassword.value
|| !newPasswordConfirm.value
));

const updatePassword = async () => {
if (!hasUpdatePasswordError.value) {
const data = {
name,
username,
email,
recovery_email: recoveryEmail,
currentPassword: currentPassword.value,
newPassword: newPassword.value,
};

try {
await usersStore.patchPassword(data);
snackbar.showSuccess("Password updated successfully.");
close();
} catch (error: unknown) {
if (axios.isAxiosError(error)) {
const axiosError = error as AxiosError;
if (axiosError.response?.status === 403) {
setNewPasswordError("Your password doesn't match");
setNewPasswordConfirmError("Your password doesn't match");
snackbar.showError("An error occurred while updating the password.");
}
} else {
snackbar.showError("An error occurred while updating the password.");
handleError(error);
if (hasUpdatePasswordError.value) return;

const data = {
name,
username,
email,
recovery_email: recoveryEmail,
currentPassword: currentPassword.value,
newPassword: newPassword.value,
};

try {
await usersStore.patchPassword(data);
snackbar.showSuccess("Password updated successfully.");
close();
} catch (error: unknown) {
if (axios.isAxiosError(error)) {
if (error.response?.status === 403) {
setNewPasswordError("Your password doesn't match");
setNewPasswordConfirmError("Your password doesn't match");
} else if (error.response?.status === 400) {
setCurrentPasswordError("Your current password is incorrect");
}
}
snackbar.showError("An error occurred while updating the password.");
handleError(error);
}
};

Expand Down