diff options
| author | Nya Candy <dev@candinya.com> | 2023-12-23 10:00:14 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-23 11:00:14 +0900 |
| commit | b3c4f7eddc4d97e15077f1e9041c5abecc184afb (patch) | |
| tree | 39e4c480d4a76bb9b9dd143b0bda37b3cfb28300 /packages | |
| parent | Update CHANGELOG.md (diff) | |
| download | sharkey-b3c4f7eddc4d97e15077f1e9041c5abecc184afb.tar.gz sharkey-b3c4f7eddc4d97e15077f1e9041c5abecc184afb.tar.bz2 sharkey-b3c4f7eddc4d97e15077f1e9041c5abecc184afb.zip | |
fix: email verify enable logic (#12743)
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/backend/src/core/EmailService.ts | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/packages/backend/src/core/EmailService.ts b/packages/backend/src/core/EmailService.ts index f31cec2b3a..d4508d5313 100644 --- a/packages/backend/src/core/EmailService.ts +++ b/packages/backend/src/core/EmailService.ts @@ -167,18 +167,18 @@ export class EmailService { const verifymailApi = meta.enableVerifymailApi && meta.verifymailAuthKey != null; let validated; - if (meta.enableActiveEmailValidation && meta.verifymailAuthKey) { + if (meta.enableActiveEmailValidation) { if (verifymailApi) { validated = await this.verifyMail(emailAddress, meta.verifymailAuthKey); } else { - validated = meta.enableActiveEmailValidation ? await validateEmail({ + validated = await validateEmail({ email: emailAddress, validateRegex: true, validateMx: true, validateTypo: false, // TLDを見ているみたいだけどclubとか弾かれるので validateDisposable: true, // 捨てアドかどうかチェック validateSMTP: false, // 日本だと25ポートが殆どのプロバイダーで塞がれていてタイムアウトになるので - }) : { valid: true, reason: null }; + }); } } else { validated = { valid: true, reason: null }; |