mirror of
https://github.com/xtr-dev/payload-mailing.git
synced 2025-12-10 00:03:23 +00:00
Bas van den Aakster
6e4f754306
Issue 2 - Type Safety: - Remove dangerous 'as any' casts in sendEmail function - Use proper typing for payload.create() calls - Maintain type safety throughout email creation process Issue 3 - Email Validation: - Implement RFC 5322 compliant email regex - Add comprehensive validation for common invalid patterns - Check for consecutive dots, invalid domain formats - Prevent emails like 'test@.com' and 'test@domain.' Issue 4 - Error Message Logic: - Add contextual error messages for template vs direct email modes - Distinguish between template rendering failures and missing direct email content - Provide clearer guidance to developers on what went wrong Additional fixes: - Update imports to use generated Email type instead of BaseEmailData - Maintain compatibility with updated sendEmail interface 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com>
60 lines
2.1 KiB
TypeScript
60 lines
2.1 KiB
TypeScript
import { Payload } from 'payload'
|
|
import { TemplateVariables } from '../types/index.js'
|
|
|
|
/**
|
|
* Parse and validate email addresses
|
|
* @internal
|
|
*/
|
|
export const parseAndValidateEmails = (emails: string | string[] | null | undefined): string[] | undefined => {
|
|
if (!emails || emails === null) return undefined
|
|
|
|
let emailList: string[]
|
|
if (Array.isArray(emails)) {
|
|
emailList = emails
|
|
} else {
|
|
emailList = emails.split(',').map(email => email.trim()).filter(Boolean)
|
|
}
|
|
|
|
// RFC 5322 compliant email validation
|
|
const emailRegex = /^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/
|
|
const invalidEmails = emailList.filter(email => {
|
|
// Check basic format
|
|
if (!emailRegex.test(email)) return true
|
|
// Check for common invalid patterns
|
|
if (email.includes('..') || email.startsWith('.') || email.endsWith('.')) return true
|
|
if (email.includes('@.') || email.includes('.@')) return true
|
|
// Check domain has at least one dot
|
|
const parts = email.split('@')
|
|
if (parts.length !== 2 || !parts[1].includes('.')) return true
|
|
return false
|
|
})
|
|
|
|
if (invalidEmails.length > 0) {
|
|
throw new Error(`Invalid email addresses: ${invalidEmails.join(', ')}`)
|
|
}
|
|
|
|
return emailList
|
|
}
|
|
|
|
export const getMailing = (payload: Payload) => {
|
|
const mailing = (payload as any).mailing
|
|
if (!mailing) {
|
|
throw new Error('Mailing plugin not initialized. Make sure you have added the mailingPlugin to your Payload config.')
|
|
}
|
|
return mailing
|
|
}
|
|
|
|
export const renderTemplate = async (payload: Payload, templateSlug: string, variables: TemplateVariables): Promise<{ html: string; text: string; subject: string }> => {
|
|
const mailing = getMailing(payload)
|
|
return mailing.service.renderTemplate(templateSlug, variables)
|
|
}
|
|
|
|
export const processEmails = async (payload: Payload): Promise<void> => {
|
|
const mailing = getMailing(payload)
|
|
return mailing.service.processEmails()
|
|
}
|
|
|
|
export const retryFailedEmails = async (payload: Payload): Promise<void> => {
|
|
const mailing = getMailing(payload)
|
|
return mailing.service.retryFailedEmails()
|
|
} |