Skip to content

Commit 9e03625

Browse files
committed
refactor(auth): simplify trustedOrigins logic by removing redundant admin check and using optional chaining for settings access
1 parent b355d44 commit 9e03625

File tree

1 file changed

+7
-17
lines changed

1 file changed

+7
-17
lines changed

packages/server/src/lib/auth.ts

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -38,24 +38,14 @@ const { handler, api } = betterAuth({
3838
},
3939
...(!IS_CLOUD && {
4040
async trustedOrigins() {
41-
const admin = await db.query.member.findFirst({
42-
where: eq(schema.member.role, "owner"),
43-
with: {
44-
user: true,
45-
},
46-
});
47-
48-
if (admin?.user) {
49-
const settings = await getWebServerSettings();
50-
if (!settings) {
51-
return [];
52-
}
53-
return [
54-
...(settings.serverIp ? [`http://${settings.serverIp}:3000`] : []),
55-
...(settings.host ? [`https://${settings.host}`] : []),
56-
];
41+
const settings = await getWebServerSettings();
42+
if (!settings) {
43+
return [];
5744
}
58-
return [];
45+
return [
46+
...(settings?.serverIp ? [`http://${settings?.serverIp}:3000`] : []),
47+
...(settings?.host ? [`https://${settings?.host}`] : []),
48+
];
5949
},
6050
}),
6151
emailVerification: {

0 commit comments

Comments
 (0)