dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

feat: use new table or instance settings for email

Browse Source
This commit is contained in:
peaklabs-dev
2024-12-09 17:37:15 +01:00
parent dd9d10c717
commit adaef2d341
1 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
app/Notifications/Channels/EmailChannel.php
View File

@@ -13,7 +13,7 @@ class EmailChannel
{ {
try { try {
$this->bootConfigs($notifiable); $this->bootConfigs($notifiable);
$recipients = $notifiable->getRecepients($notification); $recipients = $notifiable->getRecipients($notification);
if (count($recipients) === 0) { if (count($recipients) === 0) {
throw new Exception('No email recipients found'); throw new Exception('No email recipients found');
} }
@@ -46,7 +46,9 @@ class EmailChannel
private function bootConfigs($notifiable): void private function bootConfigs($notifiable): void
{ {
if (data_get($notifiable, 'use_instance_email_settings')) { $emailSettings = $notifiable->emailNotificationSettings;
if ($emailSettings->use_instance_email_settings) {
$type = set_transanctional_email_settings(); $type = set_transanctional_email_settings();
if (! $type) { if (! $type) {
throw new Exception('No email settings found.'); throw new Exception('No email settings found.');
@@ -54,24 +56,27 @@ class EmailChannel
return; return;
} }
config()->set('mail.from.address', data_get($notifiable, 'smtp_from_address', 'test@example.com'));
config()->set('mail.from.name', data_get($notifiable, 'smtp_from_name', 'Test')); config()->set('mail.from.address', $emailSettings->smtp_from_address ?? 'test@example.com');
if (data_get($notifiable, 'resend_enabled')) { config()->set('mail.from.name', $emailSettings->smtp_from_name ?? 'Test');
if ($emailSettings->resend_enabled) {
config()->set('mail.default', 'resend'); config()->set('mail.default', 'resend');
config()->set('resend.api_key', data_get($notifiable, 'resend_api_key')); config()->set('resend.api_key', $emailSettings->resend_api_key);
} }
if (data_get($notifiable, 'smtp_enabled')) {
if ($emailSettings->smtp_enabled) {
config()->set('mail.default', 'smtp'); config()->set('mail.default', 'smtp');
config()->set('mail.mailers.smtp', [ config()->set('mail.mailers.smtp', [
'transport' => 'smtp', 'transport' => 'smtp',
'host' => data_get($notifiable, 'smtp_host'), 'host' => $emailSettings->smtp_host,
'port' => data_get($notifiable, 'smtp_port'), 'port' => $emailSettings->smtp_port,
'encryption' => data_get($notifiable, 'smtp_encryption') === 'none' ? null : data_get($notifiable, 'smtp_encryption'), 'encryption' => $emailSettings->smtp_encryption === 'none' ? null : $emailSettings->smtp_encryption,
'username' => data_get($notifiable, 'smtp_username'), 'username' => $emailSettings->smtp_username,
'password' => data_get($notifiable, 'smtp_password'), 'password' => $emailSettings->smtp_password,
'timeout' => data_get($notifiable, 'smtp_timeout'), 'timeout' => $emailSettings->smtp_timeout,
'local_domain' => null, 'local_domain' => null,
'auto_tls' => data_get($notifiable, 'smtp_encryption') === 'none' ? '0' : '', 'auto_tls' => $emailSettings->smtp_encryption === 'none' ? '0' : '',
]); ]);
} }
} }