Merge pull request #2826 from appwrite/fix-domains

Get first domain from list

Author: abnegate

src/lib/helpers/domains.ts

@@ -4,6 +4,27 @@ import { Query } from '@appwrite.io/console';
 import { getApexDomain } from './tlds';
 import { isCloud } from '$lib/system';
 
+/**
+ * Normalizes console variables by extracting the first domain from comma-separated domain lists.
+ * This handles the backend sending `_APP_DOMAIN_SITES` (and similar fields) as comma-separated values.
+ */
+export function normalizeConsoleVariables(
+    variables: Models.ConsoleVariables
+): Models.ConsoleVariables {
+    return {
+        ...variables,
+        _APP_DOMAIN_SITES: getFirstDomain(variables._APP_DOMAIN_SITES)
+    };
+}
+
+/**
+ * Extracts the first domain from a potentially comma-separated list of domains.
+ */
+function getFirstDomain(domainList: string | undefined): string {
+    if (!domainList) return '';
+    return domainList.split(',')[0].trim();
+}
+
 export async function createRecord(record: Partial<Models.DnsRecord>, domainId: string) {
     switch (record.type) {
         case 'A':

src/routes/(console)/+layout.ts

@@ -5,6 +5,7 @@ import { Dependencies } from '$lib/constants';
 import { Platform, Query } from '@appwrite.io/console';
 import { makePlansMap } from '$lib/helpers/billing';
 import { plansInfo as plansInfoStore } from '$lib/stores/billing';
+import { normalizeConsoleVariables } from '$lib/helpers/domains';
 
 export const load: LayoutLoad = async ({ depends, parent }) => {
     const { organizations, plansInfo } = await parent();
@@ -22,7 +23,7 @@ export const load: LayoutLoad = async ({ depends, parent }) => {
                   platform: Platform.Appwrite
               });
 
-    const [preferences, plansArray, versionData, consoleVariables] = await Promise.all([
+    const [preferences, plansArray, versionData, rawConsoleVariables] = await Promise.all([
         sdk.forConsole.account.getPrefs(),
         plansArrayPromise,
         fetch(`${endpoint}/health/version`, {
@@ -31,6 +32,8 @@ export const load: LayoutLoad = async ({ depends, parent }) => {
         sdk.forConsole.console.variables()
     ]);
 
+    const consoleVariables = normalizeConsoleVariables(rawConsoleVariables);
+
     let fallbackPlansInfoArray = plansInfo;
     if (!fallbackPlansInfoArray) {
         fallbackPlansInfoArray = makePlansMap(plansArray);

src/routes/(console)/project-[region]-[project]/+layout.ts

@@ -11,6 +11,7 @@ import { loadAvailableRegions } from '$routes/(console)/regions';
 import { type Models, Platform } from '@appwrite.io/console';
 import { redirect } from '@sveltejs/kit';
 import { resolve } from '$app/paths';
+import { normalizeConsoleVariables } from '$lib/helpers/domains';
 
 export const load: LayoutLoad = async ({ params, depends, parent }) => {
     const { plansInfo, organizations, preferences: prefs } = await parent();
@@ -27,7 +28,7 @@ export const load: LayoutLoad = async ({ params, depends, parent }) => {
     // organization can be null if not in the filtered list!
     const includedInBasePlans = plansInfo.has(organization?.billingPlanId);
 
-    const [org, regionalConsoleVariables, rolesResult] = await Promise.all([
+    const [org, rawRegionalConsoleVariables, rolesResult] = await Promise.all([
         !organization
             ? // TODO: @itznotabug - teams.get with Models.Organization?
               (sdk.forConsole.teams.get({ teamId: project.teamId }) as Promise<Models.Organization>)
@@ -42,6 +43,8 @@ export const load: LayoutLoad = async ({ params, depends, parent }) => {
         loadAvailableRegions(project.teamId)
     ]);
 
+    const regionalConsoleVariables = normalizeConsoleVariables(rawRegionalConsoleVariables);
+
     if (!organization) organization = org;
 
     // not the right organization project based on platform,