diff --git a/package-lock.json b/package-lock.json index 633737dad..e6751c176 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6,7 +6,7 @@ "": { "name": "@appwrite/console", "dependencies": { - "@appwrite.io/console": "^0.6.0-rc.9", + "@appwrite.io/console": "^0.6.0-rc.12", "@appwrite.io/pink": "0.4.0", "@appwrite.io/pink-icons": "0.4.0", "@popperjs/core": "^2.11.8", @@ -158,9 +158,9 @@ "integrity": "sha512-TD+xbmsBLyYy/IxFimW/YL/9L2IEnM7/EoV9Aeh56U64Ify8o27HJcKjo38XY9Tcn0uOq1AX3thkKgvtWvwFQg==" }, "node_modules/@appwrite.io/console": { - "version": "0.6.0-rc.9", - "resolved": "https://registry.npmjs.org/@appwrite.io/console/-/console-0.6.0-rc.9.tgz", - "integrity": "sha512-AZg3MWH3se4A/OKv95vHeIGmj32jCOBW8WZpFLR0ULMbk3Yz/B5Kc8SAKB9AQ9WZkruNopBN9nIdwX+s3nlc8Q==", + "version": "0.6.0-rc.12", + "resolved": "https://registry.npmjs.org/@appwrite.io/console/-/console-0.6.0-rc.12.tgz", + "integrity": "sha512-pDov75TCkBmJdUPrWuzRW7uM28HYqiMFtVFrUoavDd/lMPBS7RnPXL4sBHsGY8AUldHE3oBcGVPkNoQfEAgLlw==", "dependencies": { "cross-fetch": "3.1.5", "isomorphic-form-data": "2.0.0" diff --git a/package.json b/package.json index 77e3885e5..0d826dea2 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "e2e": "playwright test tests/e2e" }, "dependencies": { - "@appwrite.io/console": "^0.6.0-rc.9", + "@appwrite.io/console": "^0.6.0-rc.12", "@appwrite.io/pink": "0.4.0", "@appwrite.io/pink-icons": "0.4.0", "@popperjs/core": "^2.11.8", diff --git a/src/lib/stores/project-services.ts b/src/lib/stores/project-services.ts index 9366bce35..cfa94f74a 100644 --- a/src/lib/stores/project-services.ts +++ b/src/lib/stores/project-services.ts @@ -1,9 +1,9 @@ import { writable } from 'svelte/store'; -import { APIService, type Models } from '@appwrite.io/console'; +import { ApiService, type Models } from '@appwrite.io/console'; export type Service = { label: string; - method: APIService; + method: ApiService; value: boolean | null; }; @@ -12,52 +12,52 @@ function createServices() { list: [ { label: 'Account', - method: APIService.Account, + method: ApiService.Account, value: null }, { label: 'Avatars', - method: APIService.Avatars, + method: ApiService.Avatars, value: null }, { label: 'Databases', - method: APIService.Databases, + method: ApiService.Databases, value: null }, { label: 'Functions', - method: APIService.Functions, + method: ApiService.Functions, value: null }, { label: 'Health', - method: APIService.Health, + method: ApiService.Health, value: null }, { label: 'Locale', - method: APIService.Locale, + method: ApiService.Locale, value: null }, { label: 'Storage', - method: APIService.Storage, + method: ApiService.Storage, value: null }, { label: 'Teams', - method: APIService.Teams, + method: ApiService.Teams, value: null }, { label: 'Users', - method: APIService.Users, + method: ApiService.Users, value: null }, { label: 'GraphQL', - method: APIService.Graphql, + method: ApiService.Graphql, value: null } ] @@ -70,47 +70,47 @@ function createServices() { const list = [ { label: 'Account', - method: APIService.Account, + method: ApiService.Account, value: project.serviceStatusForAccount }, { label: 'Avatars', - method: APIService.Avatars, + method: ApiService.Avatars, value: project.serviceStatusForAvatars }, { label: 'Databases', - method: APIService.Databases, + method: ApiService.Databases, value: project.serviceStatusForDatabases }, { label: 'Functions', - method: APIService.Functions, + method: ApiService.Functions, value: project.serviceStatusForFunctions }, { label: 'Health', - method: APIService.Health, + method: ApiService.Health, value: project.serviceStatusForHealth }, { label: 'Locale', - method: APIService.Locale, + method: ApiService.Locale, value: project.serviceStatusForLocale }, { label: 'Storage', - method: APIService.Storage, + method: ApiService.Storage, value: project.serviceStatusForStorage }, { label: 'Teams', - method: APIService.Teams, + method: ApiService.Teams, value: project.serviceStatusForTeams }, { label: 'Users', - method: APIService.Users, + method: ApiService.Users, value: project.serviceStatusForUsers } ]; diff --git a/src/routes/console/account/deleteMfa.svelte b/src/routes/console/account/deleteMfa.svelte index 01b0c1b8d..6b113e406 100644 --- a/src/routes/console/account/deleteMfa.svelte +++ b/src/routes/console/account/deleteMfa.svelte @@ -8,7 +8,7 @@ import InputDigits from '$lib/elements/forms/inputDigits.svelte'; import { addNotification } from '$lib/stores/notifications'; import { sdk } from '$lib/stores/sdk'; - import { AuthenticatorProvider } from '@appwrite.io/console'; + import { AuthenticatorType } from '@appwrite.io/console'; export let showDelete = false; @@ -17,7 +17,7 @@ async function deleteProvider() { try { - await sdk.forConsole.account.deleteAuthenticator(AuthenticatorProvider.Totp, code); + await sdk.forConsole.account.deleteAuthenticator(AuthenticatorType.Totp, code); await invalidate(Dependencies.ACCOUNT); await invalidate(Dependencies.FACTORS); showDelete = false; diff --git a/src/routes/console/account/mfa.svelte b/src/routes/console/account/mfa.svelte index afd18a635..2f584fb18 100644 --- a/src/routes/console/account/mfa.svelte +++ b/src/routes/console/account/mfa.svelte @@ -8,22 +8,22 @@ import { Table, TableBody, TableCell, TableRow } from '$lib/elements/table'; import { addNotification } from '$lib/stores/notifications'; import { sdk } from '$lib/stores/sdk'; - import { AuthenticatorFactor, type Models } from '@appwrite.io/console'; + import { AuthenticatorType, type Models } from '@appwrite.io/console'; export let showSetup = false; export let showRecoveryCodes = false; let code: string; - let provider: Models.MfaProvider = null; + let type: Models.MfaType = null; async function addAuthenticator(): Promise { - provider = await sdk.forConsole.account.addAuthenticator(AuthenticatorFactor.Totp); + type = await sdk.forConsole.account.addAuthenticator(AuthenticatorType.Totp); - return sdk.forConsole.avatars.getQR(provider.uri, 192 * 2); + return sdk.forConsole.avatars.getQR(type.uri, 192 * 2); } async function verifyAuthenticator() { try { - await sdk.forConsole.account.verifyAuthenticator(AuthenticatorFactor.Totp, code); + await sdk.forConsole.account.verifyAuthenticator(AuthenticatorType.Totp, code); await invalidate(Dependencies.ACCOUNT); await invalidate(Dependencies.FACTORS); showSetup = false; @@ -72,8 +72,8 @@ description="Learn more about multi-factor authentication in our documentation." bind:show={showRecoveryCodes} onSubmit={verifyAuthenticator}> - {#if provider} - {@const formattedBackupCodes = provider.backups.join('\n')} + {#if type} + {@const formattedBackupCodes = type.backups.join('\n')} It is highly recommended to securely store your recovery codes @@ -109,7 +109,7 @@ - {#each provider.backups as code} + {#each type.backups as code} {code} diff --git a/src/routes/console/account/store.ts b/src/routes/console/account/store.ts index b6f30351b..35b3dbe5d 100644 --- a/src/routes/console/account/store.ts +++ b/src/routes/console/account/store.ts @@ -2,4 +2,4 @@ import { page } from '$app/stores'; import { derived } from 'svelte/store'; import type { Models } from '@appwrite.io/console'; -export const factors = derived(page, ($page) => $page.data.factors as Models.MfaProviders); +export const factors = derived(page, ($page) => $page.data.factors as Models.MfaFactors); diff --git a/src/routes/console/project-[project]/auth/templates/+page.svelte b/src/routes/console/project-[project]/auth/templates/+page.svelte index 4b20cb34d..b6b25db44 100644 --- a/src/routes/console/project-[project]/auth/templates/+page.svelte +++ b/src/routes/console/project-[project]/auth/templates/+page.svelte @@ -4,8 +4,8 @@ // TODO: fix TemplateType and TemplateLocale typing once SDK is updated return await sdk.forConsole.projects.getEmailTemplate( projectId, - type as TemplateType, - locale as TemplateLocale + type as EmailTemplateType, + locale as EmailTemplateLocale ); } catch (e) { addNotification({ @@ -19,8 +19,8 @@ // TODO: fix TemplateType and TemplateLocale typing once SDK is updated return await sdk.forConsole.projects.getSmsTemplate( projectId, - type as TemplateType, - locale as TemplateLocale + type as SmsTemplateType, + locale as SmsTemplateLocale ); } catch (e) { addNotification({ @@ -54,7 +54,12 @@ import ChangeOrganizationTierCloud from '$routes/console/changeOrganizationTierCloud.svelte'; import { wizard } from '$lib/stores/wizard'; import { BillingPlan } from '$lib/constants'; - import type { TemplateLocale, TemplateType } from '@appwrite.io/console'; + import type { + SmsTemplateLocale, + SmsTemplateType, + EmailTemplateType, + EmailTemplateLocale + } from '@appwrite.io/console'; const projectId = $page.params.project; diff --git a/src/routes/console/project-[project]/auth/templates/emailTemplate.svelte b/src/routes/console/project-[project]/auth/templates/emailTemplate.svelte index c8c481ebe..44b018f14 100644 --- a/src/routes/console/project-[project]/auth/templates/emailTemplate.svelte +++ b/src/routes/console/project-[project]/auth/templates/emailTemplate.svelte @@ -15,7 +15,7 @@ import deepEqual from 'deep-equal'; import { Submit, trackError, trackEvent } from '$lib/actions/analytics'; import { Box } from '$lib/components'; - import type { TemplateLocale, TemplateType } from '@appwrite.io/console'; + import type { EmailTemplateLocale, EmailTemplateType } from '@appwrite.io/console'; export let loading = false; let openResetModal = false; @@ -56,8 +56,8 @@ // TODO: fix TemplateType and TemplateLocale typing once SDK is updated await sdk.forConsole.projects.updateEmailTemplate( $project.$id, - $emailTemplate.type ? ($emailTemplate.type as TemplateType) : undefined, - $emailTemplate.locale ? ($emailTemplate.locale as TemplateLocale) : undefined, + $emailTemplate.type ? ($emailTemplate.type as EmailTemplateType) : undefined, + $emailTemplate.locale ? ($emailTemplate.locale as EmailTemplateLocale) : undefined, $emailTemplate.subject ? $emailTemplate.subject : undefined, $emailTemplate.message ? $emailTemplate.message : undefined, $emailTemplate.senderName ? $emailTemplate.senderName : undefined, diff --git a/src/routes/console/project-[project]/auth/templates/resetEmail.svelte b/src/routes/console/project-[project]/auth/templates/resetEmail.svelte index 070847205..123a95df9 100644 --- a/src/routes/console/project-[project]/auth/templates/resetEmail.svelte +++ b/src/routes/console/project-[project]/auth/templates/resetEmail.svelte @@ -4,7 +4,7 @@ import { Button } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; import { sdk } from '$lib/stores/sdk'; - import type { TemplateLocale, TemplateType } from '@appwrite.io/console'; + import type { EmailTemplateLocale, EmailTemplateType } from '@appwrite.io/console'; import { project } from '../../store'; import { loadEmailTemplate } from './+page.svelte'; import { baseEmailTemplate, emailTemplate } from './store'; @@ -18,8 +18,8 @@ // TODO: fix TemplateType and TemplateLocale typing once SDK is updated await sdk.forConsole.projects.deleteEmailTemplate( $project.$id, - $emailTemplate.type as TemplateType, - $emailTemplate.locale as TemplateLocale + $emailTemplate.type as EmailTemplateType, + $emailTemplate.locale as EmailTemplateLocale ); $emailTemplate = await loadEmailTemplate( $project.$id, diff --git a/src/routes/console/project-[project]/auth/templates/resetSms.svelte b/src/routes/console/project-[project]/auth/templates/resetSms.svelte index dc449b1fa..3ee20b634 100644 --- a/src/routes/console/project-[project]/auth/templates/resetSms.svelte +++ b/src/routes/console/project-[project]/auth/templates/resetSms.svelte @@ -3,7 +3,7 @@ import { Modal } from '$lib/components'; import { Button } from '$lib/elements/forms'; import { sdk } from '$lib/stores/sdk'; - import type { TemplateLocale, TemplateType } from '@appwrite.io/console'; + import type { SmsTemplateLocale, SmsTemplateType } from '@appwrite.io/console'; import { project } from '../../store'; import { loadSmsTemplate } from './+page.svelte'; import { baseSmsTemplate, smsTemplate } from './store'; @@ -17,8 +17,8 @@ // TODO: fix TemplateType and TemplateLocale typing once SDK is updated await sdk.forConsole.projects.deleteSmsTemplate( $project.$id, - $smsTemplate.type as TemplateType, - $smsTemplate.locale as TemplateLocale + $smsTemplate.type as SmsTemplateType, + $smsTemplate.locale as SmsTemplateLocale ); $smsTemplate = await loadSmsTemplate( diff --git a/src/routes/console/project-[project]/auth/templates/smsTemplate.svelte b/src/routes/console/project-[project]/auth/templates/smsTemplate.svelte index 52551d004..326ae5555 100644 --- a/src/routes/console/project-[project]/auth/templates/smsTemplate.svelte +++ b/src/routes/console/project-[project]/auth/templates/smsTemplate.svelte @@ -8,7 +8,7 @@ import deepEqual from 'deep-equal'; import { Submit, trackError, trackEvent } from '$lib/actions/analytics'; import { Box } from '$lib/components'; - import type { TemplateLocale, TemplateType } from '@appwrite.io/console'; + import type { SmsTemplateLocale, SmsTemplateType } from '@appwrite.io/console'; export let loading = false; const projectId = $page.params.project; @@ -39,8 +39,8 @@ // TODO: fix TemplateType and TemplateLocale typing once SDK is updated await sdk.forConsole.projects.updateSmsTemplate( projectId, - $smsTemplate.type as TemplateType, - $smsTemplate.locale as TemplateLocale, + $smsTemplate.type as SmsTemplateType, + $smsTemplate.locale as SmsTemplateLocale, $smsTemplate.message ); diff --git a/src/routes/console/project-[project]/auth/user-[user]/+layout.ts b/src/routes/console/project-[project]/auth/user-[user]/+layout.ts index 0eafe1903..a695abc55 100644 --- a/src/routes/console/project-[project]/auth/user-[user]/+layout.ts +++ b/src/routes/console/project-[project]/auth/user-[user]/+layout.ts @@ -13,7 +13,7 @@ export const load: LayoutLoad = async ({ params, depends }) => { header: Header, breadcrumbs: Breadcrumbs, user: await sdk.forProject.users.get(params.user), - userFactors: await sdk.forProject.users.listProviders(params.user) + userFactors: await sdk.forProject.users.listFactors(params.user) }; } catch (e) { error(e.code, e.message); diff --git a/src/routes/console/project-[project]/auth/user-[user]/deleteMfa.svelte b/src/routes/console/project-[project]/auth/user-[user]/deleteMfa.svelte index 9221a25b8..912fab0b1 100644 --- a/src/routes/console/project-[project]/auth/user-[user]/deleteMfa.svelte +++ b/src/routes/console/project-[project]/auth/user-[user]/deleteMfa.svelte @@ -8,7 +8,7 @@ import InputDigits from '$lib/elements/forms/inputDigits.svelte'; import { addNotification } from '$lib/stores/notifications'; import { sdk } from '$lib/stores/sdk'; - import { AuthenticatorProvider } from '@appwrite.io/console'; + import { AuthenticatorType } from '@appwrite.io/console'; import { user } from './store'; export let showDelete = false; @@ -18,11 +18,7 @@ async function deleteProvider() { try { - await sdk.forConsole.users.deleteAuthenticator( - $user.$id, - AuthenticatorProvider.Totp, - '' - ); + await sdk.forConsole.users.deleteAuthenticator($user.$id, AuthenticatorType.Totp, ''); await invalidate(Dependencies.ACCOUNT); await invalidate(Dependencies.FACTORS); showDelete = false; diff --git a/src/routes/console/project-[project]/auth/user-[user]/store.ts b/src/routes/console/project-[project]/auth/user-[user]/store.ts index 0f924c0af..909a293de 100644 --- a/src/routes/console/project-[project]/auth/user-[user]/store.ts +++ b/src/routes/console/project-[project]/auth/user-[user]/store.ts @@ -6,4 +6,4 @@ export const user = derived( page, ($page) => $page.data.user as Models.User> ); -export const userFactors = derived(page, ($page) => $page.data.userFactors as Models.MfaProviders); +export const userFactors = derived(page, ($page) => $page.data.userFactors as Models.MfaFactors); diff --git a/src/routes/console/project-[project]/messaging/+page.svelte b/src/routes/console/project-[project]/messaging/+page.svelte index 724d416ae..ff96c206e 100644 --- a/src/routes/console/project-[project]/messaging/+page.svelte +++ b/src/routes/console/project-[project]/messaging/+page.svelte @@ -28,7 +28,7 @@ } from '$lib/elements/table'; import { toLocaleDateTime } from '$lib/helpers/date'; import { Container } from '$lib/layout'; - import { MessageType, MessagingProviderType } from '@appwrite.io/console'; + import { MessageStatus, MessagingProviderType } from '@appwrite.io/console'; import type { PageData } from './$types'; import CreateMessageDropdown from './createMessageDropdown.svelte'; import FailedModal from './failedModal.svelte'; @@ -141,7 +141,7 @@ + disabled={message.status === MessageStatus.Processing} /> {#each $columns as column (column.id)} {#if column.show} diff --git a/src/routes/console/project-[project]/messaging/message-[message]/+page.svelte b/src/routes/console/project-[project]/messaging/message-[message]/+page.svelte index 7c8d89bab..8bcefdc55 100644 --- a/src/routes/console/project-[project]/messaging/message-[message]/+page.svelte +++ b/src/routes/console/project-[project]/messaging/message-[message]/+page.svelte @@ -12,7 +12,7 @@ import Wizard from '../wizard.svelte'; import type { PageData } from './$types'; import { isValueOfStringEnum } from '$lib/helpers/types'; - import { MessageType, MessagingProviderType } from '@appwrite.io/console'; + import { MessageStatus, MessagingProviderType } from '@appwrite.io/console'; import Topics from './topics.svelte'; import Targets from './targets.svelte'; @@ -35,7 +35,7 @@ topics: $message.topics, users: $message.users, targets: $message.targets, - status: MessageType.Draft, + status: MessageStatus.Draft, scheduledAt: $message.scheduledAt }; @@ -100,19 +100,19 @@ {#if $message.providerType === MessagingProviderType.Email} + onEdit={$message.status === MessageStatus.Draft ? onEdit : null} /> {:else if $message.providerType === MessagingProviderType.Sms} + onEdit={$message.status === MessageStatus.Draft ? onEdit : null} /> {:else if $message.providerType === MessagingProviderType.Push} + onEdit={$message.status === MessageStatus.Draft ? onEdit : null} /> {/if} - {#if $message.status !== MessageType.Processing} + {#if $message.status !== MessageStatus.Processing} {/if} diff --git a/src/routes/console/project-[project]/messaging/message-[message]/topics.svelte b/src/routes/console/project-[project]/messaging/message-[message]/topics.svelte index 75589a7e9..1df5200aa 100644 --- a/src/routes/console/project-[project]/messaging/message-[message]/topics.svelte +++ b/src/routes/console/project-[project]/messaging/message-[message]/topics.svelte @@ -41,7 +41,7 @@ - {topic.total} + {topic.smsTotal + topic.emailTotal + topic.pushTotal} {/each} diff --git a/src/routes/console/project-[project]/messaging/messageStatusPill.svelte b/src/routes/console/project-[project]/messaging/messageStatusPill.svelte index 1bca4d2de..49f2684cb 100644 --- a/src/routes/console/project-[project]/messaging/messageStatusPill.svelte +++ b/src/routes/console/project-[project]/messaging/messageStatusPill.svelte @@ -8,7 +8,7 @@ info={status === 'scheduled'} warning={status === 'processing'} success={status === 'sent'} - danger={status == 'failed'} + danger={status === 'failed'} on:click> {status} diff --git a/src/routes/console/project-[project]/messaging/providers/+page.svelte b/src/routes/console/project-[project]/messaging/providers/+page.svelte index 4afae7fd9..ca097cf8f 100644 --- a/src/routes/console/project-[project]/messaging/providers/+page.svelte +++ b/src/routes/console/project-[project]/messaging/providers/+page.svelte @@ -71,7 +71,7 @@ total={data.providers.total} /> {:else if $hasPageQueries} - {:else if data.search && data.search != 'empty'} + {:else if data.search && data.search !== 'empty'}
Sorry, we couldn't find '{data.search}' diff --git a/src/routes/console/project-[project]/messaging/providers/create.svelte b/src/routes/console/project-[project]/messaging/providers/create.svelte index 138f6210b..32d14ecb1 100644 --- a/src/routes/console/project-[project]/messaging/providers/create.svelte +++ b/src/routes/console/project-[project]/messaging/providers/create.svelte @@ -97,7 +97,7 @@ ); break; case Providers.SMTP: - response = await sdk.forProject.messaging.createSMTPProvider( + response = await sdk.forProject.messaging.createSmtpProvider( providerId, $providerParams[$provider].name, $providerParams[$provider].host, @@ -115,7 +115,7 @@ ); break; case Providers.FCM: - response = await sdk.forProject.messaging.createFCMProvider( + response = await sdk.forProject.messaging.createFcmProvider( providerId, $providerParams[$provider].name, JSON.parse($providerParams[$provider].serviceAccountJSON), @@ -123,7 +123,7 @@ ); break; case Providers.APNS: - response = await sdk.forProject.messaging.createAPNSProvider( + response = await sdk.forProject.messaging.createApnsProvider( providerId, $providerParams[$provider].name, $providerParams[$provider].authKey, diff --git a/src/routes/console/project-[project]/messaging/providers/provider-[provider]/updateName.svelte b/src/routes/console/project-[project]/messaging/providers/provider-[provider]/updateName.svelte index 162800477..d52288fff 100644 --- a/src/routes/console/project-[project]/messaging/providers/provider-[provider]/updateName.svelte +++ b/src/routes/console/project-[project]/messaging/providers/provider-[provider]/updateName.svelte @@ -63,7 +63,7 @@ ); break; case Providers.SMTP: - response = await sdk.forProject.messaging.updateSMTPProvider( + response = await sdk.forProject.messaging.updateSmtpProvider( providerId, providerName ); 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..14d14f76c 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 @@ -219,7 +219,7 @@ ); break; case Providers.SMTP: - response = await sdk.forProject.messaging.updateSMTPProvider( + response = await sdk.forProject.messaging.updateSmtpProvider( providerId, undefined, undefined, @@ -232,6 +232,7 @@ undefined, undefined, undefined, + undefined, enabled ); break; diff --git a/src/routes/console/project-[project]/messaging/providers/store.ts b/src/routes/console/project-[project]/messaging/providers/store.ts index f2ef83425..9df85042f 100644 --- a/src/routes/console/project-[project]/messaging/providers/store.ts +++ b/src/routes/console/project-[project]/messaging/providers/store.ts @@ -1,7 +1,7 @@ import type { Column } from '$lib/helpers/types'; import { writable } from 'svelte/store'; import { Providers } from '../provider.svelte'; -import { MessagingProviderType, SMTPEncryption } from '@appwrite.io/console'; +import { MessagingProviderType, Encryption } from '@appwrite.io/console'; export const columns = writable([ { id: '$id', title: 'Provider ID', type: 'string', show: true }, @@ -322,9 +322,9 @@ export const providers: ProvidersMap = { name: 'encryption', type: 'select', options: [ - { label: 'None', value: SMTPEncryption.None }, - { label: 'SSL', value: SMTPEncryption.Ssl }, - { label: 'TLS', value: SMTPEncryption.Tls } + { label: 'None', value: Encryption.None }, + { label: 'SSL', value: Encryption.Ssl }, + { label: 'TLS', value: Encryption.Tls } ] }, { diff --git a/src/routes/console/project-[project]/messaging/providers/update.svelte b/src/routes/console/project-[project]/messaging/providers/update.svelte index 2f6dfb517..82e0f7d4b 100644 --- a/src/routes/console/project-[project]/messaging/providers/update.svelte +++ b/src/routes/console/project-[project]/messaging/providers/update.svelte @@ -96,7 +96,7 @@ ); break; case Providers.SMTP: - response = await sdk.forProject.messaging.updateSMTPProvider( + response = await sdk.forProject.messaging.updateSmtpProvider( providerId, $providerParams[$provider].name, $providerParams[$provider].host, @@ -105,6 +105,7 @@ $providerParams[$provider].password || undefined, $providerParams[$provider].encryption, $providerParams[$provider].autoTLS, + $providerParams[$provider].mailer || undefined, $providerParams[$provider].fromName || undefined, $providerParams[$provider].fromEmail, $providerParams[$provider].replyToName || undefined, 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..b5b8fb1d2 100644 --- a/src/routes/console/project-[project]/messaging/providers/wizard/provider.svelte +++ b/src/routes/console/project-[project]/messaging/providers/wizard/provider.svelte @@ -6,7 +6,7 @@ import { FormList, InputText } from '$lib/elements/forms'; import { Pill } from '$lib/elements'; import { Providers } from '../../provider.svelte'; - import { SMTPEncryption } from '@appwrite.io/console'; + import { Encryption } from '@appwrite.io/console'; let name = ''; let showCustomId = false; @@ -102,7 +102,7 @@ username: '', password: '', autoTLS: true, - encryption: SMTPEncryption.Tls, + encryption: Encryption.Tls, mailer: '', fromEmail: '', fromName: '', diff --git a/src/routes/console/project-[project]/messaging/providers/wizard/store.ts b/src/routes/console/project-[project]/messaging/providers/wizard/store.ts index f6894ad47..764669921 100644 --- a/src/routes/console/project-[project]/messaging/providers/wizard/store.ts +++ b/src/routes/console/project-[project]/messaging/providers/wizard/store.ts @@ -1,6 +1,6 @@ import { writable } from 'svelte/store'; import type { Providers } from '../../provider.svelte'; -import type { MessagingProviderType, SMTPEncryption } from '@appwrite.io/console'; +import type { MessagingProviderType, Encryption } from '@appwrite.io/console'; type ProviderParams = { providerId: string; @@ -73,7 +73,7 @@ export type SMTPProviderParams = ProviderParams & { port: number; username: string; password: string; - encryption: SMTPEncryption; + encryption: Encryption; autoTLS: boolean; mailer: string; }; diff --git a/src/routes/console/project-[project]/messaging/smsPhone.svelte b/src/routes/console/project-[project]/messaging/smsPhone.svelte index dfa2f8261..918b87220 100644 --- a/src/routes/console/project-[project]/messaging/smsPhone.svelte +++ b/src/routes/console/project-[project]/messaging/smsPhone.svelte @@ -12,13 +12,11 @@ } // Get 1st 2 initials, skipping words that don't start with a letter - const initials = words + return words .filter((word) => word.match(/^[a-z]/i)) .map((word) => word[0].toUpperCase()) .slice(0, 2) .join(''); - - return initials; } // Current time as H:MM AM/PM diff --git a/src/routes/console/project-[project]/messaging/topics/store.ts b/src/routes/console/project-[project]/messaging/topics/store.ts index a0f832d2b..742f0a432 100644 --- a/src/routes/console/project-[project]/messaging/topics/store.ts +++ b/src/routes/console/project-[project]/messaging/topics/store.ts @@ -6,6 +6,9 @@ export const showCreate = writable(false); export const columns = writable([ { id: '$id', title: 'Topic ID', type: 'string', show: true, width: 140 }, { id: 'name', title: 'Name', type: 'string', show: true, width: 140 }, - { id: 'total', title: 'Subscribers', type: 'integer', show: true, width: 140 }, + { id: 'emailTotal', title: 'Email Subscribers', type: 'integer', show: false, width: 140 }, + { id: 'smsTotal', title: 'SMS Subscribers', type: 'integer', show: false, width: 140 }, + { id: 'pushTotal', title: 'Push Subscribers', type: 'integer', show: false, width: 140 }, + { id: 'total', title: 'Subscribers', type: 'integer', show: true, filter: false, width: 140 }, { id: '$createdAt', title: 'Created', type: 'datetime', show: true, width: 140 } ]); diff --git a/src/routes/console/project-[project]/messaging/topics/table.svelte b/src/routes/console/project-[project]/messaging/topics/table.svelte index 8118edbf1..8e611a83b 100644 --- a/src/routes/console/project-[project]/messaging/topics/table.svelte +++ b/src/routes/console/project-[project]/messaging/topics/table.svelte @@ -90,6 +90,10 @@ {toLocaleDateTime(topic[column.id])} {/if} + {:else if column.id === 'total'} + + {topic.emailTotal + topic.smsTotal + topic.pushTotal} + {:else} {topic[column.id]} diff --git a/src/routes/console/project-[project]/messaging/topics/topic-[topic]/dangerZone.svelte b/src/routes/console/project-[project]/messaging/topics/topic-[topic]/dangerZone.svelte index 113c2550c..b9a2801bd 100644 --- a/src/routes/console/project-[project]/messaging/topics/topic-[topic]/dangerZone.svelte +++ b/src/routes/console/project-[project]/messaging/topics/topic-[topic]/dangerZone.svelte @@ -11,7 +11,7 @@ import { CardGrid, BoxAvatar, Heading } from '$lib/components'; import { Button } from '$lib/elements/forms'; import { writable } from 'svelte/store'; - import { topic } from './store'; + import { topic, topicTotal } from './store'; import { goto } from '$app/navigation'; import { project } from '$routes/console/project-[project]/store'; import DeleteTopic from './deleteTopic.svelte'; @@ -31,7 +31,7 @@
{$topic.name}

- {$topic.total} subscriber{$topic.total === 1 ? '' : 's'} + {$topicTotal} subscriber{$topicTotal === 1 ? '' : 's'}

diff --git a/src/routes/console/project-[project]/messaging/topics/topic-[topic]/details.svelte b/src/routes/console/project-[project]/messaging/topics/topic-[topic]/details.svelte index 1e81e5044..09e919152 100644 --- a/src/routes/console/project-[project]/messaging/topics/topic-[topic]/details.svelte +++ b/src/routes/console/project-[project]/messaging/topics/topic-[topic]/details.svelte @@ -1,7 +1,7 @@ @@ -11,7 +11,7 @@
-

{$topic.total} subscriber{$topic.total === 1 ? '' : 's'}

+

{$topicTotal} subscriber{$topicTotal === 1 ? '' : 's'}

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

diff --git a/src/routes/console/project-[project]/messaging/topics/topic-[topic]/store.ts b/src/routes/console/project-[project]/messaging/topics/topic-[topic]/store.ts index f569876ff..dec5bf146 100644 --- a/src/routes/console/project-[project]/messaging/topics/topic-[topic]/store.ts +++ b/src/routes/console/project-[project]/messaging/topics/topic-[topic]/store.ts @@ -7,3 +7,7 @@ export const topic = derived( // TODO: Set actual type ($page) => $page.data.topic as Models.Topic ); +export const topicTotal = derived( + topic, + ($topic) => $topic.emailTotal + $topic.smsTotal + $topic.pushTotal +); diff --git a/src/routes/console/project-[project]/messaging/topicsModal.svelte b/src/routes/console/project-[project]/messaging/topicsModal.svelte index 67076a7b3..5de61bada 100644 --- a/src/routes/console/project-[project]/messaging/topicsModal.svelte +++ b/src/routes/console/project-[project]/messaging/topicsModal.svelte @@ -1,10 +1,11 @@ - +

Select existing topics you want to send this message to its subscribers. The message will be sent only to targets. @@ -92,25 +93,35 @@ bind:value={search} /> {#if Object.keys(topicResultsById).length > 0} - {#each Object.entries(topicResultsById) as [topicId, topic]} - onTopicSelection(event, topic)}> - - - - {topic.name} - ({topic.total} subscribers) - - - - {/each} +

+ + {#each Object.entries(topicResultsById) as [topicId, topic]} + + + onTopicSelection(event, topic)}> + + + + + {topic.name} + + + ({getTotal(topic)} subscribers) + + + + + + + {/each} + +
-
+

Total results: {totalResults}

diff --git a/src/routes/console/project-[project]/messaging/userTargetsModal.svelte b/src/routes/console/project-[project]/messaging/userTargetsModal.svelte index b64424fab..c78ddf434 100644 --- a/src/routes/console/project-[project]/messaging/userTargetsModal.svelte +++ b/src/routes/console/project-[project]/messaging/userTargetsModal.svelte @@ -143,7 +143,7 @@ id={userId} disabled={user.targets.length > 0 && user.targets.every((target) => targetsById[target.$id])} - checked={selectedCount > 0 && selectedCount == user.targets.length} + checked={selectedCount > 0 && selectedCount === user.targets.length} on:change={(event) => onUserSelection(event, userId)} /> diff --git a/src/routes/console/project-[project]/messaging/wizard.svelte b/src/routes/console/project-[project]/messaging/wizard.svelte index af3e98968..4fbc93c55 100644 --- a/src/routes/console/project-[project]/messaging/wizard.svelte +++ b/src/routes/console/project-[project]/messaging/wizard.svelte @@ -12,7 +12,7 @@ import { project } from '../store'; import { wizard } from '$lib/stores/wizard'; import { providerType, messageParams, operation } from './wizard/store'; - import { ID, MessageType, MessagingProviderType, type Models } from '@appwrite.io/console'; + import { ID, MessageStatus, MessagingProviderType, type Models } from '@appwrite.io/console'; import { Dependencies } from '$lib/constants'; async function create() { @@ -31,13 +31,14 @@ $messageParams[$providerType].targets, undefined, undefined, + undefined, $messageParams[$providerType].status, $messageParams[$providerType].html, $messageParams[$providerType].scheduledAt ); break; case MessagingProviderType.Sms: - response = await sdk.forProject.messaging.createSMS( + response = await sdk.forProject.messaging.createSms( messageId, $messageParams[$providerType].content, $messageParams[$providerType].topics, @@ -72,6 +73,7 @@ undefined, undefined, undefined, + undefined, $messageParams[$providerType].status, $messageParams[$providerType].scheduledAt ); @@ -81,10 +83,10 @@ wizard.hide(); let message = ''; switch (response.status) { - case MessageType.Draft: + case MessageStatus.Draft: message = 'The message has been saved as draft.'; break; - case MessageType.Processing: + case MessageStatus.Processing: message = 'The message is queued for processing.'; break; case 'scheduled': @@ -137,7 +139,7 @@ ); break; case MessagingProviderType.Sms: - response = await sdk.forProject.messaging.updateSMS( + response = await sdk.forProject.messaging.updateSms( messageId, $messageParams[$providerType].topics, $messageParams[$providerType].users, @@ -172,6 +174,7 @@ undefined, undefined, undefined, + undefined, $messageParams[$providerType].status, $messageParams[$providerType].scheduledAt ); @@ -181,10 +184,10 @@ wizard.hide(); let message = ''; switch (response.status) { - case MessageType.Draft: + case MessageStatus.Draft: message = 'The message has been saved as draft.'; break; - case MessageType.Processing: + case MessageStatus.Processing: message = 'The message is queued for processing.'; break; case 'scheduled': @@ -212,7 +215,7 @@ } async function saveDraft() { - $messageParams[$providerType].status = MessageType.Draft; + $messageParams[$providerType].status = MessageStatus.Draft; if ($operation === 'create') { create(); } else { diff --git a/src/routes/console/project-[project]/messaging/wizard/emailFormList.svelte b/src/routes/console/project-[project]/messaging/wizard/emailFormList.svelte index 220cb5ea3..bcc6be1d6 100644 --- a/src/routes/console/project-[project]/messaging/wizard/emailFormList.svelte +++ b/src/routes/console/project-[project]/messaging/wizard/emailFormList.svelte @@ -13,7 +13,7 @@ import { CustomId, Modal } from '$lib/components'; import { user } from '$lib/stores/user'; import { clickOnEnter } from '$lib/helpers/a11y'; - import { ID, MessageType, MessagingProviderType } from '@appwrite.io/console'; + import { ID, MessageStatus, MessagingProviderType } from '@appwrite.io/console'; import { sdk } from '$lib/stores/sdk'; let showCustomId = false; @@ -35,7 +35,8 @@ $messageParams[MessagingProviderType.Email]?.targets || [], undefined, undefined, - MessageType.Processing, + undefined, + MessageStatus.Processing, $messageParams[MessagingProviderType.Email]?.html || false, undefined ); diff --git a/src/routes/console/project-[project]/messaging/wizard/pushFormList.svelte b/src/routes/console/project-[project]/messaging/wizard/pushFormList.svelte index 35ac68926..53c48900c 100644 --- a/src/routes/console/project-[project]/messaging/wizard/pushFormList.svelte +++ b/src/routes/console/project-[project]/messaging/wizard/pushFormList.svelte @@ -41,7 +41,7 @@ import { CustomId, Modal } from '$lib/components'; import { user } from '$lib/stores/user'; import { clickOnEnter } from '$lib/helpers/a11y'; - import { ID, MessageType, MessagingProviderType } from '@appwrite.io/console'; + import { ID, MessageStatus, MessagingProviderType } from '@appwrite.io/console'; import { sdk } from '$lib/stores/sdk'; import PushPhone from '../pushPhone.svelte'; import { onMount } from 'svelte'; @@ -76,7 +76,7 @@ undefined, undefined, undefined, - MessageType.Processing, + MessageStatus.Processing, undefined ); } diff --git a/src/routes/console/project-[project]/messaging/wizard/smsFormList.svelte b/src/routes/console/project-[project]/messaging/wizard/smsFormList.svelte index 4eaf07ea6..876639a2f 100644 --- a/src/routes/console/project-[project]/messaging/wizard/smsFormList.svelte +++ b/src/routes/console/project-[project]/messaging/wizard/smsFormList.svelte @@ -5,7 +5,7 @@ import { CustomId, Modal } from '$lib/components'; import { user } from '$lib/stores/user'; import { clickOnEnter } from '$lib/helpers/a11y'; - import { ID, MessageType, MessagingProviderType } from '@appwrite.io/console'; + import { ID, MessageStatus, MessagingProviderType } from '@appwrite.io/console'; import { sdk } from '$lib/stores/sdk'; import SMSPhone from '../smsPhone.svelte'; @@ -18,13 +18,13 @@ // const email = selected === 'self' ? $user.email : otherEmail; // TODO: replace with test method - sdk.forProject.messaging.createSMS( + sdk.forProject.messaging.createSms( ID.unique(), $messageParams[MessagingProviderType.Sms]?.content || undefined, $messageParams[MessagingProviderType.Sms]?.topics || [], $messageParams[MessagingProviderType.Sms]?.users || [], $messageParams[MessagingProviderType.Sms]?.targets || [], - MessageType.Processing, + MessageStatus.Processing, undefined ); } diff --git a/src/routes/console/project-[project]/messaging/wizard/step2.svelte b/src/routes/console/project-[project]/messaging/wizard/step2.svelte index 684eb031c..80e62c4fc 100644 --- a/src/routes/console/project-[project]/messaging/wizard/step2.svelte +++ b/src/routes/console/project-[project]/messaging/wizard/step2.svelte @@ -10,7 +10,7 @@ TableRow } from '$lib/elements/table'; import { WizardStep } from '$lib/layout'; - import { messageParams, providerType, targetsById } from './store'; + import { messageParams, providerType, targetsById, getTotal } from './store'; import Actions from '../actions.svelte'; import { topicsById } from '../store'; import type { Models } from '@appwrite.io/console'; @@ -50,8 +50,9 @@ Targets - Select targets to whom this message should be directed. + + Select targets to whom this message should be directed. + {#if targetIdsLength === 0 && topicIdsLength === 0}
@@ -83,12 +84,14 @@
- + + {topic.name} - ({topic.total} subscribers) + + + ({getTotal(topic)} subscribers) +
@@ -109,8 +112,9 @@
- {target.name ? target.name : target.identifier} + + {target.name ? target.name : target.identifier} +
diff --git a/src/routes/console/project-[project]/messaging/wizard/step3.svelte b/src/routes/console/project-[project]/messaging/wizard/step3.svelte index 2d66e5574..ba2e7be3b 100644 --- a/src/routes/console/project-[project]/messaging/wizard/step3.svelte +++ b/src/routes/console/project-[project]/messaging/wizard/step3.svelte @@ -2,7 +2,7 @@ import { Button, FormList, InputDate, InputSelect, InputTime } from '$lib/elements/forms'; import Helper from '$lib/elements/forms/helper.svelte'; import { WizardStep } from '$lib/layout'; - import { MessageType, MessagingProviderType } from '@appwrite.io/console'; + import { MessageStatus, MessagingProviderType } from '@appwrite.io/console'; import { messageParams, providerType } from './store'; let when: 'now' | 'later' = 'now'; @@ -41,9 +41,9 @@ }; async function beforeSubmit() { - $messageParams[$providerType].status = MessageType.Processing; + $messageParams[$providerType].status = MessageStatus.Processing; if (when === 'later') { - $messageParams[$providerType].status = 'scheduled' as MessageType; + $messageParams[$providerType].status = 'scheduled' as MessageStatus; $messageParams[$providerType].scheduledAt = dateTime.toISOString(); } } diff --git a/src/routes/console/project-[project]/messaging/wizard/store.ts b/src/routes/console/project-[project]/messaging/wizard/store.ts index 087acaf76..e710f7278 100644 --- a/src/routes/console/project-[project]/messaging/wizard/store.ts +++ b/src/routes/console/project-[project]/messaging/wizard/store.ts @@ -1,12 +1,12 @@ -import { MessageType, MessagingProviderType, type Models } from '@appwrite.io/console'; -import { writable } from 'svelte/store'; +import { MessageStatus, MessagingProviderType, type Models } from '@appwrite.io/console'; +import { get, writable } from 'svelte/store'; export type MessageParams = { messageId: string; topics: string[]; users: string[]; targets: string[]; - status: MessageType; + status: MessageStatus; scheduledAt?: string; }; @@ -44,3 +44,16 @@ export const messageParams = writable<{ [MessagingProviderType.Sms]: null, [MessagingProviderType.Push]: null }); + +export function getTotal(topic: Models.Topic): number { + switch (get(providerType)) { + case 'email': + return topic.emailTotal; + case 'sms': + return topic.smsTotal; + case 'push': + return topic.pushTotal; + default: + return 0; + } +} diff --git a/src/routes/mfa/+page.svelte b/src/routes/mfa/+page.svelte index b7a82d8d9..1e804f5d4 100644 --- a/src/routes/mfa/+page.svelte +++ b/src/routes/mfa/+page.svelte @@ -8,7 +8,7 @@ import { Dependencies } from '$lib/constants'; import { Submit, trackEvent, trackError } from '$lib/actions/analytics'; import { page } from '$app/stores'; - import { AuthenticatorProvider } from '@appwrite.io/console'; + import { AuthenticationFactor } from '@appwrite.io/console'; import InputDigits from '$lib/elements/forms/inputDigits.svelte'; let code: string, disabled: boolean; @@ -16,8 +16,8 @@ async function verify() { try { disabled = true; - const challenge = await sdk.forConsole.account.createChallenge( - AuthenticatorProvider.Totp + const challenge = await sdk.forConsole.account.create2FAChallenge( + AuthenticationFactor.Totp ); await sdk.forConsole.account.updateChallenge(challenge.$id, code); await invalidate(Dependencies.ACCOUNT);