graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-11-23 05:13:07 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix: email verify enable logic (#12743)

Browse source
This commit is contained in:
Nya Candy 2023-12-23 10:00:14 +08:00 committed by GitHub
parent 6254954957
commit b3c4f7eddc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
packages/backend/src/core/EmailService.ts
View file

@ -167,18 +167,18 @@ export class EmailService {
const verifymailApi = meta.enableVerifymailApi && meta.verifymailAuthKey != null; const verifymailApi = meta.enableVerifymailApi && meta.verifymailAuthKey != null;
let validated; let validated;
if (meta.enableActiveEmailValidation && meta.verifymailAuthKey) { if (meta.enableActiveEmailValidation) {
if (verifymailApi) { if (verifymailApi) {
validated = await this.verifyMail(emailAddress, meta.verifymailAuthKey); validated = await this.verifyMail(emailAddress, meta.verifymailAuthKey);
} else { } else {
validated = meta.enableActiveEmailValidation ? await validateEmail({ validated = await validateEmail({
email: emailAddress, email: emailAddress,
validateRegex: true, validateRegex: true,
validateMx: true, validateMx: true,
validateTypo: false, // TLDを見ているみたいだけどclubとか弾かれるので validateTypo: false, // TLDを見ているみたいだけどclubとか弾かれるので
validateDisposable: true, // 捨てアドかどうかチェック validateDisposable: true, // 捨てアドかどうかチェック
validateSMTP: false, // 日本だと25ポートが殆どのプロバイダーで塞がれていてタイムアウトになるので validateSMTP: false, // 日本だと25ポートが殆どのプロバイダーで塞がれていてタイムアウトになるので
}) : { valid: true, reason: null }; });
} }
} else { } else {
validated = { valid: true, reason: null }; validated = { valid: true, reason: null };