app: fix remaining email config keys

Author: matthewpi

app/Http/Controllers/Admin/Settings/MailController.php

@@ -57,8 +57,8 @@ public function update(MailSettingsFormRequest $request): Response
         }
 
         $values = $request->normalize();
-        if (array_get($values, 'mail:password') === '!e') {
-            $values['mail:password'] = '';
+        if (array_get($values, 'mail:mailers:smtp:password') === '!e') {
+            $values['mail:mailers:smtp:password'] = '';
         }
 
         foreach ($values as $key => $value) {

app/Http/Requests/Admin/Settings/MailSettingsFormRequest.php

@@ -13,11 +13,11 @@ class MailSettingsFormRequest extends AdminFormRequest
     public function rules(): array
     {
         return [
-            'mail:host' => 'required|string',
-            'mail:port' => 'required|integer|between:1,65535',
-            'mail:encryption' => ['present', Rule::in([null, 'tls', 'ssl'])],
-            'mail:username' => 'nullable|string|max:191',
-            'mail:password' => 'nullable|string|max:191',
+            'mail:mailers:smtp:host' => 'required|string',
+            'mail:mailers:smtp:port' => 'required|integer|between:1,65535',
+            'mail:mailers:smtp:encryption' => ['present', Rule::in([null, 'tls', 'ssl'])],
+            'mail:mailers:smtp:username' => 'nullable|string|max:191',
+            'mail:mailers:smtp:password' => 'nullable|string|max:191',
             'mail:from:address' => 'required|string|email',
             'mail:from:name' => 'nullable|string|max:191',
         ];
@@ -31,8 +31,8 @@ public function normalize(array $only = null): array
     {
         $keys = array_flip(array_keys($this->rules()));
 
-        if (empty($this->input('mail:password'))) {
-            unset($keys['mail:password']);
+        if (empty($this->input('mail:mailers:smtp:password'))) {
+            unset($keys['mail:mailers:smtp:password']);
         }
 
         return $this->only(array_flip($keys));

app/Providers/SettingsServiceProvider.php

@@ -51,7 +51,7 @@ class SettingsServiceProvider extends ServiceProvider
      * configuration array.
      */
     protected static array $encrypted = [
-        'mail:password',
+        'mail:mailers:smtp:password',
     ];
 
     /**