From 18de91db4d949fd532b79255c9f902dfd4635de4 Mon Sep 17 00:00:00 2001 From: Khushboo Verma Date: Wed, 24 Sep 2025 11:56:43 +0530 Subject: [PATCH] Create and verify domain in background --- .../domains/add-domain/+page.svelte | 21 +++---- .../add-domain/verify-[domain]/+page.svelte | 56 +++++++++---------- .../settings/domains/add-domain/+page.svelte | 21 +++---- .../add-domain/verify-[domain]/+page.svelte | 56 +++++++++---------- .../domains/add-domain/+page.svelte | 21 +++---- .../add-domain/verify-[domain]/+page.svelte | 56 +++++++++---------- 6 files changed, 114 insertions(+), 117 deletions(-) diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/+page.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/+page.svelte index 02be4e3d1..4ae4fd15a 100644 --- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/+page.svelte @@ -51,14 +51,17 @@ let domain: Models.Domain; if (isCloud && apexDomain) { - try { - domain = await sdk.forConsole.domains.create({ + sdk.forConsole.domains + .create({ teamId: $project.teamId, domain: apexDomain + }) + .then((createdDomain) => { + domain = createdDomain; + }) + .catch(() => { + // Empty as domain creation error needs to be silent }); - } catch (error) { - // Empty as domain creation error needs to be silent - } } try { @@ -92,12 +95,10 @@ if (rule?.status === 'verified') { await goto(routeBase); await invalidate(Dependencies.FUNCTION_DOMAINS); - if (isCloud) { - try { - await sdk.forConsole.domains.updateNameservers({ domainId: domain.$id }); - } catch (error) { + if (isCloud && domain) { + sdk.forConsole.domains.updateNameservers({ domainId: domain.$id }).catch(() => { // Empty as domain update error needs to be silent - } + }); } } else { await goto(`${routeBase}/add-domain/verify-${domainName}?rule=${rule.$id}`); diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/verify-[domain]/+page.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/verify-[domain]/+page.svelte index 8fae59c1f..af211f5d5 100644 --- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/verify-[domain]/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/verify-[domain]/+page.svelte @@ -52,38 +52,36 @@ if (isCloud) { const apexDomain = getApexDomain(data.proxyRule.domain); if (apexDomain) { - try { - const domainData = await sdk.forConsole.domains.create({ + sdk.forConsole.domains + .create({ teamId: $organization.$id, domain: apexDomain - }); - verified = domainData.nameservers.toLowerCase() === 'appwrite'; - if (!verified) { - throw new Error( - 'Domain verification failed. Please check your domain settings or try again later' - ); - } - } catch (error) { - // Empty as domain creation error needs to be silent - } - - try { - const domain = data.domainsList.domains.find( - (d: Models.Domain) => d.domain === apexDomain - ); - if (domain) { - const output = await sdk.forConsole.domains.updateNameservers({ - domainId: domain.$id - }); - verified = output.nameservers.toLowerCase() === 'appwrite'; - if (!verified) { - throw new Error( - 'Domain verification failed. Please check your domain settings or try again later' - ); + }) + .then((domainData) => { + if (domainData.nameservers.toLowerCase() === 'appwrite') { + verified = true; } - } - } catch (error) { - // Empty as domain update error needs to be silent + }) + .catch(() => { + // Empty as domain creation error needs to be silent + }); + + const domain = data.domainsList.domains.find( + (d: Models.Domain) => d.domain === apexDomain + ); + if (domain) { + sdk.forConsole.domains + .updateNameservers({ + domainId: domain.$id + }) + .then((output) => { + if (output.nameservers.toLowerCase() === 'appwrite') { + verified = true; + } + }) + .catch(() => { + // Empty as domain update error needs to be silent + }); } } } diff --git a/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/+page.svelte b/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/+page.svelte index 7d1fe9553..634f74a22 100644 --- a/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/+page.svelte @@ -31,14 +31,17 @@ let domain: Models.Domain; if (isCloud && apexDomain) { - try { - domain = await sdk.forConsole.domains.create({ + sdk.forConsole.domains + .create({ teamId: $project.teamId, domain: apexDomain + }) + .then((createdDomain) => { + domain = createdDomain; + }) + .catch(() => { + // Empty as domain creation error needs to be silent }); - } catch (error) { - // Empty as domain creation error needs to be silent - } } try { @@ -48,12 +51,10 @@ if (rule?.status === 'verified') { await goto(routeBase); await invalidate(Dependencies.DOMAINS); - if (isCloud) { - try { - await sdk.forConsole.domains.updateNameservers({ domainId: domain.$id }); - } catch (error) { + if (isCloud && domain) { + sdk.forConsole.domains.updateNameservers({ domainId: domain.$id }).catch(() => { // Empty as domain update error needs to be silent - } + }); } } else { await goto(`${routeBase}/add-domain/verify-${domainName}?rule=${rule.$id}`); diff --git a/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/verify-[domain]/+page.svelte b/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/verify-[domain]/+page.svelte index cfe52b08d..3695f3a4d 100644 --- a/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/verify-[domain]/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/verify-[domain]/+page.svelte @@ -54,38 +54,36 @@ const apexDomain = getApexDomain(data.proxyRule.domain); console.log('apexDomain', apexDomain); if (apexDomain) { - try { - const domainData = await sdk.forConsole.domains.create({ + sdk.forConsole.domains + .create({ teamId: $organization.$id, domain: apexDomain - }); - verified = domainData.nameservers.toLowerCase() === 'appwrite'; - if (!verified) { - throw new Error( - 'Domain verification failed. Please check your domain settings or try again later' - ); - } - } catch (error) { - // Empty as domain creation error needs to be silent - } - - try { - const domain = data.domainsList.domains.find( - (d: Models.Domain) => d.domain === apexDomain - ); - if (domain) { - const output = await sdk.forConsole.domains.updateNameservers({ - domainId: domain.$id - }); - verified = output.nameservers.toLowerCase() === 'appwrite'; - if (!verified) { - throw new Error( - 'Domain verification failed. Please check your domain settings or try again later' - ); + }) + .then((domainData) => { + if (domainData.nameservers.toLowerCase() === 'appwrite') { + verified = true; } - } - } catch (error) { - // Empty as domain update error needs to be silent + }) + .catch(() => { + // Empty as domain creation error needs to be silent + }); + + const domain = data.domainsList.domains.find( + (d: Models.Domain) => d.domain === apexDomain + ); + if (domain) { + sdk.forConsole.domains + .updateNameservers({ + domainId: domain.$id + }) + .then((output) => { + if (output.nameservers.toLowerCase() === 'appwrite') { + verified = true; + } + }) + .catch(() => { + // Empty as domain update error needs to be silent + }); } } } diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/+page.svelte index 133bb49da..07430eb9d 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/+page.svelte @@ -61,14 +61,17 @@ const isSiteDomain = domainName.endsWith($regionalConsoleVariables._APP_DOMAIN_SITES); if (isCloud && apexDomain && !isSiteDomain) { - try { - domain = await sdk.forConsole.domains.create({ + sdk.forConsole.domains + .create({ teamId: $project.teamId, domain: apexDomain + }) + .then((createdDomain) => { + domain = createdDomain; + }) + .catch(() => { + // Empty as domain creation error needs to be silent }); - } catch (error) { - // Empty as domain creation error needs to be silent - } } try { @@ -102,12 +105,10 @@ if (rule?.status === 'verified') { await goto(routeBase); await invalidate(Dependencies.SITES_DOMAINS); - if (isCloud) { - try { - await sdk.forConsole.domains.updateNameservers({ domainId: domain.$id }); - } catch (error) { + if (isCloud && domain) { + sdk.forConsole.domains.updateNameservers({ domainId: domain.$id }).catch(() => { // Empty as domain update error needs to be silent - } + }); } } else { await goto(`${routeBase}/add-domain/verify-${domainName}?rule=${rule.$id}`); diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.svelte index 00c96cf0b..e100d8084 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.svelte @@ -54,38 +54,36 @@ if (isCloud) { const apexDomain = getApexDomain(data.proxyRule.domain); if (apexDomain) { - try { - const domainData = await sdk.forConsole.domains.create({ + sdk.forConsole.domains + .create({ teamId: $organization.$id, domain: apexDomain - }); - verified = domainData.nameservers.toLowerCase() === 'appwrite'; - if (!verified) { - throw new Error( - 'Domain verification failed. Please check your domain settings or try again later' - ); - } - } catch (error) { - // Empty as domain creation error needs to be silent - } - - try { - const domain = data.domainsList.domains.find( - (d: Models.Domain) => d.domain === apexDomain - ); - if (domain) { - const output = await sdk.forConsole.domains.updateNameservers({ - domainId: domain.$id - }); - verified = output.nameservers.toLowerCase() === 'appwrite'; - if (!verified) { - throw new Error( - 'Domain verification failed. Please check your domain settings or try again later' - ); + }) + .then((domainData) => { + if (domainData.nameservers.toLowerCase() === 'appwrite') { + verified = true; } - } - } catch (error) { - // Empty as domain update error needs to be silent + }) + .catch(() => { + // Empty as domain creation error needs to be silent + }); + + const domain = data.domainsList.domains.find( + (d: Models.Domain) => d.domain === apexDomain + ); + if (domain) { + sdk.forConsole.domains + .updateNameservers({ + domainId: domain.$id + }) + .then((output) => { + if (output.nameservers.toLowerCase() === 'appwrite') { + verified = true; + } + }) + .catch(() => { + // Empty as domain update error needs to be silent + }); } } }