Skip to content

Commit

Permalink
fix(frontend): replase resetPassword with changeOldPassword (#193)
Browse files Browse the repository at this point in the history
  • Loading branch information
lionelB committed Nov 23, 2020
1 parent fa20be8 commit b24d626
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 11 deletions.
8 changes: 4 additions & 4 deletions targets/frontend/src/components/user/PasswordForm.js
Expand Up @@ -13,14 +13,14 @@ import { Stack } from "../layout/Stack";
export function PasswordForm({
onSubmit,
action = "/api/change_password",
lostPassword = false,
backHref = "/account",
changeOldPassword = false,
}) {
let loading;
const { user } = useUser();
const { register, handleSubmit, errors, setError, watch } = useForm();
const hasError = Object.keys(errors).length > 0;
const buttonLabel = lostPassword ? "Changer le mot de passe" : "Activer";
const buttonLabel = changeOldPassword ? "Changer le mot de passe" : "Activer";
const passwordFieldRegistration = {
minLength: {
message: "Le mot de passe doit faire au moins 8 caractères",
Expand All @@ -45,7 +45,7 @@ export function PasswordForm({
return (
<form onSubmit={handleSubmit(localSubmit)} action={action}>
<Stack gap={["small", "large"]}>
{!lostPassword && (
{changeOldPassword && (
<div>
<Field
type="password"
Expand Down Expand Up @@ -98,6 +98,6 @@ export function PasswordForm({
PasswordForm.propTypes = {
action: PropTypes.string,
backHref: PropTypes.string,
lostPassword: PropTypes.bool,
changeOldPassword: PropTypes.bool,
onSubmit: PropTypes.func.isRequired,
};
7 changes: 1 addition & 6 deletions targets/frontend/src/pages/change_password.js
Expand Up @@ -53,12 +53,7 @@ export default function ChangePasswordPage() {
}
return (
<PasswordLayout title={title}>
<PasswordForm
onSubmit={updatePassword}
loading={loading}
lostPassword={!activate}
action={url}
/>
<PasswordForm onSubmit={updatePassword} loading={loading} action={url} />
</PasswordLayout>
);
}
2 changes: 1 addition & 1 deletion targets/frontend/src/pages/user/password.js
Expand Up @@ -20,7 +20,7 @@ export function ChangeMyPasswordPage() {

return (
<Layout title="Modifier mon mot de passe">
<PasswordForm onSubmit={handleChangePasword} />
<PasswordForm changeOldPassword onSubmit={handleChangePasword} />
</Layout>
);
}
Expand Down

0 comments on commit b24d626

Please sign in to comment.