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

Fix messaging smtp provider
This commit is contained in:
Torsten Dittmann authored and GitHub committed 2024-02-24 23:44:59 +01:00
commit 264af34b81
4 files changed
+30 -8

No files matched your search

@@ -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']
};
@@ -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:
@@ -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}
@@ -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,8 +362,8 @@ 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
},
{
@@ -362,7 +371,11 @@ export const providers: ProvidersMap = {
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.'
]
}
]
}