From 8dcb8ed967cdfe4aab69c7c0072f0e33a500e0b7 Mon Sep 17 00:00:00 2001
From: Steven Nguyen <stnguyen90@users.noreply.github.com>
Date: Fri, 9 Feb 2024 07:51:34 -0800
Subject: [PATCH 1/2] Temp fixes for svelte diagnostic errors

We need a temp fix because the SDK hasn't been updated yet.
Once the SDK is updated, we can properly apply fixes.
---
 .../createProjectCloud.svelte                 |  5 +++--
 .../auth/templates/+page.svelte               | 15 +++++++++++--
 .../auth/templates/emailTemplate.svelte       | 21 ++++++++++---------
 .../auth/templates/resetEmail.svelte          |  6 ++++--
 .../auth/templates/resetSms.svelte            |  6 ++++--
 .../auth/templates/smsTemplate.svelte         |  6 ++++--
 6 files changed, 39 insertions(+), 20 deletions(-)

diff --git a/src/routes/console/organization-[organization]/createProjectCloud.svelte b/src/routes/console/organization-[organization]/createProjectCloud.svelte
index 4c228c28e2..b63acf97f2 100644
--- a/src/routes/console/organization-[organization]/createProjectCloud.svelte
+++ b/src/routes/console/organization-[organization]/createProjectCloud.svelte
@@ -10,7 +10,7 @@
     import { Dependencies } from '$lib/constants';
     import { page } from '$app/stores';
     import { Submit, trackEvent, trackError } from '$lib/actions/analytics';
-    import { ID } from '@appwrite.io/console';
+    import { ID, Region } from '@appwrite.io/console';
     import { createProject } from './wizard/store';
     import { wizard } from '$lib/stores/wizard';
 
@@ -22,11 +22,12 @@
 
     async function create() {
         try {
+            // TODO: fix typing once SDK is updated
             const project = await sdk.forConsole.projects.create(
                 $createProject?.id ?? ID.unique(),
                 $createProject.name,
                 teamId,
-                $createProject.region
+                $createProject.region as Region
             );
             trackEvent(Submit.ProjectCreate, {
                 customId: !!$createProject?.id,
diff --git a/src/routes/console/project-[project]/auth/templates/+page.svelte b/src/routes/console/project-[project]/auth/templates/+page.svelte
index 6d686d8832..4b20cb34d5 100644
--- a/src/routes/console/project-[project]/auth/templates/+page.svelte
+++ b/src/routes/console/project-[project]/auth/templates/+page.svelte
@@ -1,7 +1,12 @@
 <script context="module" lang="ts">
     export async function loadEmailTemplate(projectId: string, type: string, locale: string) {
         try {
-            return await sdk.forConsole.projects.getEmailTemplate(projectId, type, locale);
+            // TODO: fix TemplateType and TemplateLocale typing once SDK is updated
+            return await sdk.forConsole.projects.getEmailTemplate(
+                projectId,
+                type as TemplateType,
+                locale as TemplateLocale
+            );
         } catch (e) {
             addNotification({
                 type: 'error',
@@ -11,7 +16,12 @@
     }
     export async function loadSmsTemplate(projectId: string, type: string, locale: string) {
         try {
-            return await sdk.forConsole.projects.getSmsTemplate(projectId, type, locale);
+            // TODO: fix TemplateType and TemplateLocale typing once SDK is updated
+            return await sdk.forConsole.projects.getSmsTemplate(
+                projectId,
+                type as TemplateType,
+                locale as TemplateLocale
+            );
         } catch (e) {
             addNotification({
                 type: 'error',
@@ -44,6 +54,7 @@
     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';
 
     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 4e7a0186d8..c8c481ebe8 100644
--- a/src/routes/console/project-[project]/auth/templates/emailTemplate.svelte
+++ b/src/routes/console/project-[project]/auth/templates/emailTemplate.svelte
@@ -15,8 +15,7 @@
     import deepEqual from 'deep-equal';
     import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
     import { Box } from '$lib/components';
-    import { TemplateLocale, TemplateType } from '@appwrite.io/console';
-    import { isValueOfStringEnum } from '$lib/helpers/types';
+    import type { TemplateLocale, TemplateType } from '@appwrite.io/console';
 
     export let loading = false;
     let openResetModal = false;
@@ -32,12 +31,13 @@
             return;
         }
 
-        if (!isValueOfStringEnum(TemplateType, $emailTemplate.type)) {
-            throw new Error(`Invalid template type: ${$emailTemplate.type}`);
-        }
-        if (!isValueOfStringEnum(TemplateLocale, $emailTemplate.locale)) {
-            throw new Error(`Invalid template locale: ${$emailTemplate.locale}`);
-        }
+        // TODO: uncomment after SDK is updated
+        // if (!isValueOfStringEnum(TemplateType, $emailTemplate.type)) {
+        //     throw new Error(`Invalid template type: ${$emailTemplate.type}`);
+        // }
+        // if (!isValueOfStringEnum(TemplateLocale, $emailTemplate.locale)) {
+        //     throw new Error(`Invalid template locale: ${$emailTemplate.locale}`);
+        // }
         try {
             switch ($emailTemplate.type) {
                 case 'invitation':
@@ -53,10 +53,11 @@
                     eventType = Submit.EmailUpdateVerificationTemplate;
                     break;
             }
+            // TODO: fix TemplateType and TemplateLocale typing once SDK is updated
             await sdk.forConsole.projects.updateEmailTemplate(
                 $project.$id,
-                $emailTemplate.type ? $emailTemplate.type : undefined,
-                $emailTemplate.locale ? $emailTemplate.locale : undefined,
+                $emailTemplate.type ? ($emailTemplate.type as TemplateType) : undefined,
+                $emailTemplate.locale ? ($emailTemplate.locale as TemplateLocale) : 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 a62df21dee..0708472050 100644
--- a/src/routes/console/project-[project]/auth/templates/resetEmail.svelte
+++ b/src/routes/console/project-[project]/auth/templates/resetEmail.svelte
@@ -4,6 +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 { project } from '../../store';
     import { loadEmailTemplate } from './+page.svelte';
     import { baseEmailTemplate, emailTemplate } from './store';
@@ -14,10 +15,11 @@
 
     async function reset() {
         try {
+            // TODO: fix TemplateType and TemplateLocale typing once SDK is updated
             await sdk.forConsole.projects.deleteEmailTemplate(
                 $project.$id,
-                $emailTemplate.type,
-                $emailTemplate.locale
+                $emailTemplate.type as TemplateType,
+                $emailTemplate.locale as TemplateLocale
             );
             $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 ed91fd01bc..dc449b1fa8 100644
--- a/src/routes/console/project-[project]/auth/templates/resetSms.svelte
+++ b/src/routes/console/project-[project]/auth/templates/resetSms.svelte
@@ -3,6 +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 { project } from '../../store';
     import { loadSmsTemplate } from './+page.svelte';
     import { baseSmsTemplate, smsTemplate } from './store';
@@ -13,10 +14,11 @@
 
     async function reset() {
         try {
+            // TODO: fix TemplateType and TemplateLocale typing once SDK is updated
             await sdk.forConsole.projects.deleteSmsTemplate(
                 $project.$id,
-                $smsTemplate.type,
-                $smsTemplate.locale
+                $smsTemplate.type as TemplateType,
+                $smsTemplate.locale as TemplateLocale
             );
 
             $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 6a955f0172..52551d004c 100644
--- a/src/routes/console/project-[project]/auth/templates/smsTemplate.svelte
+++ b/src/routes/console/project-[project]/auth/templates/smsTemplate.svelte
@@ -8,6 +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';
 
     export let loading = false;
     const projectId = $page.params.project;
@@ -35,10 +36,11 @@
                     eventType = Submit.SmsUpdateVerificationTemplate;
                     break;
             }
+            // TODO: fix TemplateType and TemplateLocale typing once SDK is updated
             await sdk.forConsole.projects.updateSmsTemplate(
                 projectId,
-                $smsTemplate.type,
-                $smsTemplate.locale,
+                $smsTemplate.type as TemplateType,
+                $smsTemplate.locale as TemplateLocale,
                 $smsTemplate.message
             );
 

From 51f9442fc0e7732f1ca3c37617aad1af739311fa Mon Sep 17 00:00:00 2001
From: Steven Nguyen <stnguyen90@users.noreply.github.com>
Date: Fri, 9 Feb 2024 07:59:04 -0800
Subject: [PATCH 2/2] Fix lint errors

---
 .../providers/provider-[provider]/updateStatus.svelte        | 5 +++--
 src/routes/mfa/+page.svelte                                  | 4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)

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 58abac2208..1bd4c4536a 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
@@ -133,14 +133,15 @@
                 $providerParams[$wizardProvider] = {
                     providerId: $provider.$id,
                     name: $provider.name,
-                    enabled: $provider.enabled,
+                    enabled: $provider.enabled
                 };
                 if ('serviceAccountJSON' in $provider.credentials) {
                     const serviceAccountJSON = $provider.credentials['serviceAccountJSON'];
                     if (typeof serviceAccountJSON === 'string') {
                         $providerParams[$wizardProvider].serviceAccountJSON = serviceAccountJSON;
                     } else if (serviceAccountJSON instanceof Object) {
-                        $providerParams[$wizardProvider].serviceAccountJSON = JSON.stringify(serviceAccountJSON);
+                        $providerParams[$wizardProvider].serviceAccountJSON =
+                            JSON.stringify(serviceAccountJSON);
                     }
                 }
                 break;
diff --git a/src/routes/mfa/+page.svelte b/src/routes/mfa/+page.svelte
index a861465148..26a0a61de2 100644
--- a/src/routes/mfa/+page.svelte
+++ b/src/routes/mfa/+page.svelte
@@ -15,7 +15,9 @@
     async function verify() {
         try {
             disabled = true;
-            const challenge = await sdk.forConsole.account.createChallenge(AuthenticatorProvider.Totp);
+            const challenge = await sdk.forConsole.account.createChallenge(
+                AuthenticatorProvider.Totp
+            );
             await sdk.forConsole.account.updateChallenge(challenge.$id, code);
             await invalidate(Dependencies.ACCOUNT);
             trackEvent(Submit.AccountCreate);