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

fix: transactional email livewire

Browse Source
This commit is contained in:
Andras Bacsai
2024-11-03 21:45:17 +01:00
parent 2df27f3a4f
commit ec81b4ce5c
2 changed files with 104 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

166
app/Livewire/SettingsEmail.php
View File

@@ -3,102 +3,83 @@
namespace App\Livewire; namespace App\Livewire;
use App\Models\InstanceSettings; use App\Models\InstanceSettings;
use Livewire\Attributes\Rule;
use Livewire\Component; use Livewire\Component;
class SettingsEmail extends Component class SettingsEmail extends Component
{ {
public InstanceSettings $settings; public InstanceSettings $settings;
public string $emails; #[Rule(['boolean'])]
public bool $smtpEnabled = false;
protected $rules = [ #[Rule(['nullable', 'string'])]
'settings.smtp_enabled' => 'nullable|boolean', public ?string $smtpHost = null;
'settings.smtp_host' => 'required',
'settings.smtp_port' => 'required|numeric',
'settings.smtp_encryption' => 'nullable',
'settings.smtp_username' => 'nullable',
'settings.smtp_password' => 'nullable',
'settings.smtp_timeout' => 'nullable',
'settings.smtp_from_address' => 'required|email',
'settings.smtp_from_name' => 'required',
'settings.resend_enabled' => 'nullable|boolean',
'settings.resend_api_key' => 'nullable',
]; #[Rule(['nullable', 'numeric', 'min:1', 'max:65535'])]
public ?int $smtpPort = null;
protected $validationAttributes = [ #[Rule(['nullable', 'string'])]
'settings.smtp_from_address' => 'From Address', public ?string $smtpEncryption = null;
'settings.smtp_from_name' => 'From Name',
'settings.smtp_recipients' => 'Recipients', #[Rule(['nullable', 'string'])]
'settings.smtp_host' => 'Host', public ?string $smtpUsername = null;
'settings.smtp_port' => 'Port',
'settings.smtp_encryption' => 'Encryption', #[Rule(['nullable'])]
'settings.smtp_username' => 'Username', public ?string $smtpPassword = null;
'settings.smtp_password' => 'Password',
'settings.smtp_timeout' => 'Timeout', #[Rule(['nullable', 'numeric'])]
'settings.resend_api_key' => 'Resend API Key', public ?int $smtpTimeout = null;
];
#[Rule(['nullable', 'email'])]
public ?string $smtpFromAddress = null;
#[Rule(['nullable', 'string'])]
public ?string $smtpFromName = null;
#[Rule(['boolean'])]
public bool $resendEnabled = false;
#[Rule(['nullable', 'string'])]
public ?string $resendApiKey = null;
public function mount() public function mount()
{ {
if (isInstanceAdmin()) { if (isInstanceAdmin() === false) {
$this->settings = instanceSettings();
$this->emails = auth()->user()->email;
} else {
return redirect()->route('dashboard'); return redirect()->route('dashboard');
} }
$this->settings = instanceSettings();
$this->syncData();
} }
public function submitFromFields() public function syncData(bool $toModel = false)
{ {
try { if ($toModel) {
$this->resetErrorBag(); $this->validate();
$this->validate([ $this->settings->smtp_enabled = $this->smtpEnabled;
'settings.smtp_from_address' => 'required|email', $this->settings->smtp_host = $this->smtpHost;
'settings.smtp_from_name' => 'required', $this->settings->smtp_port = $this->smtpPort;
]); $this->settings->smtp_encryption = $this->smtpEncryption;
$this->settings->smtp_username = $this->smtpUsername;
$this->settings->smtp_password = $this->smtpPassword;
$this->settings->smtp_timeout = $this->smtpTimeout;
$this->settings->resend_enabled = $this->resendEnabled;
$this->settings->resend_api_key = $this->resendApiKey;
$this->settings->save(); $this->settings->save();
$this->dispatch('success', 'Settings saved.'); } else {
} catch (\Throwable $e) { $this->smtpEnabled = $this->settings->smtp_enabled;
return handleError($e, $this); $this->smtpHost = $this->settings->smtp_host;
} $this->smtpPort = $this->settings->smtp_port;
} $this->smtpEncryption = $this->settings->smtp_encryption;
$this->smtpUsername = $this->settings->smtp_username;
$this->smtpPassword = $this->settings->smtp_password;
$this->smtpTimeout = $this->settings->smtp_timeout;
$this->smtpFromAddress = $this->settings->smtp_from_address;
$this->smtpFromName = $this->settings->smtp_from_name;
public function submitResend() $this->resendEnabled = $this->settings->resend_enabled;
{ $this->resendApiKey = $this->settings->resend_api_key;
try {
$this->resetErrorBag();
$this->validate([
'settings.smtp_from_address' => 'required|email',
'settings.smtp_from_name' => 'required',
'settings.resend_api_key' => 'required',
]);
$this->settings->save();
$this->dispatch('success', 'Settings saved.');
} catch (\Throwable $e) {
$this->settings->resend_enabled = false;
return handleError($e, $this);
}
}
public function instantSaveResend()
{
try {
$this->settings->smtp_enabled = false;
$this->submitResend();
} catch (\Throwable $e) {
return handleError($e, $this);
}
}
public function instantSave()
{
try {
$this->settings->resend_enabled = false;
$this->submit();
} catch (\Throwable $e) {
return handleError($e, $this);
} }
} }
@@ -106,20 +87,29 @@ class SettingsEmail extends Component
{ {
try { try {
$this->resetErrorBag(); $this->resetErrorBag();
$this->validate([ $this->syncData(true);
'settings.smtp_from_address' => 'required|email',
'settings.smtp_from_name' => 'required',
'settings.smtp_host' => 'required',
'settings.smtp_port' => 'required|numeric',
'settings.smtp_encryption' => 'nullable',
'settings.smtp_username' => 'nullable',
'settings.smtp_password' => 'nullable',
'settings.smtp_timeout' => 'nullable',
]);
$this->settings->save();
$this->dispatch('success', 'Settings saved.'); $this->dispatch('success', 'Settings saved.');
} catch (\Throwable $e) { } catch (\Throwable $e) {
return handleError($e, $this); return handleError($e, $this);
} }
} }
public function instantSave(string $type)
{
try {
if ($type === 'SMTP') {
$this->resendEnabled = false;
} else {
$this->smtpEnabled = false;
}
$this->syncData(true);
if ($this->smtpEnabled || $this->resendEnabled) {
$this->dispatch('success', "{$type} enabled.");
} else {
$this->dispatch('success', "{$type} disabled.");
}
} catch (\Throwable $e) {
return handleError($e, $this);
}
}
} }

51
resources/views/livewire/settings-email.blade.php
View File

@@ -1,19 +1,21 @@
<div> <div>
<x-slot:title> <x-slot:title>
Settings | Coolify Transactional Email | Coolify
</x-slot> </x-slot>
<x-settings.navbar /> <x-settings.navbar />
<div class="flex items-center gap-2"> <form wire:submit='submit' class="flex flex-col gap-2 pb-4">
<h2>Transactional Email</h2> <div class="flex items-center gap-2">
</div> <h2>Transactional Email</h2>
<div class="pb-4 ">Email settings for password resets, invitations, etc.</div> <x-forms.button type="submit">
<form wire:submit='submitFromFields' class="flex flex-col gap-2 pb-4"> Save
<x-forms.input required id="settings.smtp_from_name" helper="Name used in emails." label="From Name" /> </x-forms.button>
<x-forms.input required id="settings.smtp_from_address" helper="Email address used in emails." </div>
label="From Address" /> <div class="pb-4 ">Email settings for password resets, invitations, etc.</div>
<x-forms.button type="submit"> <div class="flex gap-4">
Save <x-forms.input required id="smtpFromName" helper="Name used in emails." label="From Name" />
</x-forms.button> <x-forms.input required id="smtpFromAddress" helper="Email address used in emails." label="From Address" />
</div>
</form> </form>
<div class="flex flex-col gap-4"> <div class="flex flex-col gap-4">
<div class="p-4 border dark:border-coolgray-300"> <div class="p-4 border dark:border-coolgray-300">
@@ -25,27 +27,26 @@
</x-forms.button> </x-forms.button>
</div> </div>
<div class="w-32"> <div class="w-32">
<x-forms.checkbox instantSave id="settings.smtp_enabled" label="Enabled" /> <x-forms.checkbox instantSave='instantSave("SMTP")' id="smtpEnabled" label="Enabled" />
</div> </div>
<div class="flex flex-col gap-4"> <div class="flex flex-col gap-4">
<div class="flex flex-col w-full gap-2 xl:flex-row"> <div class="flex flex-col w-full gap-2 xl:flex-row">
<x-forms.input required id="settings.smtp_host" placeholder="smtp.mailgun.org" label="Host" /> <x-forms.input required id="smtpHost" placeholder="smtp.mailgun.org" label="Host" />
<x-forms.input required id="settings.smtp_port" placeholder="587" label="Port" /> <x-forms.input required id="smtpPort" placeholder="587" label="Port" />
<x-forms.input id="settings.smtp_encryption" helper="If SMTP uses SSL, set it to 'tls'." <x-forms.input id="smtpEncryption" helper="If SMTP uses SSL, set it to 'tls'." placeholder="tls"
placeholder="tls" label="Encryption" /> label="Encryption" />
</div> </div>
<div class="flex flex-col w-full gap-2 xl:flex-row"> <div class="flex flex-col w-full gap-2 xl:flex-row">
<x-forms.input id="settings.smtp_username" label="SMTP Username" /> <x-forms.input id="smtpUsername" label="SMTP Username" />
<x-forms.input id="settings.smtp_password" type="password" label="SMTP Password" <x-forms.input id="smtpPassword" type="password" label="SMTP Password"
autocomplete="new-password" /> autocomplete="new-password" />
<x-forms.input id="settings.smtp_timeout" helper="Timeout value for sending emails." <x-forms.input id="smtpTimeout" helper="Timeout value for sending emails." label="Timeout" />
label="Timeout" />
</div> </div>
</div> </div>
</form> </form>
</div> </div>
<div class="p-4 border dark:border-coolgray-300"> <div class="p-4 border dark:border-coolgray-300">
<form wire:submit='submitResend' class="flex flex-col"> <form wire:submit='submit' class="flex flex-col">
<div class="flex gap-2"> <div class="flex gap-2">
<h3>Resend</h3> <h3>Resend</h3>
<x-forms.button type="submit"> <x-forms.button type="submit">
@@ -53,12 +54,12 @@
</x-forms.button> </x-forms.button>
</div> </div>
<div class="w-32"> <div class="w-32">
<x-forms.checkbox instantSave='instantSaveResend' id="settings.resend_enabled" label="Enabled" /> <x-forms.checkbox instantSave='instantSave("Resend")' id="resendEnabled" label="Enabled" />
</div> </div>
<div class="flex flex-col gap-4"> <div class="flex flex-col gap-4">
<div class="flex flex-col w-full gap-2 xl:flex-row"> <div class="flex flex-col w-full gap-2 xl:flex-row">
<x-forms.input type="password" id="settings.resend_api_key" placeholder="API key" required <x-forms.input type="password" id="resendApiKey" placeholder="API key" required label="API Key"
label="Host" autocomplete="new-password" /> autocomplete="new-password" />
</div> </div>
</div> </div>
</form> </form>