From 922773026964f3f549ca45db1a9f92a14ff19afa Mon Sep 17 00:00:00 2001 From: Jake Barnby Date: Sun, 25 Feb 2024 00:37:06 +1300 Subject: [PATCH 1/3] Update SDK --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index bc4a0b358..3cb51c8c5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6,7 +6,7 @@ "": { "name": "@appwrite/console", "dependencies": { - "@appwrite.io/console": "^0.6.0-rc.12", + "@appwrite.io/console": "^0.6.0-rc.13", "@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.12", - "resolved": "https://registry.npmjs.org/@appwrite.io/console/-/console-0.6.0-rc.12.tgz", - "integrity": "sha512-pDov75TCkBmJdUPrWuzRW7uM28HYqiMFtVFrUoavDd/lMPBS7RnPXL4sBHsGY8AUldHE3oBcGVPkNoQfEAgLlw==", + "version": "0.6.0-rc.13", + "resolved": "https://registry.npmjs.org/@appwrite.io/console/-/console-0.6.0-rc.13.tgz", + "integrity": "sha512-/c+HGkqdqWjjlzVgOmC6vb4t2jsHgbmX/aaDLoQHXFmaakEDWzK1cgVYRHoU3o14xIEpBupteh3KzOoqdLvvsQ==", "dependencies": { "cross-fetch": "3.1.5", "isomorphic-form-data": "2.0.0" diff --git a/package.json b/package.json index 0d826dea2..07f589ab2 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "e2e": "playwright test tests/e2e" }, "dependencies": { - "@appwrite.io/console": "^0.6.0-rc.12", + "@appwrite.io/console": "^0.6.0-rc.13", "@appwrite.io/pink": "0.4.0", "@appwrite.io/pink-icons": "0.4.0", "@popperjs/core": "^2.11.8", From 082ce65b5626018c20fd18c0865fdce0aeb14b21 Mon Sep 17 00:00:00 2001 From: Jake Barnby Date: Sun, 25 Feb 2024 01:22:47 +1300 Subject: [PATCH 2/3] Allow setting sandbox mode for APNS --- .../messaging/providers/create.svelte | 1 + .../provider-[provider]/updateName.svelte | 4 ++-- .../provider-[provider]/updateStatus.svelte | 7 ++++--- .../messaging/providers/store.ts | 16 +++++++++++----- .../messaging/providers/update.svelte | 7 ++++--- .../messaging/providers/wizard/provider.svelte | 7 ++++--- .../messaging/providers/wizard/store.ts | 5 +++-- src/routes/login/+page.svelte | 6 ++++-- src/routes/mfa/+page.svelte | 2 +- src/routes/register/+page.svelte | 6 ++++-- 10 files changed, 38 insertions(+), 23 deletions(-) diff --git a/src/routes/console/project-[project]/messaging/providers/create.svelte b/src/routes/console/project-[project]/messaging/providers/create.svelte index 32d14ecb1..9b814ffb0 100644 --- a/src/routes/console/project-[project]/messaging/providers/create.svelte +++ b/src/routes/console/project-[project]/messaging/providers/create.svelte @@ -130,6 +130,7 @@ $providerParams[$provider].authKeyId, $providerParams[$provider].teamId, $providerParams[$provider].bundleId, + $providerParams[$provider].sandbox, $providerParams[$provider].enabled ); break; 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 d52288fff..93991d10e 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 @@ -69,13 +69,13 @@ ); break; case Providers.FCM: - response = await sdk.forProject.messaging.updateFCMProvider( + response = await sdk.forProject.messaging.updateFcmProvider( providerId, providerName ); break; case Providers.APNS: - response = await sdk.forProject.messaging.updateAPNSProvider( + response = await sdk.forProject.messaging.updateApnsProvider( 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 14d14f76c..03f9d6cc1 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 @@ -153,7 +153,8 @@ authKey: $provider.credentials['authKey'], authKeyId: $provider.credentials['authKeyId'], teamId: $provider.credentials['teamId'], - bundleId: $provider.credentials['bundleId'] + bundleId: $provider.credentials['bundleId'], + sandbox: $provider.options['sandbox'] }; break; } @@ -237,14 +238,14 @@ ); break; case Providers.FCM: - response = await sdk.forProject.messaging.updateFCMProvider( + response = await sdk.forProject.messaging.updateFcmProvider( providerId, undefined, enabled ); break; case Providers.APNS: - response = await sdk.forProject.messaging.updateAPNSProvider( + response = await sdk.forProject.messaging.updateApnsProvider( providerId, undefined, enabled diff --git a/src/routes/console/project-[project]/messaging/providers/store.ts b/src/routes/console/project-[project]/messaging/providers/store.ts index c93e5f445..cff54b4d9 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, Encryption } from '@appwrite.io/console'; +import { MessagingProviderType, SmtpEncryption } from '@appwrite.io/console'; export const columns = writable([ { id: '$id', title: 'Provider ID', type: 'string', show: true }, @@ -142,7 +142,13 @@ export const providers: ProvidersMap = { 'Head to Apple Developer Member Center (under Program resources) -> Certificates, Identifiers & Profiles -> Keys.', 'Create a key and give it a name. Enable the Apple Push Notifications service (APNS), and register your key.' ] - } + }, + { + label: "Sandbox", + name: "sandbox", + type: "switch", + description: "Use the development APNS server." + }, ] } // [Providers.MQTT]: { @@ -328,9 +334,9 @@ export const providers: ProvidersMap = { name: 'encryption', type: 'select', options: [ - { label: 'None', value: Encryption.None }, - { label: 'SSL', value: Encryption.Ssl }, - { label: 'TLS', value: Encryption.Tls } + { label: 'None', value: SmtpEncryption.None }, + { label: 'SSL', value: SmtpEncryption.Ssl }, + { label: 'TLS', value: SmtpEncryption.Tls } ] }, { diff --git a/src/routes/console/project-[project]/messaging/providers/update.svelte b/src/routes/console/project-[project]/messaging/providers/update.svelte index 82e0f7d4b..4ec2896b4 100644 --- a/src/routes/console/project-[project]/messaging/providers/update.svelte +++ b/src/routes/console/project-[project]/messaging/providers/update.svelte @@ -114,7 +114,7 @@ ); break; case Providers.FCM: - response = await sdk.forProject.messaging.updateFCMProvider( + response = await sdk.forProject.messaging.updateFcmProvider( providerId, $providerParams[$provider].name, $providerParams[$provider].enabled, @@ -122,14 +122,15 @@ ); break; case Providers.APNS: - response = await sdk.forProject.messaging.updateAPNSProvider( + response = await sdk.forProject.messaging.updateApnsProvider( providerId, $providerParams[$provider].name, $providerParams[$provider].enabled, $providerParams[$provider].authKey, $providerParams[$provider].authKeyId, $providerParams[$provider].teamId, - $providerParams[$provider].bundleId + $providerParams[$provider].bundleId, + $providerParams[$provider].sandbox ); break; } 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 b5b8fb1d2..d5e494991 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 { Encryption } from '@appwrite.io/console'; + import { SmtpEncryption } from '@appwrite.io/console'; let name = ''; let showCustomId = false; @@ -102,7 +102,7 @@ username: '', password: '', autoTLS: true, - encryption: Encryption.Tls, + encryption: SmtpEncryption.Tls, mailer: '', fromEmail: '', fromName: '', @@ -126,7 +126,8 @@ authKey: '', authKeyId: '', teamId: '', - bundleId: '' + bundleId: '', + sandbox: false }; break; } 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 764669921..4ea4d8c4d 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, Encryption } from '@appwrite.io/console'; +import type { MessagingProviderType, SmtpEncryption } from '@appwrite.io/console'; type ProviderParams = { providerId: string; @@ -73,7 +73,7 @@ export type SMTPProviderParams = ProviderParams & { port: number; username: string; password: string; - encryption: Encryption; + encryption: SmtpEncryption; autoTLS: boolean; mailer: string; }; @@ -91,6 +91,7 @@ export type APNSProviderParams = ProviderParams & { authKeyId: string; teamId: string; bundleId: string; + sandbox: boolean; }; export type MQTTProviderParams = ProviderParams & { diff --git a/src/routes/login/+page.svelte b/src/routes/login/+page.svelte index 4d49845ae..0ea1f7dba 100644 --- a/src/routes/login/+page.svelte +++ b/src/routes/login/+page.svelte @@ -75,8 +75,10 @@ OAuthProvider.Github, window.location.origin + url, window.location.origin, - undefined, - ['read:user', 'user:email'] + [ + 'read:user', + 'user:email' + ] ); } diff --git a/src/routes/mfa/+page.svelte b/src/routes/mfa/+page.svelte index 1e804f5d4..eedc50900 100644 --- a/src/routes/mfa/+page.svelte +++ b/src/routes/mfa/+page.svelte @@ -16,7 +16,7 @@ async function verify() { try { disabled = true; - const challenge = await sdk.forConsole.account.create2FAChallenge( + const challenge = await sdk.forConsole.account.createChallenge( AuthenticationFactor.Totp ); await sdk.forConsole.account.updateChallenge(challenge.$id, code); diff --git a/src/routes/register/+page.svelte b/src/routes/register/+page.svelte index 5344cea31..46587b1e0 100644 --- a/src/routes/register/+page.svelte +++ b/src/routes/register/+page.svelte @@ -64,8 +64,10 @@ OAuthProvider.Github, window.location.origin, window.location.origin, - undefined, - ['read:user', 'user:email'] + [ + 'read:user', + 'user:email' + ] ); } From 73f9fc526b73b4a2be9396d0568a24f4cab7818e Mon Sep 17 00:00:00 2001 From: Jake Barnby Date: Sun, 25 Feb 2024 01:41:54 +1300 Subject: [PATCH 3/3] Lint --- .../project-[project]/messaging/providers/store.ts | 10 +++++----- src/routes/login/+page.svelte | 5 +---- src/routes/register/+page.svelte | 5 +---- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/src/routes/console/project-[project]/messaging/providers/store.ts b/src/routes/console/project-[project]/messaging/providers/store.ts index cff54b4d9..a81a48488 100644 --- a/src/routes/console/project-[project]/messaging/providers/store.ts +++ b/src/routes/console/project-[project]/messaging/providers/store.ts @@ -144,11 +144,11 @@ export const providers: ProvidersMap = { ] }, { - label: "Sandbox", - name: "sandbox", - type: "switch", - description: "Use the development APNS server." - }, + label: 'Sandbox', + name: 'sandbox', + type: 'switch', + description: 'Use the development APNS server.' + } ] } // [Providers.MQTT]: { diff --git a/src/routes/login/+page.svelte b/src/routes/login/+page.svelte index 0ea1f7dba..e60e5811b 100644 --- a/src/routes/login/+page.svelte +++ b/src/routes/login/+page.svelte @@ -75,10 +75,7 @@ OAuthProvider.Github, window.location.origin + url, window.location.origin, - [ - 'read:user', - 'user:email' - ] + ['read:user', 'user:email'] ); } diff --git a/src/routes/register/+page.svelte b/src/routes/register/+page.svelte index 46587b1e0..ccc179174 100644 --- a/src/routes/register/+page.svelte +++ b/src/routes/register/+page.svelte @@ -64,10 +64,7 @@ OAuthProvider.Github, window.location.origin, window.location.origin, - [ - 'read:user', - 'user:email' - ] + ['read:user', 'user:email'] ); }