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

fix: make sure resend is false if SMTP is true and vice versa

Browse Source
This commit is contained in:
peaklabs-dev
2024-12-09 15:19:59 +01:00
parent 2aacb1dc28
commit 67438e28ca
1 changed files with 67 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

120
app/Livewire/SettingsEmail.php
View File

@@ -126,69 +126,83 @@ class SettingsEmail extends Component
} }
} }
public function submitSmtp(): void public function submitSmtp()
{ {
$this->validate([ try {
'smtpEnabled' => 'boolean', $this->validate([
'smtpFromAddress' => 'required|email', 'smtpEnabled' => 'boolean',
'smtpFromName' => 'required|string', 'smtpFromAddress' => 'required|email',
'smtpHost' => 'required|string', 'smtpFromName' => 'required|string',
'smtpPort' => 'required|numeric', 'smtpHost' => 'required|string',
'smtpEncryption' => 'required|string|in:tls,ssl,none', 'smtpPort' => 'required|numeric',
'smtpUsername' => 'nullable|string', 'smtpEncryption' => 'required|string|in:tls,ssl,none',
'smtpPassword' => 'nullable|string', 'smtpUsername' => 'nullable|string',
'smtpTimeout' => 'nullable|numeric', 'smtpPassword' => 'nullable|string',
], [ 'smtpTimeout' => 'nullable|numeric',
'smtpFromAddress.required' => 'From Address is required.', ], [
'smtpFromAddress.email' => 'Please enter a valid email address.', 'smtpFromAddress.required' => 'From Address is required.',
'smtpFromName.required' => 'From Name is required.', 'smtpFromAddress.email' => 'Please enter a valid email address.',
'smtpHost.required' => 'SMTP Host is required.', 'smtpFromName.required' => 'From Name is required.',
'smtpPort.required' => 'SMTP Port is required.', 'smtpHost.required' => 'SMTP Host is required.',
'smtpPort.numeric' => 'SMTP Port must be a number.', 'smtpPort.required' => 'SMTP Port is required.',
'smtpEncryption.required' => 'Encryption type is required.', 'smtpPort.numeric' => 'SMTP Port must be a number.',
]); 'smtpEncryption.required' => 'Encryption type is required.',
]);
$this->resendEnabled = false; $this->resendEnabled = false;
$this->settings->resend_enabled = false;
$this->settings->smtp_enabled = $this->smtpEnabled; $this->settings->smtp_enabled = $this->smtpEnabled;
$this->settings->smtp_host = $this->smtpHost; $this->settings->smtp_host = $this->smtpHost;
$this->settings->smtp_port = $this->smtpPort; $this->settings->smtp_port = $this->smtpPort;
$this->settings->smtp_encryption = $this->smtpEncryption; $this->settings->smtp_encryption = $this->smtpEncryption;
$this->settings->smtp_username = $this->smtpUsername; $this->settings->smtp_username = $this->smtpUsername;
$this->settings->smtp_password = $this->smtpPassword; $this->settings->smtp_password = $this->smtpPassword;
$this->settings->smtp_timeout = $this->smtpTimeout; $this->settings->smtp_timeout = $this->smtpTimeout;
$this->settings->smtp_from_address = $this->smtpFromAddress; $this->settings->smtp_from_address = $this->smtpFromAddress;
$this->settings->smtp_from_name = $this->smtpFromName; $this->settings->smtp_from_name = $this->smtpFromName;
$this->settings->resend_enabled = false;
$this->settings->save();
$this->dispatch('success', 'SMTP settings updated.'); $this->settings->save();
$this->dispatch('success', 'SMTP settings updated.');
} catch (\Throwable $e) {
$this->smtpEnabled = false;
return handleError($e);
}
} }
public function submitResend(): void public function submitResend()
{ {
$this->validate([ try {
'resendEnabled' => 'boolean', $this->validate([
'resendApiKey' => 'required|string', 'resendEnabled' => 'boolean',
'smtpFromAddress' => 'required|email', 'resendApiKey' => 'required|string',
'smtpFromName' => 'required|string', 'smtpFromAddress' => 'required|email',
], [ 'smtpFromName' => 'required|string',
'resendApiKey.required' => 'Resend API Key is required.', ], [
'smtpFromAddress.required' => 'From Address is required.', 'resendApiKey.required' => 'Resend API Key is required.',
'smtpFromAddress.email' => 'Please enter a valid email address.', 'smtpFromAddress.required' => 'From Address is required.',
'smtpFromName.required' => 'From Name is required.', 'smtpFromAddress.email' => 'Please enter a valid email address.',
]); 'smtpFromName.required' => 'From Name is required.',
]);
$this->smtpEnabled = false; $this->smtpEnabled = false;
$this->settings->smtp_enabled = false;
$this->settings->resend_enabled = $this->resendEnabled; $this->settings->resend_enabled = $this->resendEnabled;
$this->settings->resend_api_key = $this->resendApiKey; $this->settings->resend_api_key = $this->resendApiKey;
$this->settings->smtp_from_address = $this->smtpFromAddress; $this->settings->smtp_from_address = $this->smtpFromAddress;
$this->settings->smtp_from_name = $this->smtpFromName; $this->settings->smtp_from_name = $this->smtpFromName;
$this->settings->smtp_enabled = false;
$this->settings->save();
$this->dispatch('success', 'Resend settings updated.'); $this->settings->save();
$this->dispatch('success', 'Resend settings updated.');
} catch (\Throwable $e) {
$this->resendEnabled = false;
return handleError($e, $this);
}
} }
public function sendTestEmail() public function sendTestEmail()