yetangitu/Peertube
1
0
Fork 0
mirror of https://github.com/Chocobozzz/PeerTube.git synced 2025-10-03 09:49:20 +02:00
Code Issues Releases Wiki Activity

Better ask email verification flow

Browse source 
Allow user to resend the email verification link when changing the
current email
Fix success messages when validating a new email
This commit is contained in:
Chocobozzz 2025-04-15 09:19:12 +02:00
parent e19ee1ebc9
commit 986e71a1f7
No known key found for this signature in database
GPG key ID: 583A612D890159BE
29 changed files with 426 additions and 271 deletions
Download patch file Download diff file Expand all files Collapse all files

29
server/core/lib/emailer.ts
View file

@ -15,7 +15,6 @@ import { JobQueue } from './job-queue/index.js'
import { Hooks } from './plugins/hooks.js'
class Emailer {
private static instance: Emailer
private initialized = false
private transporter: Transporter
@ -89,7 +88,29 @@ class Emailer {
return JobQueue.Instance.createJobAsync({ type: 'email', payload: emailPayload })
}
addVerifyEmailJob (options: {
addUserVerifyChangeEmailJob (options: {
username: string
to: string
verifyEmailUrl: string
}) {
const { username, to, verifyEmailUrl } = options
const emailPayload: EmailPayload = {
template: 'verify-user-change-email',
to: [ to ],
subject: `Verify your email on ${CONFIG.INSTANCE.NAME}`,
locals: {
username,
verifyEmailUrl,
hideNotificationPreferencesLink: true
}
}
return JobQueue.Instance.createJobAsync({ type: 'email', payload: emailPayload })
}
addRegistrationVerifyEmailJob (options: {
username: string
isRegistrationRequest: boolean
to: string
@ -98,7 +119,7 @@ class Emailer {
const { username, isRegistrationRequest, to, verifyEmailUrl } = options
const emailPayload: EmailPayload = {
template: 'verify-email',
template: 'verify-registration-email',
to: [ to ],
subject: `Verify your email on ${CONFIG.INSTANCE.NAME}`,
locals: {
@ -337,7 +358,7 @@ class Emailer {
private initSMTPTransport () {
logger.info('Using %s:%s as SMTP server.', CONFIG.SMTP.HOSTNAME, CONFIG.SMTP.PORT)
let tls: { ca: [ Buffer ] }
let tls: { ca: [Buffer] }
if (CONFIG.SMTP.CA_FILE) {
tls = {
ca: [ readFileSync(CONFIG.SMTP.CA_FILE) ]