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

feat: new encryption options

Browse Source
This commit is contained in:
peaklabs-dev
2024-12-23 15:26:26 +01:00
parent a18c2e0f55
commit f2cb040ba9
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Livewire/Notifications/Email.php
View File

@@ -41,8 +41,8 @@ class Email extends Component
#[Validate(['nullable', 'numeric', 'min:1', 'max:65535'])] #[Validate(['nullable', 'numeric', 'min:1', 'max:65535'])]
public ?int $smtpPort = null; public ?int $smtpPort = null;
#[Validate(['nullable', 'string', 'in:tls,ssl,none'])] #[Validate(['nullable', 'string', 'in:starttls,tls,none'])]
public ?string $smtpEncryption = 'tls'; public ?string $smtpEncryption = null;
#[Validate(['nullable', 'string'])] #[Validate(['nullable', 'string'])]
public ?string $smtpUsername = null; public ?string $smtpUsername = null;
@@ -235,7 +235,7 @@ class Email extends Component
'smtpFromName' => 'required|string', 'smtpFromName' => 'required|string',
'smtpHost' => 'required|string', 'smtpHost' => 'required|string',
'smtpPort' => 'required|numeric', 'smtpPort' => 'required|numeric',
'smtpEncryption' => 'required|string|in:tls,ssl,none', 'smtpEncryption' => 'required|string|in:starttls,tls,none',
'smtpUsername' => 'nullable|string', 'smtpUsername' => 'nullable|string',
'smtpPassword' => 'nullable|string', 'smtpPassword' => 'nullable|string',
'smtpTimeout' => 'nullable|numeric', 'smtpTimeout' => 'nullable|numeric',

6
app/Livewire/SettingsEmail.php
View File

@@ -35,8 +35,8 @@ class SettingsEmail extends Component
#[Validate(['nullable', 'numeric', 'min:1', 'max:65535'])] #[Validate(['nullable', 'numeric', 'min:1', 'max:65535'])]
public ?int $smtpPort = null; public ?int $smtpPort = null;
#[Validate(['nullable', 'string', 'in:tls,ssl,none'])] #[Validate(['nullable', 'string', 'in:starttls,tls,none'])]
public ?string $smtpEncryption = 'tls'; public ?string $smtpEncryption = null;
#[Validate(['nullable', 'string'])] #[Validate(['nullable', 'string'])]
public ?string $smtpUsername = null; public ?string $smtpUsername = null;
@@ -142,7 +142,7 @@ class SettingsEmail extends Component
'smtpFromName' => 'required|string', 'smtpFromName' => 'required|string',
'smtpHost' => 'required|string', 'smtpHost' => 'required|string',
'smtpPort' => 'required|numeric', 'smtpPort' => 'required|numeric',
'smtpEncryption' => 'required|string|in:tls,ssl,none', 'smtpEncryption' => 'required|string|in:starttls,tls,none',
'smtpUsername' => 'nullable|string', 'smtpUsername' => 'nullable|string',
'smtpPassword' => 'nullable|string', 'smtpPassword' => 'nullable|string',
'smtpTimeout' => 'nullable|numeric', 'smtpTimeout' => 'nullable|numeric',

6
resources/views/livewire/notifications/email.blade.php
View File

@@ -70,9 +70,9 @@
<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="smtpHost" placeholder="smtp.mailgun.org" label="Host" /> <x-forms.input required id="smtpHost" placeholder="smtp.mailgun.org" label="Host" />
<x-forms.input required id="smtpPort" placeholder="587" label="Port" /> <x-forms.input required id="smtpPort" placeholder="587" label="Port" />
<x-forms.select id="smtpEncryption" label="Encryption"> <x-forms.select required id="smtpEncryption" label="Encryption">
<option value="tls">TLS</option> <option value="starttls">StartTLS</option>
<option value="ssl">SSL</option> <option value="tls">TLS/SSL</option>
<option value="none">None</option> <option value="none">None</option>
</x-forms.select> </x-forms.select>
</div> </div>

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

@@ -43,9 +43,9 @@
<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="smtpHost" placeholder="smtp.mailgun.org" label="Host" /> <x-forms.input required id="smtpHost" placeholder="smtp.mailgun.org" label="Host" />
<x-forms.input required id="smtpPort" placeholder="587" label="Port" /> <x-forms.input required id="smtpPort" placeholder="587" label="Port" />
<x-forms.select id="smtpEncryption" label="Encryption"> <x-forms.select required id="smtpEncryption" label="Encryption">
<option value="tls">TLS</option> <option value="starttls">StartTLS</option>
<option value="ssl">SSL</option> <option value="tls">TLS/SSL</option>
<option value="none">None</option> <option value="none">None</option>
</x-forms.select> </x-forms.select>
</div> </div>