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.
This commit is contained in:
Torsten Dittmann
2025-05-30 20:53:19 +02:00
parent aa8ecb7dc0
commit c4d280b256
7 changed files with 10 additions and 10 deletions
@@ -41,7 +41,7 @@
let selectedDomain: Models.Domain = null;
const isDomainVerified = (domain: Models.Domain) => {
return domain.nameservers.toLocaleLowerCase() === 'appwrite';
return domain.nameservers.toLowerCase() === 'appwrite';
};
</script>
@@ -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'
@@ -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',
@@ -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`
@@ -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'
@@ -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'
@@ -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'
);