From 807f01f5b5b6184dd51f74a6d2a72e6bfcd25da5 Mon Sep 17 00:00:00 2001
From: Max Peintner <peintnerm@gmail.com>
Date: Tue, 24 Dec 2024 09:50:40 +0100
Subject: [PATCH] fix error handler, skip send

---
 apps/login/src/app/{ => (login)}/error.tsx | 0
 apps/login/src/app/(login)/verify/page.tsx | 6 ++++++
 apps/login/src/lib/server/register.ts      | 1 +
 apps/login/src/lib/verify-helper.ts        | 5 +++++
 4 files changed, 12 insertions(+)
 rename apps/login/src/app/{ => (login)}/error.tsx (100%)

diff --git a/apps/login/src/app/error.tsx b/apps/login/src/app/(login)/error.tsx
similarity index 100%
rename from apps/login/src/app/error.tsx
rename to apps/login/src/app/(login)/error.tsx
diff --git a/apps/login/src/app/(login)/verify/page.tsx b/apps/login/src/app/(login)/verify/page.tsx
index b4a46f7541..62f2284485 100644
--- a/apps/login/src/app/(login)/verify/page.tsx
+++ b/apps/login/src/app/(login)/verify/page.tsx
@@ -47,6 +47,9 @@ export default async function Page(props: { searchParams: Promise<any> }) {
       await resendVerification({
         userId: sessionFactors?.factors?.user?.id,
         isInvite: invite === "true",
+      }).catch((error) => {
+        console.error("Could not resend verification email", error);
+        throw Error("Could not request email");
       });
     }
   } else if ("userId" in searchParams && userId) {
@@ -54,6 +57,9 @@ export default async function Page(props: { searchParams: Promise<any> }) {
       await resendVerification({
         userId,
         isInvite: invite === "true",
+      }).catch((error) => {
+        console.error("Could not resend verification email", error);
+        throw Error("Could not request email");
       });
     }
 
diff --git a/apps/login/src/lib/server/register.ts b/apps/login/src/lib/server/register.ts
index 2902d9ac60..a73867deb0 100644
--- a/apps/login/src/lib/server/register.ts
+++ b/apps/login/src/lib/server/register.ts
@@ -92,6 +92,7 @@ export async function registerUser(command: RegisterUserCommand) {
       humanUser,
       session.factors.user.organizationId,
       command.authRequestId,
+      //true, // skip send as a mail was send during registration
     );
 
     if (emailVerificationCheck?.redirect) {
diff --git a/apps/login/src/lib/verify-helper.ts b/apps/login/src/lib/verify-helper.ts
index cc58f8c5dc..85b5ca68e4 100644
--- a/apps/login/src/lib/verify-helper.ts
+++ b/apps/login/src/lib/verify-helper.ts
@@ -62,6 +62,7 @@ export function checkEmailVerification(
   humanUser?: HumanUser,
   organization?: string,
   authRequestId?: string,
+  skipSend?: boolean,
 ) {
   if (
     !humanUser?.email?.isVerified &&
@@ -82,6 +83,10 @@ export function checkEmailVerification(
       );
     }
 
+    if (skipSend) {
+      params.append("skipsend", "true");
+    }
+
     return { redirect: `/verify?` + params };
   }
 }