Merge pull request #868 from appwrite/fix-messaging-smtp-provider

Fix messaging smtp provider
appwrite · Feb 24, 2024 · 264af34 · 264af34
2 parents 1544ec6 + 644a67b
commit 264af34
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 8 deletions.
diff --git a/src/routes/console/project-[project]/messaging/providers/provider-[provider]/+page.svelte b/src/routes/console/project-[project]/messaging/providers/provider-[provider]/+page.svelte
@@ -112,7 +112,9 @@
                 fromEmail: $providerData.options['fromEmail'],
                 replyToName: $providerData.options['replyToName'],
                 replyToEmail: $providerData.options['replyToEmail'],
-                encryption: $providerData.options['encryption'],
+                encryption: !$providerData.options['encryption']
+                    ? 'none'
+                    : $providerData.options['encryption'],
                 autoTLS: $providerData.options['autoTLS'],
                 mailer: $providerData.options['mailer']
             };

diff --git a/...s/console/project-[project]/messaging/providers/provider-[provider]/updateSettings.svelte b/...s/console/project-[project]/messaging/providers/provider-[provider]/updateSettings.svelte
@@ -152,11 +152,11 @@
                         formValues['password'] || undefined,
                         formValues['encryption'],
                         formValues['autoTLS'],
+                        undefined,
                         formValues['fromName'] || undefined,
                         formValues['fromEmail'],
                         formValues['replyToName'] || undefined,
-                        formValues['replyToEmail'] || undefined,
-                        undefined
+                        formValues['replyToEmail'] || undefined
                     );
                     break;
                 case Providers.FCM:

diff --git a/src/routes/console/project-[project]/messaging/providers/settingsFormList.svelte b/src/routes/console/project-[project]/messaging/providers/settingsFormList.svelte
@@ -10,6 +10,7 @@
         InputText,
         InputPassword
     } from '$lib/elements/forms';
+    import InputCheckbox from '$lib/elements/forms/inputCheckbox.svelte';
     import PopoverContent from './popoverContent.svelte';
     import type {
         ProviderInput,
@@ -122,6 +123,12 @@
                     {input.description}
                 </svelte:fragment>
             </InputSwitch>
+        {:else if input.type === 'checkbox'}
+            <InputCheckbox label={input.label} id={input.name} bind:checked={params[input.name]}>
+                <svelte:fragment slot="description">
+                    {input.description}
+                </svelte:fragment>
+            </InputCheckbox>
         {:else if input.type === 'select'}
             <InputSelect
                 label={input.label}

diff --git a/src/routes/console/project-[project]/messaging/providers/store.ts b/src/routes/console/project-[project]/messaging/providers/store.ts
@@ -14,7 +14,16 @@ export const columns = writable<Column[]>([
 export type ProviderInput = {
     label: string;
     name: string;
-    type: 'text' | 'password' | 'phone' | 'email' | 'domain' | 'file' | 'switch' | 'select';
+    type:
+        | 'text'
+        | 'password'
+        | 'phone'
+        | 'email'
+        | 'domain'
+        | 'file'
+        | 'switch'
+        | 'select'
+        | 'checkbox';
     placeholder?: string;
     description?: string;
     popover?: string[];
@@ -317,7 +326,7 @@ export const providers: ProvidersMap = {
                         label: 'Server host',
                         name: 'host',
                         type: 'text',
-                        placeholder: 'Enter host'
+                        placeholder: 'smtp.server.com'
                     },
                     {
                         label: 'Server port',
@@ -353,16 +362,20 @@ export const providers: ProvidersMap = {
                     {
                         label: 'Auto TLS',
                         name: 'autoTLS',
-                        description: 'Automatically uses TLS encryption',
-                        type: 'switch',
+                        description: 'Automatically uses TLS encryption if available.',
+                        type: 'checkbox',
                         optional: true
                     },
                     {
                         label: 'Mailer',
                         name: 'mailer',
                         type: 'text',
                         optional: true,
-                        placeholder: 'Enter mailer'
+                        placeholder: 'Enter mailer',
+                        popover: [
+                            '<b>What is the Mailer?</b>',
+                            'The value to use for the X-Mailer header.'
+                        ]
                     }
                 ]
             }