Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v4.0.0-beta.380 #4649

Open
wants to merge 10 commits into
base: main
Choose a base branch
from
293 −106
Open

v4.0.0-beta.380 #4649

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift click to select a range
a18c2e0
feat: migrate to new encryption options
peaklabs-dev Dec 23, 2024
f2cb040
feat: new encryption options
peaklabs-dev Dec 23, 2024
1f6c614
fix: smtp encryption
peaklabs-dev Dec 23, 2024
e51207a
fix: bind() to 0.0.0.0:80 failed
peaklabs-dev Dec 23, 2024
68362d0
fix: Oauth seeder
peaklabs-dev Dec 23, 2024
f26853b
fix: unreachable notifications
peaklabs-dev Dec 23, 2024
d7a0794
fix: instance settings migration
peaklabs-dev Dec 23, 2024
0a851ec
fix: only encrypt instance email settings if there are any
peaklabs-dev Dec 23, 2024
6dc8749
fix: error message
peaklabs-dev Dec 23, 2024
a9ec0b1
fix: update healthcheck and port configurations to use port 8080
andrasbacsai Dec 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix: smtp encryption
  • Loading branch information
@peaklabs-dev
peaklabs-dev committed Dec 23, 2024
commit 1f6c6140bafd499f4af42b8d77ae16ae58a1ab88
11 changes: 9 additions & 2 deletions app/Notifications/Channels/EmailChannel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,17 66,24 @@ private function bootConfigs($notifiable): void
}

if ($emailSettings->smtp_enabled) {
$encryption = match (strtolower($emailSettings->smtp_encryption)) {
'starttls' => null,
'tls' => 'tls',
'none' => null,
default => null,
};

config()->set('mail.default', 'smtp');
config()->set('mail.mailers.smtp', [
'transport' => 'smtp',
'host' => $emailSettings->smtp_host,
'port' => $emailSettings->smtp_port,
'encryption' => $emailSettings->smtp_encryption === 'none' ? null : $emailSettings->smtp_encryption,
'encryption' => $encryption,
'username' => $emailSettings->smtp_username,
'password' => $emailSettings->smtp_password,
'timeout' => $emailSettings->smtp_timeout,
'local_domain' => null,
'auto_tls' => $emailSettings->smtp_encryption === 'none' ? '0' : '',
'auto_tls' => $emailSettings->smtp_encryption === 'none' ? '0' : '', // If encryption is "none", it will not try to upgrade to TLS via StartTLS to make sure it is unencrypted.
]);
}
}
Expand Down
11 changes: 10 additions & 1 deletion bootstrap/helpers/notifications.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,17 67,26 @@ function set_transanctional_email_settings(?InstanceSettings $settings = null):

return 'resend';
}

$encryption = match (strtolower(data_get($settings, 'smtp_encryption'))) {
'starttls' => null,
'tls' => 'tls',
'none' => null,
default => null,
};

if (data_get($settings, 'smtp_enabled')) {
config()->set('mail.default', 'smtp');
config()->set('mail.mailers.smtp', [
'transport' => 'smtp',
'host' => data_get($settings, 'smtp_host'),
'port' => data_get($settings, 'smtp_port'),
'encryption' => data_get($settings, 'smtp_encryption'),
'encryption' => $encryption,
'username' => data_get($settings, 'smtp_username'),
'password' => data_get($settings, 'smtp_password'),
'timeout' => data_get($settings, 'smtp_timeout'),
'local_domain' => null,
'auto_tls' => data_get($settings, 'smtp_encryption') === 'none' ? '0' : '', // If encryption is "none", it will not try to upgrade to TLS via StartTLS to make sure it is unencrypted.
]);

return 'smtp';
Expand Down
Loading