From 9e03625586bd79dc093cd519f6bafd17fb4961da Mon Sep 17 00:00:00 2001
From: Mauricio Siu <siumauricio@icloud.com>
Date: Sun, 28 Dec 2025 13:18:20 -0600
Subject: [PATCH] refactor(auth): simplify trustedOrigins logic by removing
 redundant admin check and using optional chaining for settings access

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

diff --git a/packages/server/src/lib/auth.ts b/packages/server/src/lib/auth.ts
index d0a80a581..d4379e4be 100644
--- a/packages/server/src/lib/auth.ts
+++ b/packages/server/src/lib/auth.ts
@@ -38,24 +38,14 @@ const { handler, api } = betterAuth({
 	},
 	...(!IS_CLOUD && {
 		async trustedOrigins() {
-			const admin = await db.query.member.findFirst({
-				where: eq(schema.member.role, "owner"),
-				with: {
-					user: true,
-				},
-			});
-
-			if (admin?.user) {
-				const settings = await getWebServerSettings();
-				if (!settings) {
-					return [];
-				}
-				return [
-					...(settings.serverIp ? [`http://${settings.serverIp}:3000`] : []),
-					...(settings.host ? [`https://${settings.host}`] : []),
-				];
+			const settings = await getWebServerSettings();
+			if (!settings) {
+				return [];
 			}
-			return [];
+			return [
+				...(settings?.serverIp ? [`http://${settings?.serverIp}:3000`] : []),
+				...(settings?.host ? [`https://${settings?.host}`] : []),
+			];
 		},
 	}),
 	emailVerification: {