feat: new encryption options

lucasmichot · Dec 23, 2024 · f2cb040 · f2cb040
1 parent a18c2e0
commit f2cb040
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/app/Livewire/Notifications/Email.php b/app/Livewire/Notifications/Email.php
@@ -41,8 +41,8 @@ class Email extends Component
     #[Validate(['nullable', 'numeric', 'min:1', 'max:65535'])]
     public ?int $smtpPort = null;
 
-    #[Validate(['nullable', 'string', 'in:tls,ssl,none'])]
-    public ?string $smtpEncryption = 'tls';
+    #[Validate(['nullable', 'string', 'in:starttls,tls,none'])]
+    public ?string $smtpEncryption = null;
 
     #[Validate(['nullable', 'string'])]
     public ?string $smtpUsername = null;
@@ -235,7 +235,7 @@ public function submitSmtp()
                 'smtpFromName' => 'required|string',
                 'smtpHost' => 'required|string',
                 'smtpPort' => 'required|numeric',
-                'smtpEncryption' => 'required|string|in:tls,ssl,none',
+                'smtpEncryption' => 'required|string|in:starttls,tls,none',
                 'smtpUsername' => 'nullable|string',
                 'smtpPassword' => 'nullable|string',
                 'smtpTimeout' => 'nullable|numeric',

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

diff --git a/resources/views/livewire/notifications/email.blade.php b/resources/views/livewire/notifications/email.blade.php
@@ -70,9 +70,9 @@
                         <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="smtpPort" placeholder="587" label="Port" />
-                            <x-forms.select id="smtpEncryption" label="Encryption">
-                                <option value="tls">TLS</option>
-                                <option value="ssl">SSL</option>
+                            <x-forms.select required id="smtpEncryption" label="Encryption">
+                                <option value="starttls">StartTLS</option>
+                                <option value="tls">TLS/SSL</option>
                                 <option value="none">None</option>
                             </x-forms.select>
                         </div>

diff --git a/resources/views/livewire/settings-email.blade.php b/resources/views/livewire/settings-email.blade.php
@@ -43,9 +43,9 @@
                     <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="smtpPort" placeholder="587" label="Port" />
-                        <x-forms.select id="smtpEncryption" label="Encryption">
-                            <option value="tls">TLS</option>
-                            <option value="ssl">SSL</option>
+                        <x-forms.select required id="smtpEncryption" label="Encryption">
+                            <option value="starttls">StartTLS</option>
+                            <option value="tls">TLS/SSL</option>
                             <option value="none">None</option>
                         </x-forms.select>
                     </div>