From c4d280b256f2f7e65101dced1c996c01344a7644 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Fri, 30 May 2025 20:53:19 +0200 Subject: [PATCH] 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' );