From 235fe34c664999e371b69c2fcb1f65871c1ee46b Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Fri, 30 May 2025 20:25:09 +0200 Subject: [PATCH 1/4] Refactor domain verification status handling Change verified prop from boolean to boolean|undefined to better represent three-state verification (undefined/pending, true/verified, false/failed). Remove "Pending verification" badges and standardize verification error messages. Fix grid layout for domain metrics and improve error handling by displaying error messages instead of error objects. --- src/lib/components/domains/cnameTable.svelte | 14 ++---- .../components/domains/nameserverTable.svelte | 6 +-- src/lib/components/domains/recordTable.svelte | 10 +---- src/lib/components/usageCard.svelte | 5 ++- .../domain-[domain]/domainMetrics.svelte | 43 +++++++++---------- .../domains/recordsCard.svelte | 16 +++---- .../domains/retryDomainModal.svelte | 5 ++- .../domains/add-domain/+page.svelte | 4 +- .../add-domain/verify-[domain]/+page.svelte | 13 +++++- .../domains/retryDomainModal.svelte | 2 +- .../function-[function]/domains/table.svelte | 2 +- .../settings/domains/add-domain/+page.svelte | 4 +- .../add-domain/verify-[domain]/+page.svelte | 11 ++++- .../settings/domains/retryDomainModal.svelte | 2 +- .../settings/domains/table.svelte | 2 +- .../add-domain/verify-[domain]/+page.svelte | 4 ++ .../domains/createPreviewDomainModal.svelte | 2 +- .../domains/retryDomainModal.svelte | 2 +- .../sites/site-[site]/domains/table.svelte | 2 +- 19 files changed, 80 insertions(+), 69 deletions(-) diff --git a/src/lib/components/domains/cnameTable.svelte b/src/lib/components/domains/cnameTable.svelte index ed7c8bd5e..fd90536aa 100644 --- a/src/lib/components/domains/cnameTable.svelte +++ b/src/lib/components/domains/cnameTable.svelte @@ -12,7 +12,7 @@ import { regionalConsoleVariables } from '$routes/(console)/project-[region]-[project]/store'; export let domain: string; - export let verified = false; + export let verified = undefined; let subdomain = domain.split('.').slice(0, -2).join('.'); @@ -23,16 +23,10 @@ {domain} - {#if verified} - + {#if verified === true} + {:else if verified === false} - - {:else} - + {/if} diff --git a/src/lib/components/domains/nameserverTable.svelte b/src/lib/components/domains/nameserverTable.svelte index 9a9d17f15..55414d839 100644 --- a/src/lib/components/domains/nameserverTable.svelte +++ b/src/lib/components/domains/nameserverTable.svelte @@ -4,7 +4,7 @@ import { Badge, Layout, Typography, Table, InteractiveText } from '@appwrite.io/pink-svelte'; export let domain: string; - export let verified = false; + export let verified = undefined; const nameserverList = $regionalConsoleVariables?._APP_DOMAINS_NAMESERVERS ? $regionalConsoleVariables?._APP_DOMAINS_NAMESERVERS?.split(',') @@ -16,10 +16,10 @@ {domain} - {#if verified} + {#if verified === true} {:else if verified === false} - + {/if} diff --git a/src/lib/components/domains/recordTable.svelte b/src/lib/components/domains/recordTable.svelte index bf7fa7abf..1b58b1aa6 100644 --- a/src/lib/components/domains/recordTable.svelte +++ b/src/lib/components/domains/recordTable.svelte @@ -11,7 +11,7 @@ import { regionalConsoleVariables } from '$routes/(console)/project-[region]-[project]/store'; export let domain: string; - export let verified = false; + export let verified = undefined; export let variant: 'cname' | 'a' | 'aaaa'; export let service: 'sites' | 'general' = 'general'; @@ -37,16 +37,10 @@ {domain} - {#if verified} + {#if verified === true} {:else if verified === false} - {:else} - {/if} diff --git a/src/lib/components/usageCard.svelte b/src/lib/components/usageCard.svelte index bebb1e131..86d853f9f 100644 --- a/src/lib/components/usageCard.svelte +++ b/src/lib/components/usageCard.svelte @@ -13,8 +13,9 @@ {#if value !== null && value !== undefined} - {value} + + {value} + {:else} {/if} diff --git a/src/routes/(console)/organization-[organization]/domains/domain-[domain]/domainMetrics.svelte b/src/routes/(console)/organization-[organization]/domains/domain-[domain]/domainMetrics.svelte index 7d4a152a5..83d86b27d 100644 --- a/src/routes/(console)/organization-[organization]/domains/domain-[domain]/domainMetrics.svelte +++ b/src/routes/(console)/organization-[organization]/domains/domain-[domain]/domainMetrics.svelte @@ -43,29 +43,26 @@ ]; - - - {#each metrics.slice(0, 3) as metric} - {#if metric.description === 'Status'} - - - + + {#each metrics.slice(0, 3) as metric} + {#if metric.description === 'Status'} + + + - {#if !isDomainVerified} - Retry - {/if} - - - {:else} - - {/if} - {/each} - - - {#each metrics.slice(3) as metric} + {#if !isDomainVerified} + Retry + {/if} + + + {:else} - {/each} - + {/if} + {/each} + {#each metrics.slice(3) as metric} + + {/each} diff --git a/src/routes/(console)/organization-[organization]/domains/recordsCard.svelte b/src/routes/(console)/organization-[organization]/domains/recordsCard.svelte index 0b6f45a31..c81304c2a 100644 --- a/src/routes/(console)/organization-[organization]/domains/recordsCard.svelte +++ b/src/routes/(console)/organization-[organization]/domains/recordsCard.svelte @@ -46,7 +46,8 @@ } else { addNotification({ type: 'error', - message: 'Domain not verified' + message: + 'Domain verification failed. Please check your domain settings or try again later' }); } } catch (error) { @@ -68,8 +69,9 @@ - {domain.domain} + + {domain.domain} + {#if verified === false} - {:else} - + {:else if verified === true} + {/if} diff --git a/src/routes/(console)/organization-[organization]/domains/retryDomainModal.svelte b/src/routes/(console)/organization-[organization]/domains/retryDomainModal.svelte index 7d059b277..a60217b3a 100644 --- a/src/routes/(console)/organization-[organization]/domains/retryDomainModal.svelte +++ b/src/routes/(console)/organization-[organization]/domains/retryDomainModal.svelte @@ -31,13 +31,14 @@ } else { addNotification({ type: 'error', - message: `Domain verification failed. Please check your domain settings or try again later` + message: + 'Domain verification failed. Please check your domain settings or try again later' }); } await invalidate(Dependencies.DOMAINS); trackEvent(Submit.DomainUpdateVerification); } catch (e) { - error = e; + error = e.message; trackError(e, Submit.DomainUpdateVerification); } } 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 c35e92fc0..2c931b0a9 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 @@ -82,7 +82,9 @@ await goto(routeBase); await invalidate(Dependencies.FUNCTION_DOMAINS); } else { - await goto(`${routeBase}/add-domain/verify-${domainName}?rule=${rule.$id}`); + await goto( + `${routeBase}/add-domain/verify-${domainName}?rule=${rule.$id}&domain=${domain.$id}` + ); await invalidate(Dependencies.FUNCTION_DOMAINS); } } catch (error) { 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 c99378209..95fc01370 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 @@ -28,6 +28,7 @@ let { data } = $props(); const ruleId = page.url.searchParams.get('rule'); + const domainId = page.url.searchParams.get('domain'); const isSubDomain = $derived.by(() => isASubdomain(page.params.domain)); let selectedTab = $state<'cname' | 'nameserver' | 'a' | 'aaaa'>('nameserver'); @@ -42,14 +43,15 @@ selectedTab = 'nameserver'; } }); - let verified = $state(false); + let verified: boolean | undefined = $state(undefined); let routeBase = `${base}/project-${page.params.region}-${page.params.project}/functions/function-${page.params.function}/domains`; let isSubmitting = $state(writable(false)); async function verify() { const isNewDomain = - data.domainsList.domains.findIndex((rule) => rule.domain === page.params.domain) === -1; + data.domainsList.domains.find((rule) => rule.domain === page.params.domain) === + undefined; try { if (selectedTab !== 'nameserver') { const ruleData = await sdk @@ -62,6 +64,13 @@ page.params.domain ); verified = domainData.nameservers.toLocaleLowerCase() === 'appwrite'; + } else if (!isNewDomain && isCloud) { + const domain = await sdk.forConsole.domains.updateNameservers(domainId); + verified = domain.nameservers === 'Appwrite'; + if (!verified) + throw new Error( + 'Domain verification failed. Please check your domain settings or try again later' + ); } addNotification({ diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/retryDomainModal.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/retryDomainModal.svelte index 008c36553..5a4722e6a 100644 --- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/retryDomainModal.svelte +++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/retryDomainModal.svelte @@ -27,7 +27,7 @@ }); trackEvent(Submit.DomainUpdateVerification); } catch (e) { - error = e; + error = e.message; trackError(e, Submit.DomainUpdateVerification); } } diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/table.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/table.svelte index 1dcb2baee..2bd90d1e0 100644 --- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/table.svelte +++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/table.svelte @@ -94,7 +94,7 @@ - {#if proxyRule.status !== 'verified'} + {#if proxyRule.status !== 'verified' && proxyRule.status !== 'verifying'} { 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 781c68bb2..b9e50a3e8 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 @@ -52,7 +52,9 @@ await goto(routeBase); await invalidate(Dependencies.DOMAINS); } else { - await goto(`${routeBase}/add-domain/verify-${domainName}?rule=${rule.$id}`); + await goto( + `${routeBase}/add-domain/verify-${domainName}?rule=${rule.$id}&domain=${domain.$id}` + ); await invalidate(Dependencies.DOMAINS); } } catch (error) { 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 f5793b327..28a3cbfdf 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 @@ -28,6 +28,7 @@ let { data } = $props(); const ruleId = page.url.searchParams.get('rule'); + const domainId = page.url.searchParams.get('domain'); const isSubDomain = $derived.by(() => isASubdomain(page.params.domain)); let selectedTab = $state<'cname' | 'nameserver' | 'a' | 'aaaa'>('nameserver'); @@ -50,7 +51,8 @@ async function verify() { const isNewDomain = - data.domainsList.domains.findIndex((rule) => rule.domain === page.params.domain) === -1; + data.domainsList.domains.find((rule) => rule.domain === page.params.domain) === + undefined; try { if (selectedTab !== 'nameserver') { const ruleData = await sdk @@ -63,6 +65,13 @@ page.params.domain ); verified = domainData.nameservers.toLocaleLowerCase() === 'appwrite'; + } else if (!isNewDomain && isCloud) { + const domain = await sdk.forConsole.domains.updateNameservers(domainId); + verified = domain.nameservers === 'Appwrite'; + if (!verified) + throw new Error( + 'Domain verification failed. Please check your domain settings or try again later' + ); } addNotification({ diff --git a/src/routes/(console)/project-[region]-[project]/settings/domains/retryDomainModal.svelte b/src/routes/(console)/project-[region]-[project]/settings/domains/retryDomainModal.svelte index d0bf3861b..2cd8c7a51 100644 --- a/src/routes/(console)/project-[region]-[project]/settings/domains/retryDomainModal.svelte +++ b/src/routes/(console)/project-[region]-[project]/settings/domains/retryDomainModal.svelte @@ -32,7 +32,7 @@ }); trackEvent(Submit.DomainUpdateVerification); } catch (e) { - error = e; + error = e.message; trackError(e, Submit.DomainUpdateVerification); } } diff --git a/src/routes/(console)/project-[region]-[project]/settings/domains/table.svelte b/src/routes/(console)/project-[region]-[project]/settings/domains/table.svelte index 0584a1961..70b5b62bf 100644 --- a/src/routes/(console)/project-[region]-[project]/settings/domains/table.svelte +++ b/src/routes/(console)/project-[region]-[project]/settings/domains/table.svelte @@ -84,7 +84,7 @@ - {#if domain.status !== 'verified'} + {#if domain.status !== 'verified' && domain.status !== 'verifiying'} { 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 b79ba129c..c3e040d98 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 @@ -58,12 +58,16 @@ .forProject(page.params.region, page.params.project) .proxy.updateRuleVerification(ruleId); verified = ruleData.status === 'verified'; + console.log(ruleData); + throw new Error('Verification failed'); } else if (isNewDomain && isCloud) { const domainData = await sdk.forConsole.domains.create( $organization.$id, page.params.domain ); verified = domainData.nameservers.toLocaleLowerCase() === 'appwrite'; + console.log(domainData); + throw new Error('Verification failed'); } addNotification({ diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/createPreviewDomainModal.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/createPreviewDomainModal.svelte index 33db2ccee..fa23726b0 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/createPreviewDomainModal.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/createPreviewDomainModal.svelte @@ -36,7 +36,7 @@ }); trackEvent(Submit.DomainCreate); } catch (e) { - error = e; + error = e.message; trackError(e, Submit.DomainCreate); } } diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/retryDomainModal.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/retryDomainModal.svelte index 352109247..37089a4da 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/retryDomainModal.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/retryDomainModal.svelte @@ -56,7 +56,7 @@ }); trackEvent(Submit.DomainUpdateVerification); } catch (e) { - error = e; + error = e.message; trackError(e, Submit.DomainUpdateVerification); } } diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/table.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/table.svelte index b98cf258c..8d118feb6 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/table.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/table.svelte @@ -95,7 +95,7 @@ - {#if rule.status !== 'verified'} + {#if rule.status !== 'verified' && rule.status !== 'verifying'} { From caf4a0acc857f5619214e9bba839746054b98c0a Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Fri, 30 May 2025 20:33:58 +0200 Subject: [PATCH 2/4] Improve domain verification error messages Remove debug console.log statements and replace generic error messages with more descriptive text to help users troubleshoot verification issues. --- .../domains/add-domain/verify-[domain]/+page.svelte | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) 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 c3e040d98..20778631a 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 @@ -58,16 +58,18 @@ .forProject(page.params.region, page.params.project) .proxy.updateRuleVerification(ruleId); verified = ruleData.status === 'verified'; - console.log(ruleData); - throw new Error('Verification failed'); + throw new Error( + 'Domain verification failed. Please check your domain settings or try again later' + ); } else if (isNewDomain && isCloud) { const domainData = await sdk.forConsole.domains.create( $organization.$id, page.params.domain ); verified = domainData.nameservers.toLocaleLowerCase() === 'appwrite'; - console.log(domainData); - throw new Error('Verification failed'); + throw new Error( + 'Domain verification failed. Please check your domain settings or try again later' + ); } addNotification({ From aa8ecb7dc02441e8fc61c09adb2283e54da18ed9 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Fri, 30 May 2025 20:38:51 +0200 Subject: [PATCH 3/4] Add pagination to domain records list --- .../domains/domain-[domain]/+page.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/routes/(console)/organization-[organization]/domains/domain-[domain]/+page.ts b/src/routes/(console)/organization-[organization]/domains/domain-[domain]/+page.ts index 6c3990efa..f7f1c8caf 100644 --- a/src/routes/(console)/organization-[organization]/domains/domain-[domain]/+page.ts +++ b/src/routes/(console)/organization-[organization]/domains/domain-[domain]/+page.ts @@ -4,6 +4,7 @@ import { pageToOffset } from '$lib/helpers/load'; import { getLimit } from '$lib/helpers/load'; import { getPage } from '$lib/helpers/load'; import { sdk } from '$lib/stores/sdk.js'; +import { Query } from '@appwrite.io/console'; export const load = async ({ parent, depends, url, route }) => { depends(Dependencies.DOMAIN); @@ -15,7 +16,10 @@ export const load = async ({ parent, depends, url, route }) => { return { domain, - recordList: await sdk.forConsole.domains.listRecords(domain.$id), + recordList: await sdk.forConsole.domains.listRecords(domain.$id, [ + Query.offset(offset), + Query.limit(limit) + ]), offset, limit }; From c4d280b256f2f7e65101dced1c996c01344a7644 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Fri, 30 May 2025 20:53:19 +0200 Subject: [PATCH 4/4] Fix domain verification string comparison Add null safety and normalize casing inconsistencies in domain nameserver checks. Use optional chaining and consistent toLowerCase() method across all domain verification logic. --- .../organization-[organization]/domains/+page.svelte | 2 +- .../domains/domain-[domain]/domainMetrics.svelte | 4 ++-- .../organization-[organization]/domains/recordsCard.svelte | 2 +- .../domains/retryDomainModal.svelte | 2 +- .../domains/add-domain/verify-[domain]/+page.svelte | 4 ++-- .../settings/domains/add-domain/verify-[domain]/+page.svelte | 4 ++-- .../domains/add-domain/verify-[domain]/+page.svelte | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/routes/(console)/organization-[organization]/domains/+page.svelte b/src/routes/(console)/organization-[organization]/domains/+page.svelte index e970be7f6..b2726e561 100644 --- a/src/routes/(console)/organization-[organization]/domains/+page.svelte +++ b/src/routes/(console)/organization-[organization]/domains/+page.svelte @@ -41,7 +41,7 @@ let selectedDomain: Models.Domain = null; const isDomainVerified = (domain: Models.Domain) => { - return domain.nameservers.toLocaleLowerCase() === 'appwrite'; + return domain.nameservers.toLowerCase() === 'appwrite'; }; diff --git a/src/routes/(console)/organization-[organization]/domains/domain-[domain]/domainMetrics.svelte b/src/routes/(console)/organization-[organization]/domains/domain-[domain]/domainMetrics.svelte index 83d86b27d..4b45f7261 100644 --- a/src/routes/(console)/organization-[organization]/domains/domain-[domain]/domainMetrics.svelte +++ b/src/routes/(console)/organization-[organization]/domains/domain-[domain]/domainMetrics.svelte @@ -8,7 +8,7 @@ let { domain, retryVerification }: { domain: Models.Domain; retryVerification: () => void } = $props(); - const isDomainVerified = domain.nameservers.toLocaleLowerCase() === 'appwrite'; + const isDomainVerified = domain.nameservers.toLowerCase() === 'appwrite'; const metrics = [ { @@ -29,7 +29,7 @@ }, { value: - domain?.registrar?.toLocaleLowerCase() === 'appwrite' + domain?.registrar?.toLowerCase() === 'appwrite' ? domain?.autoRenewal ? 'On' : 'Off' diff --git a/src/routes/(console)/organization-[organization]/domains/recordsCard.svelte b/src/routes/(console)/organization-[organization]/domains/recordsCard.svelte index c81304c2a..a131eb5b2 100644 --- a/src/routes/(console)/organization-[organization]/domains/recordsCard.svelte +++ b/src/routes/(console)/organization-[organization]/domains/recordsCard.svelte @@ -35,7 +35,7 @@ async function verifyStatus() { try { domain = await sdk.forConsole.domains.updateNameservers(domain.$id); - verified = domain.nameservers === 'Appwrite'; + verified = domain.nameservers.toLowerCase() === 'appwrite'; if (verified) { addNotification({ type: 'success', diff --git a/src/routes/(console)/organization-[organization]/domains/retryDomainModal.svelte b/src/routes/(console)/organization-[organization]/domains/retryDomainModal.svelte index a60217b3a..453cc79e0 100644 --- a/src/routes/(console)/organization-[organization]/domains/retryDomainModal.svelte +++ b/src/routes/(console)/organization-[organization]/domains/retryDomainModal.svelte @@ -23,7 +23,7 @@ try { const domain = await sdk.forConsole.domains.updateNameservers(selectedDomain.$id); show = false; - if (domain.nameservers === 'Appwrite') { + if (domain.nameservers.toLowerCase() === 'appwrite') { addNotification({ type: 'success', message: `${selectedDomain.domain} has been verified` 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 95fc01370..d8d044ef1 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 @@ -63,10 +63,10 @@ $organization.$id, page.params.domain ); - verified = domainData.nameservers.toLocaleLowerCase() === 'appwrite'; + verified = domainData.nameservers.toLowerCase() === 'appwrite'; } else if (!isNewDomain && isCloud) { const domain = await sdk.forConsole.domains.updateNameservers(domainId); - verified = domain.nameservers === 'Appwrite'; + verified = domain.nameservers.toLowerCase() === 'appwrite'; if (!verified) throw new Error( 'Domain verification failed. Please check your domain settings or try again later' 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 28a3cbfdf..594c4f4e2 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 @@ -64,10 +64,10 @@ $organization.$id, page.params.domain ); - verified = domainData.nameservers.toLocaleLowerCase() === 'appwrite'; + verified = domainData.nameservers.toLowerCase() === 'appwrite'; } else if (!isNewDomain && isCloud) { const domain = await sdk.forConsole.domains.updateNameservers(domainId); - verified = domain.nameservers === 'Appwrite'; + verified = domain.nameservers.toLowerCase() === 'appwrite'; if (!verified) throw new Error( 'Domain verification failed. Please check your domain settings or try again later' 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 20778631a..51ebc1552 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 @@ -66,7 +66,7 @@ $organization.$id, page.params.domain ); - verified = domainData.nameservers.toLocaleLowerCase() === 'appwrite'; + verified = domainData.nameservers.toLowerCase() === 'appwrite'; throw new Error( 'Domain verification failed. Please check your domain settings or try again later' );