From a39262ec4bed404254f9fa545beff890ffdd67ce Mon Sep 17 00:00:00 2001
From: Baobhan Sith <80159437+Heavrnl@users.noreply.github.com>
Date: Thu, 8 May 2025 14:30:48 +0800
Subject: [PATCH] Update passkey.service.ts

---
 .../backend/src/services/passkey.service.ts     | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/packages/backend/src/services/passkey.service.ts b/packages/backend/src/services/passkey.service.ts
index 6a38f12..c6e4b46 100644
--- a/packages/backend/src/services/passkey.service.ts
+++ b/packages/backend/src/services/passkey.service.ts
@@ -99,20 +99,23 @@ export class PasskeyService {
         throw new Error('User not found for the provided handle.');
     }
 
+    // The actual WebAuthn response is nested within the received object
+    const actualRegistrationResponse = (registrationResponseJSON as any).registrationResponse;
+
+    // Add a check for the presence of credential ID before calling the library
+    if (!actualRegistrationResponse || !actualRegistrationResponse.id) {
+      console.error('Missing credential ID in actualRegistrationResponse from client:', registrationResponseJSON);
+      throw new Error('Registration failed: Missing or malformed credential ID from client.');
+    }
+
     const verifyOpts: VerifyRegistrationResponseOpts = {
-      response: registrationResponseJSON,
+      response: actualRegistrationResponse, // Use the nested object
       expectedChallenge,
       expectedOrigin: RP_ORIGIN,
       expectedRPID: RP_ID,
       requireUserVerification: true,
     };
 
-    // Add a check for the presence of credential ID before calling the library
-    if (!registrationResponseJSON || !registrationResponseJSON.id) {
-      console.error('Missing credential ID in registrationResponseJSON from client:', registrationResponseJSON);
-      throw new Error('Registration failed: Missing credential ID from client.');
-    }
-
     const verification = await verifyRegistrationResponse(verifyOpts);
 
     if (verification.verified && verification.registrationInfo) {