Fix sign up rate-limiting issues (#7344)

AudiusProject · Jan 25, 2024 · 0513090 · 0513090
1 parent 1bcc737
commit 0513090
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 9 deletions.
diff --git a/packages/common/src/schemas/sign-on/emailSchema.ts b/packages/common/src/schemas/sign-on/emailSchema.ts
@@ -7,7 +7,8 @@ import { EMAIL_REGEX } from 'utils/email'
 export const emailSchemaMessages = {
   emailRequired: 'Please enter an email.',
   invalidEmail: 'Please enter a valid email.',
-  emailInUse: 'Email already taken.'
+  emailInUse: 'Email already taken.',
+  somethingWentWrong: 'Something went wrong. Try again later.'
 }
 
 export const emailSchema = <T extends AudiusQueryContextType>(
@@ -17,10 +18,26 @@ export const emailSchema = <T extends AudiusQueryContextType>(
     email: z
       .string({ required_error: emailSchemaMessages.emailRequired })
       .regex(EMAIL_REGEX, { message: emailSchemaMessages.invalidEmail })
-      .refine(
-        async (email) => {
-          return !(await signUpFetch.isEmailInUse({ email }, queryContext))
-        },
-        { message: emailSchemaMessages.emailInUse }
-      )
+      .superRefine(async (email, ctx) => {
+        const validEmail = EMAIL_REGEX.test(email)
+        if (!validEmail) return true
+        const isEmailInUse = await signUpFetch.isEmailInUse(
+          { email },
+          queryContext
+        )
+        if (isEmailInUse === undefined) {
+          ctx.addIssue({
+            code: z.ZodIssueCode.custom,
+            message: emailSchemaMessages.somethingWentWrong
+          })
+          return true
+        } else if (isEmailInUse) {
+          ctx.addIssue({
+            code: z.ZodIssueCode.custom,
+            message: emailSchemaMessages.emailInUse
+          })
+          return true
+        }
+        return false
+      })
   })
diff --git a/packages/mobile/src/screens/sign-on-screen/components/NewEmailField.tsx b/packages/mobile/src/screens/sign-on-screen/components/NewEmailField.tsx
@@ -24,7 +24,6 @@ export const NewEmailField = (props: NewEmailFieldProps) => {
         {...props}
         error={emailInUse ? false : undefined}
         helperText={emailInUse ? false : undefined}
-        debouncedValidationMs={500}
       />
       {emailInUse || (hadError && isValidating) ? (
         <EmailInUseHint onChangeScreen={onChangeScreen} />

diff --git a/packages/web/src/pages/sign-up-page/components/EmailField.tsx b/packages/web/src/pages/sign-up-page/components/EmailField.tsx
@@ -53,7 +53,6 @@ export const NewEmailField = () => {
   return (
     <>
       <EmailField
-        debouncedValidationMs={500}
         // Don't show red error message when emailInUse
         helperText={emailInUse ? '' : undefined}
       />