nikdoof/pocket-id
1
0
Fork 0
mirror of https://github.com/nikdoof/pocket-id.git synced 2025-12-14 15:22:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: allow empty user and password in SMTP configuration

Browse Source
This commit is contained in:
Elias Schneider
2024-11-28 12:14:03 +01:00
parent f9fa2c6706
commit a9f4dada32
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
backend/internal/service/email_service.go
View File

@@ -118,7 +118,11 @@ func SendEmail[V any](srv *EmailService, toEmail email.Address, template email.T
return fmt.Errorf("failed to connect to SMTP server: %w", err) return fmt.Errorf("failed to connect to SMTP server: %w", err)
} }
// Set up the authentication smtpUser := srv.appConfigService.DbConfig.SmtpUser.Value
smtpPassword := srv.appConfigService.DbConfig.SmtpPassword.Value
// Set up the authentication if user or password are set
if smtpUser != "" || smtpPassword != "" {
auth := smtp.PlainAuth("", auth := smtp.PlainAuth("",
srv.appConfigService.DbConfig.SmtpUser.Value, srv.appConfigService.DbConfig.SmtpUser.Value,
srv.appConfigService.DbConfig.SmtpPassword.Value, srv.appConfigService.DbConfig.SmtpPassword.Value,
@@ -127,6 +131,7 @@ func SendEmail[V any](srv *EmailService, toEmail email.Address, template email.T
if err := client.Auth(auth); err != nil { if err := client.Auth(auth); err != nil {
return fmt.Errorf("failed to authenticate SMTP client: %w", err) return fmt.Errorf("failed to authenticate SMTP client: %w", err)
} }
}
// Send the email // Send the email
if err := srv.sendEmailContent(client, toEmail, c); err != nil { if err := srv.sendEmailContent(client, toEmail, c); err != nil {

4
frontend/src/routes/settings/admin/application-configuration/forms/app-config-email-form.svelte
View File

@@ -35,8 +35,8 @@
const formSchema = z.object({ const formSchema = z.object({
smtpHost: z.string().min(1), smtpHost: z.string().min(1),
smtpPort: z.number().min(1), smtpPort: z.number().min(1),
smtpUser: z.string().min(1), smtpUser: z.string(),
smtpPassword: z.string().min(1), smtpPassword: z.string(),
smtpFrom: z.string().email(), smtpFrom: z.string().email(),
smtpTls: z.boolean(), smtpTls: z.boolean(),
smtpSkipCertVerify: z.boolean() smtpSkipCertVerify: z.boolean()