fix-ENG-45 (#601)

Author: OmarMcAdam

apps/platform/trpc/routers/authRouter/passwordRouter.ts

@@ -168,7 +168,7 @@ export const passwordRouter = router({
     .use(ratelimiter({ limit: 20, namespace: 'signIn.password' }))
     .input(
       z.object({
-        username: zodSchemas.username(2),
+        username: zodSchemas.usernameLogin(2),
         password: z.string().min(8)
       })
     )

apps/platform/trpc/routers/authRouter/recoveryRouter.ts

@@ -27,7 +27,7 @@ export const recoveryRouter = router({
     .input(
       z
         .object({
-          username: zodSchemas.username(2),
+          username: zodSchemas.usernameLogin(2),
           recoveryCode: zodSchemas.nanoIdToken()
         })
         .and(

apps/platform/trpc/routers/orgRouter/mail/emailIdentityRouter.ts

@@ -32,7 +32,13 @@ export const emailIdentityRouter = router({
   checkEmailAvailability: orgProcedure
     .input(
       z.object({
-        emailUsername: z.string().min(1).max(255),
+        emailUsername: z
+          .string()
+          .min(1)
+          .max(255)
+          .regex(/^[a-zA-Z0-9._-]*$/, {
+            message: 'Only letters, numbers, dots, hyphens and underscores'
+          }),
         domainPublicId: typeIdValidator('domains')
       })
     )
@@ -89,7 +95,13 @@ export const emailIdentityRouter = router({
   createNewEmailIdentity: orgAdminProcedure
     .input(
       z.object({
-        emailUsername: z.string().min(1).max(255),
+        emailUsername: z
+          .string()
+          .min(1)
+          .max(255)
+          .regex(/^[a-zA-Z0-9._-]*$/, {
+            message: 'Only letters, numbers, dots, hyphens and underscores'
+          }),
         domainPublicId: typeIdValidator('domains'),
         sendName: z.string().min(2).max(255),
         catchAll: z.boolean().optional().default(false),

packages/utils/zodSchemas.ts

@@ -40,7 +40,19 @@ export const zodSchemas = {
         message: `Must be at least ${minLength} characters long`
       })
       .max(32, {
-        message: "Too Long, Ain't nobody typing that 😂"
+        message: 'Too Long'
+      })
+      .regex(/^[a-zA-Z0-9]*$/, {
+        message: 'Only letters and numbers'
+      }),
+  usernameLogin: (minLength: number = 5) =>
+    z
+      .string()
+      .min(minLength, {
+        message: `Must be at least ${minLength} characters long`
+      })
+      .max(32, {
+        message: 'Too Long'
       })
       .regex(/^[a-zA-Z0-9._-]*$/, {
         message: 'Only letters and numbers'