From 2102840bb969356b85c3c8643366bf5b6701fdff Mon Sep 17 00:00:00 2001
From: Mauricio Siu <siumauricio@icloud.com>
Date: Sun, 8 Mar 2026 23:48:51 -0600
Subject: [PATCH] fix: add error handling to trusted origins retrieval in admin
 service

---
 packages/server/src/services/admin.ts | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/packages/server/src/services/admin.ts b/packages/server/src/services/admin.ts
index 2721777df..f0c8cb0eb 100644
--- a/packages/server/src/services/admin.ts
+++ b/packages/server/src/services/admin.ts
@@ -135,15 +135,25 @@ export const getTrustedOrigins = async () => {
 		if (trustedOriginsCache && now < trustedOriginsCache.expiresAt) {
 			return trustedOriginsCache.data;
 		}
-		const trustedOrigins = await runQuery();
-		trustedOriginsCache = {
-			data: trustedOrigins,
-			expiresAt: now + TRUSTED_ORIGINS_CACHE_TTL_MS,
-		};
-		return trustedOrigins;
+		try {
+			const trustedOrigins = await runQuery();
+			trustedOriginsCache = {
+				data: trustedOrigins,
+				expiresAt: now + TRUSTED_ORIGINS_CACHE_TTL_MS,
+			};
+			return trustedOrigins;
+		} catch (error) {
+			console.error("Failed to fetch trusted origins:", error);
+			return trustedOriginsCache?.data ?? [];
+		}
 	}
 
-	return runQuery();
+	try {
+		return await runQuery();
+	} catch (error) {
+		console.error("Failed to fetch trusted origins:", error);
+		return [];
+	}
 };
 
 export const getTrustedProviders = async () => {