diff --git a/src/routes/console/project-[project]/messaging/providers/create.svelte b/src/routes/console/project-[project]/messaging/providers/create.svelte index faad87a3b..26a7583ea 100644 --- a/src/routes/console/project-[project]/messaging/providers/create.svelte +++ b/src/routes/console/project-[project]/messaging/providers/create.svelte @@ -11,7 +11,7 @@ import { base } from '$app/paths'; import { project } from '../../store'; import { wizard } from '$lib/stores/wizard'; - import { provider, providerParams } from './wizard/store'; + import { provider, providerParams } from './store'; import { ID, type Models } from '@appwrite.io/console'; import { Providers } from '../provider.svelte'; diff --git a/src/routes/console/project-[project]/messaging/providers/createProviderDropdown.svelte b/src/routes/console/project-[project]/messaging/providers/createProviderDropdown.svelte index 6c8ad722d..c8294b284 100644 --- a/src/routes/console/project-[project]/messaging/providers/createProviderDropdown.svelte +++ b/src/routes/console/project-[project]/messaging/providers/createProviderDropdown.svelte @@ -4,7 +4,7 @@ import { wizard } from '$lib/stores/wizard'; import { providers } from './store'; import Create from './create.svelte'; - import { providerType, provider } from './wizard/store'; + import { providerType, provider } from './store'; import { Providers } from '../provider.svelte'; import { isValueOfStringEnum } from '$lib/helpers/types'; import { MessagingProviderType } from '@appwrite.io/console'; diff --git a/src/routes/console/project-[project]/messaging/providers/wizard/popoverContent.svelte b/src/routes/console/project-[project]/messaging/providers/popoverContent.svelte similarity index 100% rename from src/routes/console/project-[project]/messaging/providers/wizard/popoverContent.svelte rename to src/routes/console/project-[project]/messaging/providers/popoverContent.svelte diff --git a/src/routes/console/project-[project]/messaging/providers/provider-[provider]/updateStatus.svelte b/src/routes/console/project-[project]/messaging/providers/provider-[provider]/updateStatus.svelte index 1bd4c4536..78d81d5d9 100644 --- a/src/routes/console/project-[project]/messaging/providers/provider-[provider]/updateStatus.svelte +++ b/src/routes/console/project-[project]/messaging/providers/provider-[provider]/updateStatus.svelte @@ -14,146 +14,146 @@ import Provider, { Providers } from '../../provider.svelte'; import ProviderType from '../../providerType.svelte'; import Update from '../update.svelte'; - import { providerParams, providerType, provider as wizardProvider } from '../wizard/store'; - import { provider } from './store'; + import { providerParams, providerType, provider } from '../store'; + import { provider as providerData } from './store'; let enabled: boolean = null; onMount(() => { - enabled ??= $provider.enabled; + enabled ??= $providerData.enabled; }); function configure() { - if (!isValueOfStringEnum(MessagingProviderType, $provider.type)) { - throw new Error(`Invalid provider type: ${$provider.type}`); + if (!isValueOfStringEnum(MessagingProviderType, $providerData.type)) { + throw new Error(`Invalid provider type: ${$providerData.type}`); } - if (!isValueOfStringEnum(Providers, $provider.provider)) { - throw new Error(`Invalid provider: ${$provider.provider}`); + if (!isValueOfStringEnum(Providers, $providerData.provider)) { + throw new Error(`Invalid provider: ${$providerData.provider}`); } - $providerType = $provider.type; - $wizardProvider = $provider.provider; + $providerType = $providerData.type; + $provider = $providerData.provider; - switch ($wizardProvider) { + switch ($provider) { case Providers.Twilio: - $providerParams[$wizardProvider] = { - providerId: $provider.$id, - name: $provider.name, - enabled: $provider.enabled, - accountSid: $provider.credentials['accountSid'], - authToken: $provider.credentials['authToken'], - from: $provider.options['from'] + $providerParams[$provider] = { + providerId: $providerData.$id, + name: $providerData.name, + enabled: $providerData.enabled, + accountSid: $providerData.credentials['accountSid'], + authToken: $providerData.credentials['authToken'], + from: $providerData.options['from'] }; break; case Providers.Msg91: - $providerParams[$wizardProvider] = { - providerId: $provider.$id, - name: $provider.name, - enabled: $provider.enabled, - from: $provider.options['from'], - senderId: $provider.credentials['senderId'], - authKey: $provider.credentials['authKey'] + $providerParams[$provider] = { + providerId: $providerData.$id, + name: $providerData.name, + enabled: $providerData.enabled, + from: $providerData.options['from'], + senderId: $providerData.credentials['senderId'], + authKey: $providerData.credentials['authKey'] }; break; case Providers.Telesign: - $providerParams[$wizardProvider] = { - providerId: $provider.$id, - name: $provider.name, - enabled: $provider.enabled, - username: $provider.credentials['username'], - password: $provider.credentials['password'], - from: $provider.options['from'] + $providerParams[$provider] = { + providerId: $providerData.$id, + name: $providerData.name, + enabled: $providerData.enabled, + username: $providerData.credentials['username'], + password: $providerData.credentials['password'], + from: $providerData.options['from'] }; break; case Providers.Textmagic: - $providerParams[$wizardProvider] = { - providerId: $provider.$id, - name: $provider.name, - enabled: $provider.enabled, - username: $provider.credentials['username'], - apiKey: $provider.credentials['apiKey'], - from: $provider.options['from'] + $providerParams[$provider] = { + providerId: $providerData.$id, + name: $providerData.name, + enabled: $providerData.enabled, + username: $providerData.credentials['username'], + apiKey: $providerData.credentials['apiKey'], + from: $providerData.options['from'] }; break; case Providers.Vonage: - $providerParams[$wizardProvider] = { - providerId: $provider.$id, - name: $provider.name, - enabled: $provider.enabled, - apiKey: $provider.credentials['apiKey'], - apiSecret: $provider.credentials['apiSecret'], - from: $provider.options['from'] + $providerParams[$provider] = { + providerId: $providerData.$id, + name: $providerData.name, + enabled: $providerData.enabled, + apiKey: $providerData.credentials['apiKey'], + apiSecret: $providerData.credentials['apiSecret'], + from: $providerData.options['from'] }; break; case Providers.Mailgun: - $providerParams[$wizardProvider] = { - providerId: $provider.$id, - name: $provider.name, - enabled: $provider.enabled, + $providerParams[$provider] = { + providerId: $providerData.$id, + name: $providerData.name, + enabled: $providerData.enabled, isEuRegion: false, - fromEmail: $provider.options['fromEmail'], - fromName: $provider.options['fromName'], - replyToEmail: $provider.options['replyToEmail'], - replyToName: $provider.options['replyToName'], - apiKey: $provider.credentials['apiKey'], - domain: $provider.credentials['domain'] + fromEmail: $providerData.options['fromEmail'], + fromName: $providerData.options['fromName'], + replyToEmail: $providerData.options['replyToEmail'], + replyToName: $providerData.options['replyToName'], + apiKey: $providerData.credentials['apiKey'], + domain: $providerData.credentials['domain'] }; break; case Providers.Sendgrid: - $providerParams[$wizardProvider] = { - providerId: $provider.$id, - name: $provider.name, - enabled: $provider.enabled, - apiKey: $provider.credentials['apiKey'], - fromEmail: $provider.options['fromEmail'], - fromName: $provider.options['fromName'], - replyToEmail: $provider.options['replyToEmail'], - replyToName: $provider.options['replyToName'] + $providerParams[$provider] = { + providerId: $providerData.$id, + name: $providerData.name, + enabled: $providerData.enabled, + apiKey: $providerData.credentials['apiKey'], + fromEmail: $providerData.options['fromEmail'], + fromName: $providerData.options['fromName'], + replyToEmail: $providerData.options['replyToEmail'], + replyToName: $providerData.options['replyToName'] }; break; case Providers.SMTP: - $providerParams[$wizardProvider] = { - providerId: $provider.$id, - name: $provider.name, - enabled: $provider.enabled, - host: $provider.credentials['host'], - port: $provider.credentials['port'], - username: $provider.credentials['username'], - password: $provider.credentials['password'], - fromName: $provider.options['fromName'], - fromEmail: $provider.options['fromEmail'], - replyToName: $provider.options['replyToName'], - replyToEmail: $provider.options['replyToEmail'], - encryption: $provider.options['encryption'], - autoTLS: $provider.options['autoTLS'], - mailer: $provider.options['mailer'] + $providerParams[$provider] = { + providerId: $providerData.$id, + name: $providerData.name, + enabled: $providerData.enabled, + host: $providerData.credentials['host'], + port: $providerData.credentials['port'], + username: $providerData.credentials['username'], + password: $providerData.credentials['password'], + fromName: $providerData.options['fromName'], + fromEmail: $providerData.options['fromEmail'], + replyToName: $providerData.options['replyToName'], + replyToEmail: $providerData.options['replyToEmail'], + encryption: $providerData.options['encryption'], + autoTLS: $providerData.options['autoTLS'], + mailer: $providerData.options['mailer'] }; break; case Providers.FCM: - $providerParams[$wizardProvider] = { - providerId: $provider.$id, - name: $provider.name, - enabled: $provider.enabled + $providerParams[$provider] = { + providerId: $providerData.$id, + name: $providerData.name, + enabled: $providerData.enabled }; - if ('serviceAccountJSON' in $provider.credentials) { - const serviceAccountJSON = $provider.credentials['serviceAccountJSON']; + if ('serviceAccountJSON' in $providerData.credentials) { + const serviceAccountJSON = $providerData.credentials['serviceAccountJSON']; if (typeof serviceAccountJSON === 'string') { - $providerParams[$wizardProvider].serviceAccountJSON = serviceAccountJSON; + $providerParams[$provider].serviceAccountJSON = serviceAccountJSON; } else if (serviceAccountJSON instanceof Object) { - $providerParams[$wizardProvider].serviceAccountJSON = + $providerParams[$provider].serviceAccountJSON = JSON.stringify(serviceAccountJSON); } } break; case Providers.APNS: - $providerParams[$wizardProvider] = { - providerId: $provider.$id, - name: $provider.name, - enabled: $provider.enabled, - authKey: $provider.credentials['authKey'], - authKeyId: $provider.credentials['authKeyId'], - teamId: $provider.credentials['teamId'], - bundleId: $provider.credentials['bundleId'] + $providerParams[$provider] = { + providerId: $providerData.$id, + name: $providerData.name, + enabled: $providerData.enabled, + authKey: $providerData.credentials['authKey'], + authKeyId: $providerData.credentials['authKeyId'], + teamId: $providerData.credentials['teamId'], + bundleId: $providerData.credentials['bundleId'] }; break; } @@ -164,8 +164,8 @@ async function updateStatus() { try { let response = { $id: '', name: '' }; - const providerId = $provider.$id; - switch ($provider.provider) { + const providerId = $providerData.$id; + switch ($providerData.provider) { case Providers.Twilio: response = await sdk.forProject.messaging.updateTwilioProvider( providerId, @@ -256,7 +256,7 @@ message: `${response.name} has been ${enabled ? 'enabled' : 'disabled'}` }); trackEvent(Submit.MessagingProviderUpdate, { - provider: $provider + provider: $providerData }); } catch (error) { addNotification({ @@ -270,8 +270,8 @@
- - {$provider.name} + + {$providerData.name}
@@ -283,9 +283,9 @@ label={enabled ? 'Enabled' : 'Disabled'} bind:value={enabled} /> -

Provider:

-

Channel:

-

Created: {toLocaleDateTime($provider.$createdAt)}

+

Provider:

+

Channel:

+

Created: {toLocaleDateTime($providerData.$createdAt)}

@@ -293,7 +293,7 @@
-
diff --git a/src/routes/console/project-[project]/messaging/providers/settingsFormList.svelte b/src/routes/console/project-[project]/messaging/providers/settingsFormList.svelte new file mode 100644 index 000000000..35e208603 --- /dev/null +++ b/src/routes/console/project-[project]/messaging/providers/settingsFormList.svelte @@ -0,0 +1,114 @@ + + + + {#each inputs as input} + {@const popoverImage = input.popoverImage} + {#if input.type === 'text'} + + + + + + {:else if input.type === 'password'} + + + + + + {:else if input.type === 'email'} + + + + + + {:else if input.type === 'domain'} + + + + + + {:else if input.type === 'phone'} + + + + + + {:else if input.type === 'file'} + + + + + + {:else if input.type === 'switch'} + + + {input.description} + + + {:else if input.type === 'select'} + + {/if} + {/each} + diff --git a/src/routes/console/project-[project]/messaging/providers/store.ts b/src/routes/console/project-[project]/messaging/providers/store.ts index 8f4ff9622..e3a62e915 100644 --- a/src/routes/console/project-[project]/messaging/providers/store.ts +++ b/src/routes/console/project-[project]/messaging/providers/store.ts @@ -67,7 +67,7 @@ export const providers: ProvidersMap = { popover: [ 'How to get the FCM service account JSON?', 'Head to Project settings -> Service accounts -> Generate new private key.', - 'Generating the new key will result in the download of a JSON file.', + 'Generating the new key will result in the download of a JSON file.' ], popoverImage: { src: { @@ -533,3 +533,124 @@ export const providers: ProvidersMap = { } } }; + +type ProviderParams = { + providerId: string; + name: string; + enabled: boolean; +}; + +/** + * SMS providers + */ + +export type TwilioProviderParams = ProviderParams & { + accountSid: string; + authToken: string; + from: string; +}; + +export type Msg91ProviderParams = ProviderParams & { + from: string; + senderId: string; + authKey: string; +}; + +export type TelesignProviderParams = ProviderParams & { + from: string; + username: string; + password: string; +}; + +export type TextmagicProviderParams = ProviderParams & { + from: string; + username: string; + apiKey: string; +}; + +export type VonageProviderParams = ProviderParams & { + from: string; + apiKey: string; + apiSecret: string; +}; + +/** + * Email providers + */ + +export type MailgunProviderParams = ProviderParams & { + fromEmail: string; + fromName: string; + replyToEmail: string; + replyToName: string; + isEuRegion: boolean; + apiKey: string; + domain: string; +}; + +export type SendgridProviderParams = ProviderParams & { + fromEmail: string; + fromName: string; + replyToEmail: string; + replyToName: string; + apiKey: string; +}; + +export type SMTPProviderParams = ProviderParams & { + fromEmail: string; + fromName: string; + replyToEmail: string; + replyToName: string; + host: string; + port: number; + username: string; + password: string; + encryption: SMTPEncryption; + autoTLS: boolean; + mailer: string; +}; + +/** + * Push providers + */ + +export type FCMProviderParams = ProviderParams & { + serviceAccountJSON: string; +}; + +export type APNSProviderParams = ProviderParams & { + authKey: string; + authKeyId: string; + teamId: string; + bundleId: string; +}; + +export type MQTTProviderParams = ProviderParams & { + serverKey: string; +}; + +export const providerType = writable(null); +export const provider = writable(null); +export const providerParams = writable<{ + twilio: Partial; + msg91: Partial; + telesign: Partial; + textmagic: Partial; + vonage: Partial; + mailgun: Partial; + sendgrid: Partial; + smtp: Partial; + fcm: Partial; + apns: Partial; +}>({ + twilio: null, + msg91: null, + telesign: null, + textmagic: null, + vonage: null, + mailgun: null, + sendgrid: null, + smtp: null, + fcm: null, + apns: null +}); diff --git a/src/routes/console/project-[project]/messaging/providers/update.svelte b/src/routes/console/project-[project]/messaging/providers/update.svelte index 5fda66c95..f20606214 100644 --- a/src/routes/console/project-[project]/messaging/providers/update.svelte +++ b/src/routes/console/project-[project]/messaging/providers/update.svelte @@ -9,7 +9,7 @@ import { base } from '$app/paths'; import { project } from '../../store'; import { wizard } from '$lib/stores/wizard'; - import { provider, providerParams } from './wizard/store'; + import { provider, providerParams } from './store'; import { Providers } from '../provider.svelte'; import { Dependencies } from '$lib/constants'; import type { Models } from '@appwrite.io/console'; diff --git a/src/routes/console/project-[project]/messaging/providers/wizard/provider.svelte b/src/routes/console/project-[project]/messaging/providers/wizard/provider.svelte index cb243b436..61f1e3ad5 100644 --- a/src/routes/console/project-[project]/messaging/providers/wizard/provider.svelte +++ b/src/routes/console/project-[project]/messaging/providers/wizard/provider.svelte @@ -1,6 +1,6 @@