feat: integrate other auth forgot-password reset-password fix bug auth

packages/core/src/auth/handlers/reset-password.ts

@@ -8,7 +8,7 @@
   prefix?: string
 }
 
 export function resetPasswordEmail<const TOptions extends InternalRouteOptions>(options: TOptions) {
   const schema = {
     method: 'POST',
     path: '/api/auth/reset-password',
@@ -86,7 +86,7 @@
   return createEndpoint(schema, handler)
 }
 
 export function validateResetToken<const TOptions extends InternalRouteOptions>(options: TOptions) {
   const schema = {
     method: 'POST',
     path: '/api/auth/validate-reset-password-token',
@@ -95,24 +95,40 @@
     }),
     responses: {
       200: z.object({
-        verification: z.object({
-          id: z.string(),
-          identifier: z.string(),
-          value: z.string().nullable(),
-          expiresAt: z.date(),
-        }),
+        verification: z
+          .object({
+            id: z.string(),
+            identifier: z.string(),
+            value: z.string().nullable(),
+            expiresAt: z.date(),
+          })
+          .nullable(),
       }),
     },
   } as const satisfies ApiRouteSchema
 
   const handler: ApiRouteHandler<AuthContext, typeof schema> = async (args) => {
-    const verification = await args.context.internalHandlers.verification.findByIdentifier(
-      `reset-password:${args.body.token}`
-    )
+    try {
+      const verification = await args.context.internalHandlers.verification.findByIdentifier(
+        `reset-password:${args.body.token}`
+      )
+
+      if (!verification || verification.expiresAt < new Date()) {
+        return {
+          status: 200,
+          body: { verification: null },
+        }
+      }
 
-    return {
-      status: 200,
-      body: { verification },
+      return {
+        status: 200,
+        body: { verification: verification ?? null },
+      }
+    } catch {
+      return {
+        status: 200,
+        body: { verification: null },
+      }
     }
   }
 

packages/next/src/views/auth/login.client.tsx

@@ -15,6 +15,7 @@ import { useServerFunction } from '../../providers/root'
 
 const schema = z.object({
   email: z.string().email({ message: 'Invalid email address' }),
+  // TODO: custom password validation
   password: z
     .string()
     .min(8, { message: 'Password must be at least 8 characters long' })

packages/next/src/views/auth/reset-password/reset-password.client.tsx

@@ -1,6 +1,5 @@
 'use client'
 
-import { useEffect, useState } from 'react'
 import { useForm } from 'react-hook-form'
 
 import { zodResolver } from '@hookform/resolvers/zod'
@@ -16,6 +15,7 @@ import { useServerFunction } from '../../../providers/root'
 
 const formSchema = z
   .object({
+    // TODO: custom password validation
     password: z
       .string()
       .min(8, { message: 'Password must be at least 8 characters long' })
@@ -31,38 +31,12 @@ const formSchema = z
 
 interface ResetPasswordClientFormProps {
   token?: string
+  isErrorToken: boolean
 }
 
-export function ResetPasswordClientForm({ token }: ResetPasswordClientFormProps) {
-  const [isErrorToken, setIsErrorToken] = useState<boolean>(false)
-
+export function ResetPasswordClientForm({ token, isErrorToken }: ResetPasswordClientFormProps) {
   const serverFunction = useServerFunction()
 
-  useEffect(() => {
-    async function validateToken() {
-      const tokenResponse = await serverFunction({
-        method: 'auth.validateResetToken',
-        body: {
-          token: token || '',
-        },
-        headers: {},
-        query: {},
-        pathParams: {},
-      })
-
-      console.log('Token validation response:', tokenResponse)
-
-      if (tokenResponse.status !== 200) {
-        setIsErrorToken(true)
-        toast.error('Invalid or expired token', {
-          description: tokenResponse.body.status || 'Failed to validate token',
-        })
-      }
-    }
-
-    validateToken()
-  }, [token])
-
   const form = useForm({
     resolver: zodResolver(formSchema),
     mode: 'all',

packages/next/src/views/auth/reset-password/reset-password.tsx

@@ -7,15 +7,15 @@ interface ResetPasswordViewProps {
   searchParams: { [key: string]: string | string[] }
 }
 
-export async function ResetPasswordView({ searchParams }: ResetPasswordViewProps) {
+export async function ResetPasswordView({ searchParams, serverConfig }: ResetPasswordViewProps) {
   const token = searchParams['token'] as string | undefined
 
-  // const tokenResponse = await serverFunction({
-  //   method: 'auth.validateResetToken',
-  //   body: {
-  //     token: token || '',
-  //   },
-  // })
+  const validateToken = await serverConfig.endpoints['auth.validateResetToken'].handler({
+    body: {
+      token: token || '',
+    },
+    context: {},
+  })
 
-  return <ResetPasswordClientForm token={token} />
+  return <ResetPasswordClientForm token={token} isErrorToken={!validateToken?.body?.verification} />
 }