From 2dac623c1e90d64f36b763a9918eaded8448a355 Mon Sep 17 00:00:00 2001
From: Max Peintner <peintnerm@gmail.com>
Date: Wed, 21 May 2025 09:23:44 +0200
Subject: [PATCH] check email sending

---
 apps/login/cypress/integration/verify.cy.ts | 2 +-
 apps/login/locales/de.json                  | 1 +
 apps/login/locales/en.json                  | 1 +
 apps/login/locales/es.json                  | 1 +
 apps/login/locales/it.json                  | 1 +
 apps/login/locales/pl.json                  | 1 +
 apps/login/locales/ru.json                  | 1 +
 apps/login/locales/zh.json                  | 1 +
 apps/login/src/app/(login)/verify/page.tsx  | 8 +++++++-
 apps/login/src/lib/server/loginname.ts      | 3 ++-
 apps/login/src/lib/server/verify.ts         | 8 ++------
 11 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/apps/login/cypress/integration/verify.cy.ts b/apps/login/cypress/integration/verify.cy.ts
index ab59b27363..464bf02e59 100644
--- a/apps/login/cypress/integration/verify.cy.ts
+++ b/apps/login/cypress/integration/verify.cy.ts
@@ -90,7 +90,7 @@ describe("verify email", () => {
     });
     // TODO: Avoid uncaught exception in application
     cy.once("uncaught:exception", () => false);
-    cy.visit("/verify?userId=221394658884845598&code=abc&send=true");
+    cy.visit("/verify?userId=221394658884845598&code=abc");
     cy.contains("Could not verify email", { timeout: 10_000 });
   });
 });
diff --git a/apps/login/locales/de.json b/apps/login/locales/de.json
index a2c137cf43..7471cc6ec7 100644
--- a/apps/login/locales/de.json
+++ b/apps/login/locales/de.json
@@ -181,6 +181,7 @@
       "description": "Geben Sie den Code ein, der in der Bestätigungs-E-Mail angegeben ist.",
       "noCodeReceived": "Keinen Code erhalten?",
       "resendCode": "Code erneut senden",
+      "codeSent": "Ein Code wurde gerade an Ihre E-Mail-Adresse gesendet.",
       "submit": "Weiter"
     }
   },
diff --git a/apps/login/locales/en.json b/apps/login/locales/en.json
index 63a45c7d15..164761f43d 100644
--- a/apps/login/locales/en.json
+++ b/apps/login/locales/en.json
@@ -181,6 +181,7 @@
       "description": "Enter the Code provided in the verification email.",
       "noCodeReceived": "Didn't receive a code?",
       "resendCode": "Resend code",
+      "codeSent": "A code has just been sent to your email address.",
       "submit": "Continue"
     }
   },
diff --git a/apps/login/locales/es.json b/apps/login/locales/es.json
index 60570eceb0..6e5dd43820 100644
--- a/apps/login/locales/es.json
+++ b/apps/login/locales/es.json
@@ -181,6 +181,7 @@
       "description": "Introduce el código proporcionado en el correo electrónico de verificación.",
       "noCodeReceived": "¿No recibiste un código?",
       "resendCode": "Reenviar código",
+      "codeSent": "Se ha enviado un código a tu dirección de correo electrónico.",
       "submit": "Continuar"
     }
   },
diff --git a/apps/login/locales/it.json b/apps/login/locales/it.json
index 53894fdf5d..1173906e82 100644
--- a/apps/login/locales/it.json
+++ b/apps/login/locales/it.json
@@ -181,6 +181,7 @@
       "description": "Inserisci il codice fornito nell'email di verifica.",
       "noCodeReceived": "Non hai ricevuto un codice?",
       "resendCode": "Invia di nuovo il codice",
+      "codeSent": "Un codice è stato appena inviato al tuo indirizzo email.",
       "submit": "Continua"
     }
   },
diff --git a/apps/login/locales/pl.json b/apps/login/locales/pl.json
index 52b802eccb..ac3758227e 100644
--- a/apps/login/locales/pl.json
+++ b/apps/login/locales/pl.json
@@ -181,6 +181,7 @@
       "description": "Wprowadź kod z wiadomości weryfikacyjnej.",
       "noCodeReceived": "Nie otrzymałeś kodu?",
       "resendCode": "Wyślij kod ponownie",
+      "codeSent": "Kod został właśnie wysłany na twój adres e-mail.",
       "submit": "Kontynuuj"
     }
   },
diff --git a/apps/login/locales/ru.json b/apps/login/locales/ru.json
index 197b9663be..48af7d29d3 100644
--- a/apps/login/locales/ru.json
+++ b/apps/login/locales/ru.json
@@ -181,6 +181,7 @@
       "description": "Введите код из письма подтверждения.",
       "noCodeReceived": "Не получили код?",
       "resendCode": "Отправить код повторно",
+      "codeSent": "Код отправлен на ваш email.",
       "submit": "Продолжить"
     }
   },
diff --git a/apps/login/locales/zh.json b/apps/login/locales/zh.json
index d4319dc051..526f36a80b 100644
--- a/apps/login/locales/zh.json
+++ b/apps/login/locales/zh.json
@@ -181,6 +181,7 @@
       "description": "输入验证邮件中的验证码。",
       "noCodeReceived": "没有收到验证码？",
       "resendCode": "重发验证码",
+      "codeSent": "刚刚发送了一封包含验证码的电子邮件。",
       "submit": "继续"
     }
   },
diff --git a/apps/login/src/app/(login)/verify/page.tsx b/apps/login/src/app/(login)/verify/page.tsx
index 567774b0e4..6975e6a586 100644
--- a/apps/login/src/app/(login)/verify/page.tsx
+++ b/apps/login/src/app/(login)/verify/page.tsx
@@ -1,4 +1,4 @@
-import { Alert } from "@/components/alert";
+import { Alert, AlertType } from "@/components/alert";
 import { DynamicTheme } from "@/components/dynamic-theme";
 import { UserAvatar } from "@/components/user-avatar";
 import { VerifyForm } from "@/components/verify-form";
@@ -148,6 +148,12 @@ export default async function Page(props: { searchParams: Promise<any> }) {
           </>
         )}
 
+        {id && send && (
+          <div className="py-4 w-full">
+            <Alert type={AlertType.INFO}>{tError("verify.codesent")}</Alert>
+          </div>
+        )}
+
         {sessionFactors ? (
           <UserAvatar
             loginName={loginName ?? sessionFactors.factors?.user?.loginName}
diff --git a/apps/login/src/lib/server/loginname.ts b/apps/login/src/lib/server/loginname.ts
index 8754e77d56..bbe08dfec8 100644
--- a/apps/login/src/lib/server/loginname.ts
+++ b/apps/login/src/lib/server/loginname.ts
@@ -268,13 +268,14 @@ export async function sendLoginname(command: SendLoginnameCommand) {
         return inviteCheck;
       }
 
-      // check if user was verified
+      // check if user was verified recently
       const isUserVerified = await checkUserVerification(
         session.factors.user.id,
       );
       if (!isUserVerified) {
         const params = new URLSearchParams({
           loginName: session.factors?.user?.loginName as string,
+          // send: "true", // set this to true to request a new code immediately
         });
 
         if (command.requestId) {
diff --git a/apps/login/src/lib/server/verify.ts b/apps/login/src/lib/server/verify.ts
index 334f3b5e32..07756f60ab 100644
--- a/apps/login/src/lib/server/verify.ts
+++ b/apps/login/src/lib/server/verify.ts
@@ -274,7 +274,6 @@ export async function resendVerification(command: resendVerifyEmailCommand) {
 
   const basePath = process.env.NEXT_PUBLIC_BASE_PATH ?? "";
 
-  const doSend = true;
   // create a new invite whenever the resend is called
   return command.isInvite
     ? createInviteCode({
@@ -282,22 +281,19 @@ export async function resendVerification(command: resendVerifyEmailCommand) {
         userId: command.userId,
         urlTemplate:
           `${host.includes("localhost") ? "http://" : "https://"}${host}${basePath}/verify?code={{.Code}}&userId={{.UserID}}&organization={{.OrgID}}&invite=true` +
-          (command.requestId ? `&requestId=${command.requestId}` : "") +
-          (doSend ? `&send=${doSend}` : ""),
+          (command.requestId ? `&requestId=${command.requestId}` : ""),
       }) //resendInviteCode({ serviceUrl, userId: command.userId })
     : resendEmailCode({
         userId: command.userId,
         serviceUrl,
         urlTemplate:
           `${host.includes("localhost") ? "http://" : "https://"}${host}${basePath}/verify?code={{.Code}}&userId={{.UserID}}&organization={{.OrgID}}` +
-          (command.requestId ? `&requestId=${command.requestId}` : "") +
-          (doSend ? `&send=${doSend}` : ""),
+          (command.requestId ? `&requestId=${command.requestId}` : ""),
       });
 }
 
 type sendEmailCommand = {
   serviceUrl: string;
-
   userId: string;
   urlTemplate: string;
 };