Skip to content

The Open Source DocuSign Alternative.

feat: require old password for password reset (#488)

Udit Takkar78d2401d444c
diff --git a/apps/web/src/components/forms/password.tsx b/apps/web/src/components/forms/password.tsx
index 8b6a58a06..5df5005f1 100644
--- a/apps/web/src/components/forms/password.tsx
+++ b/apps/web/src/components/forms/password.tsx
@@ -20,6 +20,7 @@ import { FormErrorMessage } from '../form/form-error-message';
export const ZPasswordFormSchema = z
.object({
+ currentPassword: z.string().min(6).max(72),
password: z.string().min(6).max(72),
repeatedPassword: z.string().min(6).max(72),
})
@@ -40,6 +41,7 @@ export const PasswordForm = ({ className }: PasswordFormProps) => {
const [showPassword, setShowPassword] = useState(false);
const [showConfirmPassword, setShowConfirmPassword] = useState(false);
+ const [showCurrentPassword, setShowCurrentPassword] = useState(false);
const {
register,
@@ -48,6 +50,7 @@ export const PasswordForm = ({ className }: PasswordFormProps) => {
formState: { errors, isSubmitting },
} = useForm<TPasswordFormSchema>({
values: {
+ currentPassword: '',
password: '',
repeatedPassword: '',
},
@@ -56,9 +59,10 @@ export const PasswordForm = ({ className }: PasswordFormProps) => {
const { mutateAsync: updatePassword } = trpc.profile.updatePassword.useMutation();
- const onFormSubmit = async ({ password }: TPasswordFormSchema) => {
+ const onFormSubmit = async ({ currentPassword, password }: TPasswordFormSchema) => {
try {
await updatePassword({
+ currentPassword,
password,
});
@@ -92,6 +96,39 @@ export const PasswordForm = ({ className }: PasswordFormProps) => {
className={cn('flex w-full flex-col gap-y-4', className)}
onSubmit={handleSubmit(onFormSubmit)}
>
+ <div>
+ <Label htmlFor="current-password" className="text-muted-foreground">
+ Current Password
+ </Label>
+
+ <div className="relative">
+ <Input
+ id="current-password"
+ type={showCurrentPassword ? 'text' : 'password'}
+ minLength={6}
+ maxLength={72}
+ autoComplete="current-password"
+ className="bg-background mt-2 pr-10"
+ {...register('currentPassword')}
+ />
+
+ <Button
+ variant="link"
+ type="button"
+ className="absolute right-0 top-0 flex h-full items-center justify-center pr-3"
+ aria-label={showCurrentPassword ? 'Mask password' : 'Reveal password'}
+ onClick={() => setShowCurrentPassword((show) => !show)}
+ >
+ {showCurrentPassword ? (
+ <EyeOff className="text-muted-foreground h-5 w-5" />
+ ) : (
+ <Eye className="text-muted-foreground h-5 w-5" />
+ )}
+ </Button>
+ </div>
+
+ <FormErrorMessage className="mt-1.5" error={errors.currentPassword} />
+ </div>
<div>
<Label htmlFor="password" className="text-muted-foreground">
Password
diff --git a/packages/lib/server-only/user/update-password.ts b/packages/lib/server-only/user/update-password.ts
index d987085ff..b7579cd35 100644
--- a/packages/lib/server-only/user/update-password.ts
+++ b/packages/lib/server-only/user/update-password.ts
@@ -7,9 +7,14 @@ import { SALT_ROUNDS } from '../../constants/auth';
export type UpdatePasswordOptions = {
userId: number;
password: string;
+ currentPassword: string;
};
-export const updatePassword = async ({ userId, password }: UpdatePasswordOptions) => {
+export const updatePassword = async ({
+ userId,
+ password,
+ currentPassword,
+}: UpdatePasswordOptions) => {
// Existence check
const user = await prisma.user.findFirstOrThrow({
where: {
@@ -17,23 +22,29 @@ export const updatePassword = async ({ userId, password }: UpdatePasswordOptions
},
});
- const hashedPassword = await hash(password, SALT_ROUNDS);
+ if (!user.password) {
+ throw new Error('User has no password');
+ }
- if (user.password) {
- // Compare the new password with the old password
- const isSamePassword = await compare(password, user.password);
+ const isCurrentPasswordValid = await compare(currentPassword, user.password);
+ if (!isCurrentPasswordValid) {
+ throw new Error('Current password is incorrect.');
+ }
- if (isSamePassword) {
- throw new Error('Your new password cannot be the same as your old password.');
- }
+ // Compare the new password with the old password
+ const isSamePassword = await compare(password, user.password);
+ if (isSamePassword) {
+ throw new Error('Your new password cannot be the same as your old password.');
}
+ const hashedNewPassword = await hash(password, SALT_ROUNDS);
+
const updatedUser = await prisma.user.update({
where: {
id: userId,
},
data: {
- password: hashedPassword,
+ password: hashedNewPassword,
},
});
diff --git a/packages/trpc/server/profile-router/router.ts b/packages/trpc/server/profile-router/router.ts
index c5756c480..8d83528c0 100644
--- a/packages/trpc/server/profile-router/router.ts
+++ b/packages/trpc/server/profile-router/router.ts
@@ -67,11 +67,12 @@ export const profileRouter = router({
.input(ZUpdatePasswordMutationSchema)
.mutation(async ({ input, ctx }) => {
try {
- const { password } = input;
+ const { password, currentPassword } = input;
return await updatePassword({
userId: ctx.user.id,
password,
+ currentPassword,
});
} catch (err) {
let message =
diff --git a/packages/trpc/server/profile-router/schema.ts b/packages/trpc/server/profile-router/schema.ts
index a910ec3cc..44a8a451c 100644
--- a/packages/trpc/server/profile-router/schema.ts
+++ b/packages/trpc/server/profile-router/schema.ts
@@ -10,6 +10,7 @@ export const ZUpdateProfileMutationSchema = z.object({
});
export const ZUpdatePasswordMutationSchema = z.object({
+ currentPassword: z.string().min(6),
password: z.string().min(6),
});