summary refs log tree commit diff
path: root/src/util/entities
diff options
context:
space:
mode:
authorPuyodead1 <puyodead@proton.me>2023-01-19 11:15:12 -0500
committerPuyodead1 <puyodead@protonmail.com>2023-02-23 21:35:51 -0500
commita47d80b255f1501e39bebd7ad7e80119c8ed1697 (patch)
treeeca3d1ff4a837efb8dfcc1571279c2f72f529e99 /src/util/entities
parentadd missing copyright headers (diff)
downloadserver-a47d80b255f1501e39bebd7ad7e80119c8ed1697.tar.xz
Email verification works
- Added /auth/verify to authenticated route whitelist
- Updated /auth/verify to properly mark a user as verified, return a response, and fix expiration time check
- Implemented /auth/verify/resend
- Moved verification email sending to a helper method
- Fixed VerifyEmailSchema requiring captcha_key
Diffstat (limited to 'src/util/entities')
-rw-r--r--src/util/entities/User.ts25
1 files changed, 7 insertions, 18 deletions
diff --git a/src/util/entities/User.ts b/src/util/entities/User.ts

index f39fc19b..66e10297 100644 --- a/src/util/entities/User.ts +++ b/src/util/entities/User.ts
@@ -383,28 +383,17 @@ export class User extends BaseClass { user.validate(); await Promise.all([user.save(), settings.save()]); - // send verification email - if (Email.transporter && email) { - const token = (await generateToken(user.id, email)) as string; - const link = `http://localhost:3001/verify#token=${token}`; - const message = { - from: - Config.get().general.correspondenceEmail || - "noreply@localhost", - to: email, - subject: `Verify Email Address for ${ - Config.get().general.instanceName - }`, - html: `Please verify your email address by clicking the following link: <a href="${link}">Verify Email</a>`, - }; - - await Email.transporter - .sendMail(message) + + // send verification email if users aren't verified by default and we have an email + if (!Config.get().defaults.user.verified && email) { + await Email.sendVerificationEmail(user.id, email) .then((info) => { console.log("Message sent: %s", info.messageId); }) .catch((e) => { - console.error(`Failed to send email to ${email}: ${e}`); + console.error( + `Failed to send verification email to ${user.username}#${user.discriminator}: ${e}`, + ); }); }