Ryan/documenso
1
0
Fork 1
mirror of https://github.com/documenso/documenso.git synced 2025-11-10 04:22:32 +10:00
Code Issues Packages Projects Releases Wiki Activity

chore: refactor

Browse Source
This commit is contained in:
Catalin Pit
2024-01-26 13:27:36 +02:00
parent e2fa01509d
commit b2cca9afb6
6 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/web/src/app/(unauthenticated)/unverified-account/page.tsx
View File

@ -18,7 +18,7 @@ export default function UnverifiedAccount() {
const searchParams = useSearchParams(); const searchParams = useSearchParams();
const { toast } = useToast(); const { toast } = useToast();
const encryptedEmail = searchParams?.get('t') ?? ''; // TODO: choose a better name instead of t const encryptedEmail = searchParams?.get('token') ?? '';
const { mutateAsync: sendConfirmationEmail } = trpc.profile.sendConfirmationEmail.useMutation(); const { mutateAsync: sendConfirmationEmail } = trpc.profile.sendConfirmationEmail.useMutation();
@ -26,7 +26,7 @@ export default function UnverifiedAccount() {
try { try {
setIsButtonDisabled(true); setIsButtonDisabled(true);
await sendConfirmationEmail({ email: encryptedEmail }); await sendConfirmationEmail({ encryptedEmail });
toast({ toast({
title: 'Success', title: 'Success',

2
apps/web/src/components/forms/signin.tsx
View File

@ -134,7 +134,7 @@ export const SignInForm = ({ className, isGoogleSSOEnabled }: SignInFormProps) =
if (result.error === ErrorCode.UNVERIFIED_EMAIL) { if (result.error === ErrorCode.UNVERIFIED_EMAIL) {
const encryptedEmail = await encryptSecondaryData({ data: email }); const encryptedEmail = await encryptSecondaryData({ data: email });
router.push(`/unverified-account?t=${encryptedEmail}`); router.push(`/unverified-account?token=${encryptedEmail}`);
return; return;
} }

2
apps/web/src/components/forms/signup.tsx
View File

@ -70,7 +70,7 @@ export const SignUpForm = ({ className, isGoogleSSOEnabled }: SignUpFormProps) =
const encryptedEmail = await encryptSecondaryData({ data: email }); const encryptedEmail = await encryptSecondaryData({ data: email });
router.push(`/unverified-account?t=${encryptedEmail}`); router.push(`/unverified-account?token=${encryptedEmail}`);
toast({ toast({
title: 'Registration Successful', title: 'Registration Successful',

1
packages/lib/server-only/user/send-confirmation-token.ts
View File

@ -37,7 +37,6 @@ export const sendConfirmationToken = async ({ email }: { email: string }) => {
throw new Error(`Failed to create the verification token`); throw new Error(`Failed to create the verification token`);
} }
// TODO: Revisit tomorrow
try { try {
await sendConfirmationEmail({ userId: user.id }); await sendConfirmationEmail({ userId: user.id });

10
packages/trpc/server/profile-router/router.ts
View File

@ -135,11 +135,15 @@ export const profileRouter = router({
.input(ZConfirmEmailMutationSchema) .input(ZConfirmEmailMutationSchema)
.mutation(async ({ input }) => { .mutation(async ({ input }) => {
try { try {
const { email } = input; const { encryptedEmail } = input;
const decryptedEmail = decryptSecondaryData(email); const decryptedEmail = decryptSecondaryData(encryptedEmail);
return await sendConfirmationToken({ email: decryptedEmail ?? '' }); // TODO: fix this tomorrow if (!decryptedEmail) {
throw new Error('Email is required');
}
return await sendConfirmationToken({ email: decryptedEmail });
} catch (err) { } catch (err) {
let message = 'We were unable to send a confirmation email. Please try again.'; let message = 'We were unable to send a confirmation email. Please try again.';

4
packages/trpc/server/profile-router/schema.ts
View File

@ -30,9 +30,9 @@ export const ZResetPasswordFormSchema = z.object({
password: z.string().min(6), password: z.string().min(6),
token: z.string().min(1), token: z.string().min(1),
}); });
// TODO: revisit this
export const ZConfirmEmailMutationSchema = z.object({ export const ZConfirmEmailMutationSchema = z.object({
email: z.string().min(1), encryptedEmail: z.string().min(1),
}); });
export type TRetrieveUserByIdQuerySchema = z.infer<typeof ZRetrieveUserByIdQuerySchema>; export type TRetrieveUserByIdQuerySchema = z.infer<typeof ZRetrieveUserByIdQuerySchema>;