From 86d5621e4609279c581a97001a125e7ea7978696 Mon Sep 17 00:00:00 2001
From: peintnermax <max@caos.ch>
Date: Mon, 1 Apr 2024 14:27:15 +0200
Subject: [PATCH] register callback

---
 apps/login/app/(login)/verify/page.tsx | 12 ++++++++++--
 apps/login/ui/RegisterForm.tsx         |  7 +++++++
 apps/login/ui/VerifyEmailForm.tsx      |  2 ++
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/apps/login/app/(login)/verify/page.tsx b/apps/login/app/(login)/verify/page.tsx
index 591c3fd9e2f..6386f0fc5d3 100644
--- a/apps/login/app/(login)/verify/page.tsx
+++ b/apps/login/app/(login)/verify/page.tsx
@@ -4,8 +4,15 @@ import VerifyEmailForm from "#/ui/VerifyEmailForm";
 import { ExclamationTriangleIcon } from "@heroicons/react/24/outline";
 
 export default async function Page({ searchParams }: { searchParams: any }) {
-  const { userID, code, submit, organization, loginname, passwordset } =
-    searchParams;
+  const {
+    userID,
+    code,
+    submit,
+    organization,
+    authRequestId,
+    loginname,
+    passwordset,
+  } = searchParams;
 
   const branding = await getBrandingSettings(server, organization);
 
@@ -23,6 +30,7 @@ export default async function Page({ searchParams }: { searchParams: any }) {
             code={code}
             submit={submit === "true"}
             organization={organization}
+            authRequestId={authRequestId}
           />
         ) : (
           <div className="w-full flex flex-row items-center justify-center border border-yellow-600/40 dark:border-yellow-500/20 bg-yellow-200/30 text-yellow-600 dark:bg-yellow-700/20 dark:text-yellow-200 rounded-md py-2 scroll-px-40">
diff --git a/apps/login/ui/RegisterForm.tsx b/apps/login/ui/RegisterForm.tsx
index 5e95f2efeda..86ef5348eed 100644
--- a/apps/login/ui/RegisterForm.tsx
+++ b/apps/login/ui/RegisterForm.tsx
@@ -18,6 +18,7 @@ import {
 } from "#/utils/validators";
 import { useRouter } from "next/navigation";
 import { Spinner } from "./Spinner";
+import { AuthRequest } from "@zitadel/server";
 
 type Inputs =
   | {
@@ -33,12 +34,14 @@ type Props = {
   legal: LegalAndSupportSettings;
   passwordComplexitySettings: PasswordComplexitySettings;
   organization?: string;
+  authRequestId?: string;
 };
 
 export default function RegisterForm({
   legal,
   passwordComplexitySettings,
   organization,
+  authRequestId,
 }: Props) {
   const { register, handleSubmit, watch, formState } = useForm<Inputs>({
     mode: "onBlur",
@@ -81,6 +84,10 @@ export default function RegisterForm({
         params.organization = organization;
       }
 
+      if (authRequestId) {
+        params.authRequestId = authRequestId;
+      }
+
       return router.push(`/verify?` + new URLSearchParams(params));
     });
   }
diff --git a/apps/login/ui/VerifyEmailForm.tsx b/apps/login/ui/VerifyEmailForm.tsx
index c9463e9e719..e3bd9472df3 100644
--- a/apps/login/ui/VerifyEmailForm.tsx
+++ b/apps/login/ui/VerifyEmailForm.tsx
@@ -17,6 +17,7 @@ type Props = {
   code: string;
   submit: boolean;
   organization?: string;
+  authRequestId?: string;
 };
 
 export default function VerifyEmailForm({
@@ -24,6 +25,7 @@ export default function VerifyEmailForm({
   code,
   submit,
   organization,
+  authRequestId,
 }: Props) {
   const { register, handleSubmit, formState } = useForm<Inputs>({
     mode: "onBlur",