From cba234196f310b6df26aaa003af540c96c933da0 Mon Sep 17 00:00:00 2001
From: Max Peintner <peintnerm@gmail.com>
Date: Fri, 3 Jan 2025 09:04:22 +0100
Subject: [PATCH] cleanup skipsend

---
 apps/login/src/app/(login)/verify/page.tsx | 13 +++----------
 apps/login/src/lib/server/register.ts      |  1 -
 apps/login/src/lib/verify-helper.ts        |  5 -----
 3 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/apps/login/src/app/(login)/verify/page.tsx b/apps/login/src/app/(login)/verify/page.tsx
index 959998c814..b47d9eed50 100644
--- a/apps/login/src/app/(login)/verify/page.tsx
+++ b/apps/login/src/app/(login)/verify/page.tsx
@@ -20,15 +20,8 @@ export default async function Page(props: { searchParams: Promise<any> }) {
   const t = await getTranslations({ locale, namespace: "verify" });
   const tError = await getTranslations({ locale, namespace: "error" });
 
-  const {
-    userId,
-    loginName,
-    code,
-    organization,
-    authRequestId,
-    invite,
-    skipsend,
-  } = searchParams;
+  const { userId, loginName, code, organization, authRequestId, invite } =
+    searchParams;
 
   const branding = await getBrandingSettings(organization);
 
@@ -37,7 +30,7 @@ export default async function Page(props: { searchParams: Promise<any> }) {
   let human: HumanUser | undefined;
   let id: string | undefined;
 
-  const doSend = !skipsend && invite !== "true";
+  const doSend = invite !== "true";
 
   if ("loginName" in searchParams) {
     sessionFactors = await loadMostRecentSession({
diff --git a/apps/login/src/lib/server/register.ts b/apps/login/src/lib/server/register.ts
index a73867deb0..2902d9ac60 100644
--- a/apps/login/src/lib/server/register.ts
+++ b/apps/login/src/lib/server/register.ts
@@ -92,7 +92,6 @@ 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 37600c0a7e..b37287a959 100644
--- a/apps/login/src/lib/verify-helper.ts
+++ b/apps/login/src/lib/verify-helper.ts
@@ -62,7 +62,6 @@ export function checkEmailVerification(
   humanUser?: HumanUser,
   organization?: string,
   authRequestId?: string,
-  skipSend?: boolean,
 ) {
   if (
     !humanUser?.email?.isVerified &&
@@ -83,10 +82,6 @@ export function checkEmailVerification(
       );
     }
 
-    if (skipSend) {
-      params.append("skipsend", "true");
-    }
-
     return { redirect: `/verify?` + params };
   }
 }