Skip to content

Commit b3621bc

Browse files
committed
fix(sso): apply trusted origin changes without server restart
1 parent 995a04d commit b3621bc

3 files changed

Lines changed: 48 additions & 28 deletions

File tree

‎apps/dokploy/server/api/routers/proprietary/sso.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import {
88
requestToHeaders,
99
} from "@dokploy/server/index";
1010
import { auth } from "@dokploy/server/lib/auth";
11+
import { invalidateTrustedOriginsCache } from "@dokploy/server/services/admin";
1112
import { getWebServerSettings } from "@dokploy/server/services/web-server-settings";
1213
import { TRPCError } from "@trpc/server";
1314
import { and, asc, eq } from "drizzle-orm";
@@ -319,6 +320,7 @@ export const ssoRouter = createTRPCRouter({
319320
.update(user)
320321
.set({ trustedOrigins: next })
321322
.where(eq(user.id, ownerId));
323+
invalidateTrustedOriginsCache();
322324
return { success: true };
323325
}),
324326
removeTrustedOrigin: enterpriseProcedure
@@ -346,6 +348,7 @@ export const ssoRouter = createTRPCRouter({
346348
.update(user)
347349
.set({ trustedOrigins: next })
348350
.where(eq(user.id, ownerId));
351+
invalidateTrustedOriginsCache();
349352
return { success: true };
350353
}),
351354
updateTrustedOrigin: enterpriseProcedure
@@ -379,6 +382,7 @@ export const ssoRouter = createTRPCRouter({
379382
.update(user)
380383
.set({ trustedOrigins: next })
381384
.where(eq(user.id, ownerId));
385+
invalidateTrustedOriginsCache();
382386
return { success: true };
383387
}),
384388
});

‎packages/server/src/lib/auth.ts‎

Lines changed: 40 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { sso } from "@better-auth/sso";
44
import * as bcrypt from "bcrypt";
55
import { betterAuth } from "better-auth";
66
import { drizzleAdapter } from "better-auth/adapters/drizzle";
7-
import { APIError } from "better-auth/api";
7+
import { APIError, createAuthMiddleware } from "better-auth/api";
88
import { admin, organization, twoFactor } from "better-auth/plugins";
99
import { and, desc, eq } from "drizzle-orm";
1010
import { IS_CLOUD } from "../constants";
@@ -29,6 +29,37 @@ import { getPublicIpWithFallback } from "../wss/utils";
2929
import { ac, adminRole, memberRole, ownerRole } from "./access-control";
3030
import { betterAuthSecret } from "./auth-secret";
3131

32+
const resolveTrustedOrigins = async () => {
33+
try {
34+
if (IS_CLOUD) {
35+
return await getTrustedOrigins();
36+
}
37+
const [trustedOrigins, settings] = await Promise.all([
38+
getTrustedOrigins(),
39+
getWebServerSettings(),
40+
]);
41+
42+
if (!settings) return [];
43+
44+
const devOrigins =
45+
process.env.NODE_ENV === "development"
46+
? [
47+
"http://localhost:3000",
48+
"https://absolutely-handy-falcon.ngrok-free.app",
49+
]
50+
: [];
51+
return [
52+
...(settings?.serverIp ? [`http://${settings?.serverIp}:3000`] : []),
53+
...(settings?.host ? [`https://${settings?.host}`] : []),
54+
...devOrigins,
55+
...trustedOrigins,
56+
];
57+
} catch (error) {
58+
console.error("Failed to resolve trusted origins:", error);
59+
return [];
60+
}
61+
};
62+
3263
const { handler, api } = betterAuth({
3364
database: drizzleAdapter(db, {
3465
provider: "pg",
@@ -80,33 +111,14 @@ const { handler, api } = betterAuth({
80111
logger: {
81112
disabled: process.env.NODE_ENV === "production",
82113
},
83-
async trustedOrigins() {
84-
try {
85-
if (IS_CLOUD) {
86-
return await getTrustedOrigins();
87-
}
88-
const [trustedOrigins, settings] = await Promise.all([
89-
getTrustedOrigins(),
90-
getWebServerSettings(),
91-
]);
92-
if (!settings) return [];
93-
const devOrigins =
94-
process.env.NODE_ENV === "development"
95-
? [
96-
"http://localhost:3000",
97-
"https://absolutely-handy-falcon.ngrok-free.app",
98-
]
99-
: [];
100-
return [
101-
...(settings?.serverIp ? [`http://${settings?.serverIp}:3000`] : []),
102-
...(settings?.host ? [`https://${settings?.host}`] : []),
103-
...devOrigins,
104-
...trustedOrigins,
105-
];
106-
} catch (error) {
107-
console.error("Failed to resolve trusted origins:", error);
108-
return [];
109-
}
114+
trustedOrigins: resolveTrustedOrigins,
115+
hooks: {
116+
before: createAuthMiddleware(async (ctx) => {
117+
ctx.context.trustedOrigins = [
118+
...(ctx.context.baseURL ? [new URL(ctx.context.baseURL).origin] : []),
119+
...(await resolveTrustedOrigins()),
120+
].filter(Boolean);
121+
}),
110122
},
111123
emailVerification: {
112124
sendOnSignUp: true,

‎packages/server/src/services/admin.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,10 @@ export const getDokployUrl = async () => {
120120
const TRUSTED_ORIGINS_CACHE_TTL_MS = 30 * 60_000;
121121
let trustedOriginsCache: { data: string[]; expiresAt: number } | null = null;
122122

123+
export const invalidateTrustedOriginsCache = () => {
124+
trustedOriginsCache = null;
125+
};
126+
123127
export const getTrustedOrigins = async () => {
124128
const runQuery = async () => {
125129
const rows = await db

0 commit comments

Comments
 (0)