refactor(schema): Rename schemas and types file for user. And enhance…

… OTP validation
keyshade-xyz · Nov 18, 2024 · 4a08ce2 · 4a08ce2
1 parent c95feaa
commit 4a08ce2
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 8 deletions.
diff --git a/packages/schema/src/index.ts b/packages/schema/src/index.ts
@@ -12,9 +12,7 @@ export * from './environment'
 export * from './integration'
 export * from './project'
 export * from './secret'
-
-export * from './user/user'
-
+export * from './user'
 export * from './variable'
 
 export * from './workspace/workspace'

diff --git a/packages/schema/src/index.types.ts b/packages/schema/src/index.types.ts
@@ -36,8 +36,7 @@ export type TForkProject = z.infer<typeof ForkProjectSchema>
 export type TCreateSecret = z.infer<typeof CreateSecretSchema>
 export type TUpdateSecret = z.infer<typeof UpdateSecretSchema>
 
-// Export types from user.types.ts
-export * from './user/user.types'
+export * from './user/index.types'
 
 export type TCreateVariable = z.infer<typeof CreateVariableSchema>
 export type TUpdateVariable = z.infer<typeof UpdateVariableSchema>

diff --git a/packages/schema/src/user/user.ts → packages/schema/src/user/index.ts b/packages/schema/src/user/user.ts → packages/schema/src/user/index.ts
@@ -29,7 +29,7 @@ export const DeleteSelfRequestSchema = z.void()
 export const DeleteSelfResponseSchema = z.void()
 
 export const ValidateEmailChangeOTPRequestSchema = z.object({
-  otp: z.string()
+  otp: z.string().min(6).max(6)
 })
 
 export const ValidateEmailChangeOTPResponseSchema =

diff --git a/packages/schema/src/user/user.types.ts → packages/schema/src/user/index.types.ts b/packages/schema/src/user/user.types.ts → packages/schema/src/user/index.types.ts
@@ -9,7 +9,7 @@ import {
   ValidateEmailChangeOTPResponseSchema,
   ResendEmailChangeOTPRequestSchema,
   ResendEmailChangeOTPResponseSchema
-} from './user'
+} from '.'
 
 export type GetSelfResponse = z.infer<typeof GetSelfResponseSchema>
 

diff --git a/packages/schema/tests/user.spec.ts b/packages/schema/tests/user.spec.ts
@@ -8,7 +8,7 @@ import {
   ValidateEmailChangeOTPResponseSchema,
   ResendEmailChangeOTPRequestSchema,
   ResendEmailChangeOTPResponseSchema
-} from '@/user/user'
+} from '@/user'
 
 describe('User Schema Tests', () => {
   // Tests for GetSelfResponseSchema
@@ -122,6 +122,14 @@ describe('User Schema Tests', () => {
     expect(result.success).toBe(true)
   })
 
+  it('should fail validation for OTP of length other than 6 ValidateEmailChangeOTPRequestSchema', () => {
+    const result = ValidateEmailChangeOTPRequestSchema.safeParse({
+      otp: '234' // Should be a 6 digit string
+    })
+    expect(result.success).toBe(false)
+    expect(result.error?.issues.length).toBe(1)
+  })
+
   it('should fail validation for invalid ValidateEmailChangeOTPRequestSchema', () => {
     const result = ValidateEmailChangeOTPRequestSchema.safeParse({
       otp: 123456 // Should be a string