From 7ba3e599d2994a66f345447a08dc12b166807262 Mon Sep 17 00:00:00 2001
From: NFish <douxc512@gmail.com>
Date: Fri, 18 Apr 2025 17:14:51 +0800
Subject: [PATCH] fix: update reset password token when email code verify
 success (#18364)

---
 web/app/reset-password/check-code/page.tsx | 6 +++++-
 web/service/common.ts                      | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/web/app/reset-password/check-code/page.tsx b/web/app/reset-password/check-code/page.tsx
index c6242b4504..480b513112 100644
--- a/web/app/reset-password/check-code/page.tsx
+++ b/web/app/reset-password/check-code/page.tsx
@@ -39,7 +39,11 @@ export default function CheckCode() {
       }
       setIsLoading(true)
       const ret = await verifyResetPasswordCode({ email, code, token })
-      ret.is_valid && router.push(`/reset-password/set-password?${searchParams.toString()}`)
+      if (ret.is_valid) {
+        const params = new URLSearchParams(searchParams)
+        params.set('token', encodeURIComponent(ret.token))
+        router.push(`/reset-password/set-password?${params.toString()}`)
+      }
     }
     catch (error) { console.error(error) }
     finally {
diff --git a/web/service/common.ts b/web/service/common.ts
index 9e0ea4aef1..e76cfb4196 100644
--- a/web/service/common.ts
+++ b/web/service/common.ts
@@ -338,7 +338,7 @@ export const sendResetPasswordCode = (email: string, language = 'en-US') =>
   post<CommonResponse & { data: string; message?: string; code?: string }>('/forgot-password', { body: { email, language } })
 
 export const verifyResetPasswordCode = (body: { email: string; code: string; token: string }) =>
-  post<CommonResponse & { is_valid: boolean }>('/forgot-password/validity', { body })
+  post<CommonResponse & { is_valid: boolean; token: string }>('/forgot-password/validity', { body })
 
 export const sendDeleteAccountCode = () =>
   get<CommonResponse & { data: string }>('/account/delete/verify')