From 869cfdb7965cc7413a476d9979e7f37cfdc2fd21 Mon Sep 17 00:00:00 2001
From: Torsten Dittmann <torsten.dittmann@googlemail.com>
Date: Mon, 7 Nov 2022 11:51:37 +0100
Subject: [PATCH] fix: domains creation

---
 .../settings/domains/wizard/cnameTable.svelte |  8 +++---
 .../settings/domains/wizard/step1.svelte      | 26 ++++---------------
 .../settings/domains/wizard/step4.svelte      |  2 +-
 .../settings/domains/wizard/store.ts          |  3 ++-
 .../domains/wizard/verificationBox.svelte     |  2 +-
 5 files changed, 13 insertions(+), 28 deletions(-)

diff --git a/src/routes/console/project-[project]/settings/domains/wizard/cnameTable.svelte b/src/routes/console/project-[project]/settings/domains/wizard/cnameTable.svelte
index 0c5d31bf0..316fef1b5 100644
--- a/src/routes/console/project-[project]/settings/domains/wizard/cnameTable.svelte
+++ b/src/routes/console/project-[project]/settings/domains/wizard/cnameTable.svelte
@@ -11,9 +11,9 @@
     } from '$lib/elements/table';
     import { domain } from './store';
 
-    const parts = $domain.name.split('.');
+    const parts = $domain.domain.split('.');
     const registerable = [parts[parts.length - 2], parts[parts.length - 1]].join('.');
-    const cnameValue = $domain.name.replace('.' + registerable, '');
+    const cnameValue = $domain.domain.replace('.' + registerable, '');
 </script>
 
 <Table noStyles noMargin>
@@ -28,8 +28,8 @@
             <TableCellText title="Name">{cnameValue}</TableCellText>
             <TableCell title="Value">
                 <div class="u-flex u-main-space-between u-cross-center">
-                    <span class="text">{$domain.name}</span>
-                    <Copy value={$domain.name}>
+                    <span class="text">{$domain.domain}</span>
+                    <Copy value={$domain.domain}>
                         <span class="icon-duplicate" aria-hidden="true" />
                     </Copy>
                 </div>
diff --git a/src/routes/console/project-[project]/settings/domains/wizard/step1.svelte b/src/routes/console/project-[project]/settings/domains/wizard/step1.svelte
index 21ee2bbf6..76b46f176 100644
--- a/src/routes/console/project-[project]/settings/domains/wizard/step1.svelte
+++ b/src/routes/console/project-[project]/settings/domains/wizard/step1.svelte
@@ -5,30 +5,14 @@
     import { project } from '../../../store';
     import { domain } from './store';
 
-    // Handle if user goes back to this step to update
-    // the domain name after creating the domain
-    const originalDomainName = $domain.name;
-    const originalDomainId = $domain.id;
-    const unsubscribe = domain.subscribe((newDomain) => {
-        if (
-            originalDomainName !== '' &&
-            newDomain.id !== '' &&
-            newDomain.name !== originalDomainName
-        ) {
-            $domain.id = '';
-        }
-    });
-
     const projectId = $project.$id;
     const createDomain = async () => {
-        unsubscribe();
-        if ($domain.name !== originalDomainName && originalDomainId) {
-            await sdkForConsole.projects.deleteDomain(projectId, originalDomainId);
+        if ($domain.$id) {
+            await sdkForConsole.projects.deleteDomain(projectId, $domain.$id);
         }
 
-        if ($domain.id == '') {
-            await sdkForConsole.projects.createDomain(projectId, $domain.name);
-        }
+        const { $id } = await sdkForConsole.projects.createDomain(projectId, $domain.domain);
+        $domain.$id = $id;
     };
 </script>
 
@@ -45,7 +29,7 @@
             placeholder="appwrite.example.com"
             autocomplete={false}
             required
-            bind:value={$domain.name} />
+            bind:value={$domain.domain} />
     </FormList>
     <div class="common-section ">
         <p>
diff --git a/src/routes/console/project-[project]/settings/domains/wizard/step4.svelte b/src/routes/console/project-[project]/settings/domains/wizard/step4.svelte
index eed0a85ac..0ab0e0b98 100644
--- a/src/routes/console/project-[project]/settings/domains/wizard/step4.svelte
+++ b/src/routes/console/project-[project]/settings/domains/wizard/step4.svelte
@@ -11,7 +11,7 @@
     let certificate = false;
     const checkCertificate = () => {
         setTimeout(async () => {
-            const result = await sdkForConsole.projects.getDomain(projectId, $domain.id);
+            const result = await sdkForConsole.projects.getDomain(projectId, $domain.$id);
             if (!result.certificateId) {
                 checkCertificate();
                 return;
diff --git a/src/routes/console/project-[project]/settings/domains/wizard/store.ts b/src/routes/console/project-[project]/settings/domains/wizard/store.ts
index 88d0de932..9c2d5d8d4 100644
--- a/src/routes/console/project-[project]/settings/domains/wizard/store.ts
+++ b/src/routes/console/project-[project]/settings/domains/wizard/store.ts
@@ -1,3 +1,4 @@
+import type { Models } from '@aw-labs/appwrite-console';
 import { writable } from 'svelte/store';
 
-export const domain = writable<{ id: string; name: string }>({ id: '', name: '' });
+export const domain = writable<Partial<Models.Domain>>({ $id: '', domain: '' });
diff --git a/src/routes/console/project-[project]/settings/domains/wizard/verificationBox.svelte b/src/routes/console/project-[project]/settings/domains/wizard/verificationBox.svelte
index 0cd32690f..e82bccf69 100644
--- a/src/routes/console/project-[project]/settings/domains/wizard/verificationBox.svelte
+++ b/src/routes/console/project-[project]/settings/domains/wizard/verificationBox.svelte
@@ -15,7 +15,7 @@
         try {
             const result = await sdkForConsole.projects.updateDomainVerification(
                 projectId,
-                $domain.id
+                $domain.$id
             );
             isVerified = result.verification;
         } catch (error) {