From 6764e6fc66a1d39a7c95cb4e26cb9595c9ffa6f4 Mon Sep 17 00:00:00 2001
From: peintnermax <max@caos.ch>
Date: Tue, 7 May 2024 10:04:03 +0200
Subject: [PATCH] u2fId

---
 apps/login/app/api/u2f/verify/route.ts |  4 ++--
 apps/login/lib/zitadel.ts              |  4 ++--
 apps/login/ui/RegisterU2F.tsx          | 12 ++++++------
 packages/zitadel-server/src/index.ts   |  2 ++
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/apps/login/app/api/u2f/verify/route.ts b/apps/login/app/api/u2f/verify/route.ts
index a784fc79071..c0aee95ceac 100644
--- a/apps/login/app/api/u2f/verify/route.ts
+++ b/apps/login/app/api/u2f/verify/route.ts
@@ -6,7 +6,7 @@ import { NextRequest, NextResponse, userAgent } from "next/server";
 export async function POST(request: NextRequest) {
   const body = await request.json();
   if (body) {
-    let { passkeyId, passkeyName, publicKeyCredential, sessionId } = body;
+    let { u2fId, passkeyName, publicKeyCredential, sessionId } = body;
 
     if (!!!passkeyName) {
       const { browser, device, os } = userAgent(request);
@@ -27,7 +27,7 @@ export async function POST(request: NextRequest) {
     if (userId) {
       const req: VerifyU2FRegistrationRequest = {
         publicKeyCredential,
-        u2fId: passkeyId,
+        u2fId,
         userId,
         tokenName: passkeyName,
       };
diff --git a/apps/login/lib/zitadel.ts b/apps/login/lib/zitadel.ts
index bc13e4d5957..bea3c3688b9 100644
--- a/apps/login/lib/zitadel.ts
+++ b/apps/login/lib/zitadel.ts
@@ -21,7 +21,7 @@ import {
   CreateSessionResponse,
   GetBrandingSettingsResponse,
   GetPasswordComplexitySettingsResponse,
-  AddMyAuthFactorOTPResponse,
+  RegisterU2FResponse,
   GetLegalAndSupportSettingsResponse,
   AddHumanUserResponse,
   BrandingSettings,
@@ -509,7 +509,7 @@ export async function createPasskeyRegistrationLink(
 export async function registerU2F(
   userId: string,
   domain: string
-): Promise<any> {
+): Promise<RegisterU2FResponse> {
   const userservice = user.getUser(server);
 
   return userservice.registerU2F({
diff --git a/apps/login/ui/RegisterU2F.tsx b/apps/login/ui/RegisterU2F.tsx
index 7fb2d2cd16c..84ddc27c000 100644
--- a/apps/login/ui/RegisterU2F.tsx
+++ b/apps/login/ui/RegisterU2F.tsx
@@ -6,7 +6,7 @@ import { useForm } from "react-hook-form";
 import { useRouter } from "next/navigation";
 import { Spinner } from "./Spinner";
 import Alert from "./Alert";
-import { AuthRequest, RegisterPasskeyResponse } from "@zitadel/server";
+import { RegisterU2FResponse } from "@zitadel/server";
 import { coerceToArrayBuffer, coerceToBase64Url } from "#/utils/base64";
 type Inputs = {};
 
@@ -55,7 +55,7 @@ export default function RegisterU2F({
   }
 
   async function submitVerify(
-    passkeyId: string,
+    u2fId: string,
     passkeyName: string,
     publicKeyCredential: any,
     sessionId: string
@@ -67,7 +67,7 @@ export default function RegisterU2F({
         "Content-Type": "application/json",
       },
       body: JSON.stringify({
-        passkeyId,
+        u2fId,
         passkeyName,
         publicKeyCredential,
         sessionId,
@@ -85,8 +85,8 @@ export default function RegisterU2F({
   }
 
   function submitRegisterAndContinue(value: Inputs): Promise<boolean | void> {
-    return submitRegister().then((resp: RegisterPasskeyResponse) => {
-      const passkeyId = resp.passkeyId;
+    return submitRegister().then((resp: RegisterU2FResponse) => {
+      const u2fId = resp.u2fId;
 
       if (
         resp.publicKeyCredentialCreationOptions &&
@@ -145,7 +145,7 @@ export default function RegisterU2F({
                   ),
                 },
               };
-              return submitVerify(passkeyId, "", data, sessionId).then(() => {
+              return submitVerify(u2fId, "", data, sessionId).then(() => {
                 const params = new URLSearchParams();
 
                 if (organization) {
diff --git a/packages/zitadel-server/src/index.ts b/packages/zitadel-server/src/index.ts
index 3ce17619fab..50b13f8dbb9 100644
--- a/packages/zitadel-server/src/index.ts
+++ b/packages/zitadel-server/src/index.ts
@@ -96,6 +96,8 @@ export {
   VerifyTOTPRegistrationResponse,
   VerifyU2FRegistrationRequest,
   VerifyU2FRegistrationResponse,
+  RegisterU2FResponse,
+  RegisterU2FRequest,
 } from "./proto/server/zitadel/user/v2beta/user_service";
 
 export { AuthFactor } from "./proto/server/zitadel/user";