-
Notifications
You must be signed in to change notification settings - Fork 80
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(core): add components for reset password
- Loading branch information
1 parent
801bead
commit f9135e6
Showing
7 changed files
with
266 additions
and
20 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
--- | ||
"@bigcommerce/catalyst-core": minor | ||
"@bigcommerce/components": patch | ||
--- | ||
Add reset password functionality | ||
Update props for message field |
41 changes: 41 additions & 0 deletions
41
apps/core/app/[locale]/(default)/login/_actions/submit-reset-password-form.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
'use server'; | ||
|
||
import { z } from 'zod'; | ||
|
||
import { ResetPasswordSchema, submitResetPassword } from '~/client/mutations/submit-reset-password'; | ||
|
||
interface SubmitRessetPasswordForm { | ||
formData: FormData; | ||
reCaptchaToken: string; | ||
} | ||
|
||
export const submitResetPasswordForm = async ({ | ||
formData, | ||
reCaptchaToken, | ||
}: SubmitRessetPasswordForm) => { | ||
try { | ||
const parsedData = ResetPasswordSchema.parse({ | ||
email: formData.get('email'), | ||
}); | ||
|
||
const response = await submitResetPassword({ | ||
email: parsedData.email, | ||
reCaptchaToken, | ||
}); | ||
|
||
if (response.customer.requestResetPassword.errors.length === 0) { | ||
return { status: 'success', data: parsedData }; | ||
} | ||
|
||
return { | ||
status: 'failed', | ||
error: response.customer.requestResetPassword.errors.map((error) => error.message).join('\n'), | ||
}; | ||
} catch (error: unknown) { | ||
if (error instanceof Error || error instanceof z.ZodError) { | ||
return { status: 'failed', error: error.message }; | ||
} | ||
|
||
return { status: 'failed', error: 'Unknown error' }; | ||
} | ||
}; |
166 changes: 166 additions & 0 deletions
166
apps/core/app/[locale]/(default)/login/_components/reset-password-form.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,166 @@ | ||
'use client'; | ||
|
||
import { Button } from '@bigcommerce/components/button'; | ||
import { | ||
Field, | ||
FieldControl, | ||
FieldLabel, | ||
FieldMessage, | ||
Form, | ||
FormSubmit, | ||
} from '@bigcommerce/components/form'; | ||
import { Input } from '@bigcommerce/components/input'; | ||
import { Message } from '@bigcommerce/components/message'; | ||
import { Loader2 as Spinner } from 'lucide-react'; | ||
import { useTranslations } from 'next-intl'; | ||
import { ChangeEvent, useRef, useState } from 'react'; | ||
import { useFormStatus } from 'react-dom'; | ||
import ReCaptcha from 'react-google-recaptcha'; | ||
|
||
import { submitResetPasswordForm } from '../_actions/submit-reset-password-form'; | ||
|
||
interface Props { | ||
reCaptchaSettings?: { | ||
isEnabledOnStorefront: boolean; | ||
siteKey: string; | ||
}; | ||
} | ||
|
||
interface FormStatus { | ||
status: 'success' | 'error'; | ||
message: string; | ||
} | ||
|
||
const SubmitButton = () => { | ||
const { pending } = useFormStatus(); | ||
const t = useTranslations('Account.SubmitResetPassword'); | ||
|
||
return ( | ||
<Button | ||
className="relative w-fit items-center px-8 py-2" | ||
data-button | ||
disabled={pending} | ||
variant="primary" | ||
> | ||
<> | ||
{pending && ( | ||
<> | ||
<span className="absolute z-10 flex h-full w-full items-center justify-center bg-gray-400"> | ||
<Spinner aria-hidden="true" className="animate-spin" /> | ||
</span> | ||
<span className="sr-only">{t('spinnerText')}</span> | ||
</> | ||
)} | ||
<span aria-hidden={pending}>{t('submitText')}</span> | ||
</> | ||
</Button> | ||
); | ||
}; | ||
|
||
export const ResetPasswordForm = ({ reCaptchaSettings }: Props) => { | ||
const form = useRef<HTMLFormElement>(null); | ||
const [formStatus, setFormStatus] = useState<FormStatus | null>(null); | ||
const [isEmailValid, setIsEmailValid] = useState(true); | ||
|
||
const t = useTranslations('Account.ResetPassword'); | ||
|
||
const reCaptchaRef = useRef<ReCaptcha>(null); | ||
const [reCaptchaToken, setReCaptchaToken] = useState(''); | ||
const [isReCaptchaValid, setReCaptchaValid] = useState(true); | ||
|
||
const onReCatpchaChange = (token: string | null) => { | ||
if (!token) { | ||
return setReCaptchaValid(false); | ||
} | ||
|
||
setReCaptchaToken(token); | ||
setReCaptchaValid(true); | ||
}; | ||
|
||
const handleEmailValidation = (e: ChangeEvent<HTMLInputElement>) => { | ||
const validationStatus = e.target.validity.valueMissing; | ||
|
||
return setIsEmailValid(!validationStatus); | ||
}; | ||
|
||
const onSubmit = async (formData: FormData) => { | ||
if (reCaptchaSettings?.isEnabledOnStorefront && !reCaptchaToken) { | ||
return setReCaptchaValid(false); | ||
} | ||
|
||
setReCaptchaValid(true); | ||
|
||
const submit = await submitResetPasswordForm({ formData, reCaptchaToken }); | ||
|
||
if (submit.status === 'success') { | ||
form.current?.reset(); | ||
|
||
const customerEmail = formData.get('email'); | ||
|
||
setFormStatus({ | ||
status: 'success', | ||
message: t('successMessage', { email: customerEmail?.toString() }), | ||
}); | ||
} | ||
|
||
if (submit.status === 'failed') { | ||
setFormStatus({ status: 'error', message: submit.error ?? '' }); | ||
} | ||
|
||
reCaptchaRef.current?.reset(); | ||
}; | ||
|
||
return ( | ||
<> | ||
{formStatus && ( | ||
<Message className="mb-8 w-full" variant={formStatus.status}> | ||
<p>{formStatus.message}</p> | ||
</Message> | ||
)} | ||
|
||
<p className="mb-4 text-base">{t('description')}</p> | ||
|
||
<Form action={onSubmit} className="mb-14 flex flex-col gap-4 md:py-4 lg:p-0" ref={form}> | ||
<Field className="relative space-y-2 pb-7" name="email"> | ||
<FieldLabel htmlFor="email">{t('emailLabel')}</FieldLabel> | ||
<FieldControl asChild> | ||
<Input | ||
autoComplete="email" | ||
id="email" | ||
onChange={handleEmailValidation} | ||
onInvalid={handleEmailValidation} | ||
required | ||
type="email" | ||
variant={!isEmailValid ? 'error' : undefined} | ||
/> | ||
</FieldControl> | ||
<FieldMessage | ||
className="absolute inset-x-0 bottom-0 inline-flex w-full text-sm text-gray-500" | ||
match="valueMissing" | ||
> | ||
{t('emailValidationMessage')} | ||
</FieldMessage> | ||
</Field> | ||
|
||
{reCaptchaSettings?.isEnabledOnStorefront && ( | ||
<Field className="relative col-span-full max-w-full space-y-2 pb-7" name="ReCAPTCHA"> | ||
<ReCaptcha | ||
onChange={onReCatpchaChange} | ||
ref={reCaptchaRef} | ||
sitekey={reCaptchaSettings.siteKey} | ||
/> | ||
{!isReCaptchaValid && ( | ||
<span className="text-red-200 absolute inset-x-0 bottom-0 inline-flex w-full text-xs font-normal"> | ||
{t('recaptchaText')} | ||
</span> | ||
)} | ||
</Field> | ||
)} | ||
|
||
<FormSubmit asChild> | ||
<SubmitButton /> | ||
</FormSubmit> | ||
</Form> | ||
</> | ||
); | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters