From 7c5e3c86d54c023ab6ebfc0da7b0d74d4ac4060b Mon Sep 17 00:00:00 2001
From: Victor Bojica <victor@niftylearning.io>
Date: Thu, 6 Feb 2025 12:39:27 +0200
Subject: [PATCH] type fixes

---
 lib/build/recipe/webauthn/api/implementation.js   | 4 ++--
 lib/build/recipe/webauthn/index.d.ts              | 2 +-
 lib/build/recipe/webauthn/index.js                | 3 +--
 lib/build/recipe/webauthn/recipeImplementation.js | 8 +-------
 lib/build/recipe/webauthn/types.d.ts              | 2 +-
 lib/ts/recipe/webauthn/index.ts                   | 4 ++--
 6 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/lib/build/recipe/webauthn/api/implementation.js b/lib/build/recipe/webauthn/api/implementation.js
index 300079813..b38e8f704 100644
--- a/lib/build/recipe/webauthn/api/implementation.js
+++ b/lib/build/recipe/webauthn/api/implementation.js
@@ -718,7 +718,7 @@ function getAPIImplementation() {
             }
             async function doRegisterCredentialAndVerifyEmailAndTryLinkIfNotPrimary(recipeUserId) {
                 let updateResponse = await options.recipeImplementation.registerCredential({
-                    recipeUserId,
+                    recipeUserId: recipeUserId.getAsString(),
                     webauthnGeneratedOptionsId,
                     credential,
                     userContext,
@@ -953,7 +953,7 @@ function getAPIImplementation() {
                 webauthnGeneratedOptionsId,
                 credential,
                 userContext,
-                recipeUserId: session.getRecipeUserId(),
+                recipeUserId: session.getRecipeUserId().getAsString(),
             });
             if (registerCredentialResponse.status !== "OK") {
                 return authUtils_1.AuthUtils.getErrorStatusResponseWithReason(
diff --git a/lib/build/recipe/webauthn/index.d.ts b/lib/build/recipe/webauthn/index.d.ts
index cc3daf865..38241da2f 100644
--- a/lib/build/recipe/webauthn/index.d.ts
+++ b/lib/build/recipe/webauthn/index.d.ts
@@ -336,7 +336,7 @@ export default class Wrapper {
         credential,
         userContext,
     }: {
-        recipeUserId: RecipeUserId;
+        recipeUserId: string;
         webauthnGeneratedOptionsId: string;
         credential: CredentialPayload;
         userContext?: Record<string, any>;
diff --git a/lib/build/recipe/webauthn/index.js b/lib/build/recipe/webauthn/index.js
index df6965d71..311792e69 100644
--- a/lib/build/recipe/webauthn/index.js
+++ b/lib/build/recipe/webauthn/index.js
@@ -33,7 +33,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getGeneratedOptions = exports.sendEmail = exports.sendRecoverAccountEmail = exports.createRecoverAccountLink = exports.registerCredential = exports.consumeRecoverAccountToken = exports.recoverAccount = exports.generateRecoverAccountToken = exports.verifyCredentials = exports.signIn = exports.signInOptions = exports.registerOptions = exports.Error = exports.init = void 0;
 const recipe_1 = __importDefault(require("./recipe"));
 const error_1 = __importDefault(require("./error"));
-const recipeUserId_1 = __importDefault(require("../../recipeUserId"));
 const constants_1 = require("../multitenancy/constants");
 const utils_1 = require("./utils");
 const __1 = require("../..");
@@ -271,7 +270,7 @@ class Wrapper {
             return consumeResp;
         }
         let result = await Wrapper.registerCredential({
-            recipeUserId: new recipeUserId_1.default(consumeResp.userId),
+            recipeUserId: consumeResp.userId,
             webauthnGeneratedOptionsId,
             credential,
             userContext,
diff --git a/lib/build/recipe/webauthn/recipeImplementation.js b/lib/build/recipe/webauthn/recipeImplementation.js
index e6e586dcf..3c3b179a2 100644
--- a/lib/build/recipe/webauthn/recipeImplementation.js
+++ b/lib/build/recipe/webauthn/recipeImplementation.js
@@ -68,16 +68,10 @@ function getRecipeInterface(querier, getWebauthnConfig) {
                 }
                 const user = result.user;
                 // todo this might be wrong but will have to figure out - what happens when there are multiple webauthn login methods ?
-                const parsedEmail =
+                email =
                     (_b = user.loginMethods.find((lm) => lm.recipeId === "webauthn")) === null || _b === void 0
                         ? void 0
                         : _b.email;
-                if (!parsedEmail) {
-                    return {
-                        status: "RECOVER_ACCOUNT_TOKEN_INVALID_ERROR",
-                    };
-                }
-                email = parsedEmail;
             }
             if (!email) {
                 return {
diff --git a/lib/build/recipe/webauthn/types.d.ts b/lib/build/recipe/webauthn/types.d.ts
index 5960e6394..96c4eaa61 100644
--- a/lib/build/recipe/webauthn/types.d.ts
+++ b/lib/build/recipe/webauthn/types.d.ts
@@ -307,7 +307,7 @@ export declare type RecipeInterface = {
         webauthnGeneratedOptionsId: string;
         credential: RegistrationPayload;
         userContext: UserContext;
-        recipeUserId: RecipeUserId;
+        recipeUserId: string;
     }): Promise<
         | {
               status: "OK";
diff --git a/lib/ts/recipe/webauthn/index.ts b/lib/ts/recipe/webauthn/index.ts
index eda27102a..5f18ae747 100644
--- a/lib/ts/recipe/webauthn/index.ts
+++ b/lib/ts/recipe/webauthn/index.ts
@@ -425,7 +425,7 @@ export default class Wrapper {
         }
 
         let result = await Wrapper.registerCredential({
-            recipeUserId: new RecipeUserId(consumeResp.userId),
+            recipeUserId: consumeResp.userId,
             webauthnGeneratedOptionsId,
             credential,
             userContext,
@@ -471,7 +471,7 @@ export default class Wrapper {
         credential,
         userContext,
     }: {
-        recipeUserId: RecipeUserId;
+        recipeUserId: string;
         webauthnGeneratedOptionsId: string;
         credential: CredentialPayload;
         userContext?: Record<string, any>;