From 44c10ea991eeba826c12949838365f41ba6ac561 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=BE=E3=81=A3=E3=81=A1=E3=82=83=E3=81=A8=E3=83=BC?=
 =?UTF-8?q?=E3=81=AB=E3=82=85?=
 <17376330+u1-liquid@users.noreply.github.com>
Date: Thu, 28 Dec 2023 10:29:56 +0900
Subject: [PATCH] =?UTF-8?q?enhance(Email=20Validation):=20deep-email-valid?=
 =?UTF-8?q?ator=E3=82=92=E9=80=9A=E3=81=A3=E3=81=9F=E3=83=A1=E3=82=A2?=
 =?UTF-8?q?=E3=83=89=E3=81=AE=E3=81=BFverifymail.io=E3=81=A7=E7=A2=BA?=
 =?UTF-8?q?=E8=AA=8D=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=20(Missk?=
 =?UTF-8?q?eyIO#294)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/backend/src/core/EmailService.ts | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/backend/src/core/EmailService.ts b/packages/backend/src/core/EmailService.ts
index 7fc7800783..74fb33d51c 100644
--- a/packages/backend/src/core/EmailService.ts
+++ b/packages/backend/src/core/EmailService.ts
@@ -171,17 +171,17 @@ export class EmailService {
 		};
 
 		if (meta.enableActiveEmailValidation) {
-			if (meta.enableVerifymailApi && meta.verifymailAuthKey != null) {
+			validated = await validateEmail({
+				email: emailAddress,
+				validateRegex: true,
+				validateMx: true,
+				validateTypo: false, // TLDを見ているみたいだけどclubとか弾かれるので
+				validateDisposable: true, // 捨てアドかどうかチェック
+				validateSMTP: false, // 日本だと25ポートが殆どのプロバイダーで塞がれていてタイムアウトになるので
+			});
+
+			if (validated.valid && meta.enableVerifymailApi && meta.verifymailAuthKey != null) {
 				validated = await this.verifyMail(emailAddress, meta.verifymailAuthKey);
-			} else {
-				validated = await validateEmail({
-					email: emailAddress,
-					validateRegex: true,
-					validateMx: true,
-					validateTypo: false, // TLDを見ているみたいだけどclubとか弾かれるので
-					validateDisposable: true, // 捨てアドかどうかチェック
-					validateSMTP: false, // 日本だと25ポートが殆どのプロバイダーで塞がれていてタイムアウトになるので
-				});
 			}
 		} else {
 			validated = { valid: true, reason: null };