From d9d37720501292417f8935269e6d5e7578cded5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=92=D0=B0=D1=81=D0=B8=D0=BB=D0=B8=D0=B9=20=D0=95=D0=BB?=
 =?UTF-8?q?=D0=B8=D1=81=D0=B5=D0=B5=D0=B2?= <veliseev@ronasit.com>
Date: Thu, 2 Apr 2026 09:28:49 +0600
Subject: [PATCH] fix: pass identifier to verifyCode in add/update identifier
 hooks

---
 .../clerk/hooks/use-add-identifier.ts         | 20 ++++++++++---------
 .../clerk/hooks/use-update-identifier.ts      |  2 +-
 src/lib/src/features/clerk/types/types.ts     |  2 +-
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/lib/src/features/clerk/hooks/use-add-identifier.ts b/src/lib/src/features/clerk/hooks/use-add-identifier.ts
index 2901880..138700b 100644
--- a/src/lib/src/features/clerk/hooks/use-add-identifier.ts
+++ b/src/lib/src/features/clerk/hooks/use-add-identifier.ts
@@ -16,7 +16,6 @@ import { IdentifierType, UseAddIdentifierReturn } from '../types';
  */
 export function useAddIdentifier(type: IdentifierType): UseAddIdentifierReturn {
   const { user } = useUser();
-  const [identifierResource, setIdentifierResource] = useState<PhoneNumberResource | EmailAddressResource>();
   const [isCreating, setIsCreating] = useState(false);
   const [isVerifying, setIsVerifying] = useState(false);
 
@@ -26,9 +25,7 @@ export function useAddIdentifier(type: IdentifierType): UseAddIdentifierReturn {
     setIsCreating(true);
 
     try {
-      let resource = isEmail
-        ? user?.emailAddresses.find((a) => a.emailAddress === identifier)
-        : user?.phoneNumbers.find((a) => a.phoneNumber === identifier);
+      let resource = getIdentifierResource(identifier);
 
       // If the resource already exists, re-creating it will cause an error,
       // so skip the creation step and go to the send verification code flow.
@@ -41,8 +38,6 @@ export function useAddIdentifier(type: IdentifierType): UseAddIdentifierReturn {
       }
       await prepareVerification({ isEmail, identifier });
 
-      setIdentifierResource(resource);
-
       return { isSuccess: true, user };
     } catch (e) {
       if (isClerkAPIResponseError(e)) {
@@ -55,11 +50,13 @@ export function useAddIdentifier(type: IdentifierType): UseAddIdentifierReturn {
     }
   };
 
-  const verifyCode: UseAddIdentifierReturn['verifyCode'] = async ({ code }) => {
+  const verifyCode: UseAddIdentifierReturn['verifyCode'] = async ({ code, identifier }) => {
     setIsVerifying(true);
 
     try {
-      const verifyAttempt = await identifierResource?.attemptVerification({ code });
+      const resource = getIdentifierResource(identifier);
+
+      const verifyAttempt = await resource?.attemptVerification({ code });
 
       if (verifyAttempt?.verification?.status === 'verified') {
         return { isSuccess: true, user };
@@ -80,7 +77,12 @@ export function useAddIdentifier(type: IdentifierType): UseAddIdentifierReturn {
     await (isEmail
       ? emailResource?.prepareVerification({ strategy: 'email_code' })
       : phoneResource?.prepareVerification());
-    setIdentifierResource(isEmail ? emailResource : phoneResource);
+  };
+
+  const getIdentifierResource = (identifier: string): EmailAddressResource | PhoneNumberResource | undefined => {
+    return isEmail
+      ? user?.emailAddresses.find((a) => a.emailAddress === identifier)
+      : user?.phoneNumbers.find((a) => a.phoneNumber === identifier);
   };
 
   return { createIdentifier, verifyCode, isCreating, isVerifying };
diff --git a/src/lib/src/features/clerk/hooks/use-update-identifier.ts b/src/lib/src/features/clerk/hooks/use-update-identifier.ts
index 591bb49..4ad5016 100644
--- a/src/lib/src/features/clerk/hooks/use-update-identifier.ts
+++ b/src/lib/src/features/clerk/hooks/use-update-identifier.ts
@@ -74,7 +74,7 @@ export function useUpdateIdentifier(type: IdentifierType): UseUpdateIdentifierRe
   const verifyCode: UseUpdateIdentifierReturn['verifyCode'] = async ({ code, identifier }) => {
     setIsUpdating(true);
 
-    const result = await verifyAddIdentifierCode({ code });
+    const result = await verifyAddIdentifierCode({ code, identifier });
 
     // Important to reload user model after adding new fields
     await user?.reload();
diff --git a/src/lib/src/features/clerk/types/types.ts b/src/lib/src/features/clerk/types/types.ts
index e701df1..203e4ea 100644
--- a/src/lib/src/features/clerk/types/types.ts
+++ b/src/lib/src/features/clerk/types/types.ts
@@ -250,7 +250,7 @@ export interface UseAddIdentifierReturn {
    * - On success: `BaseSuccessReturn` with optional `user`.
    * - On failure: `BaseFailureReturn` with optional `verifyAttempt` (email or phone resource) and `user`.
    */
-  verifyCode: (params: { code: string }) => Promise<
+  verifyCode: (params: { code: string; identifier: string }) => Promise<
     (
       | BaseSuccessReturn
       | (BaseFailureReturn & {