ulivargas/classroomio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: simplify workflow for self hosters.

Browse Source
This commit is contained in:
Rotimi Best
2026-05-20 16:33:11 +01:00
parent da71598e4a
commit 266f9f2b22
3 changed files with 56 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/dashboard/src/lib/utils/services/api/index.ts
+11 -4
View File
@@ -16,10 +16,17 @@ export const getRequestBaseUrl = () => {
return process.env.PRIVATE_SERVER_URL || env.PUBLIC_SERVER_URL;
}
// Browser: same-origin via the Cloudflare Worker `/proxy` prefix. Keeps
// auth cookies host-only on whichever domain the user is currently
// visiting (app.classroomio.com, <org>.classroomio.school, or BYOD).
// The Worker strips `/proxy` and forwards the remainder to the API.
// Self-hosted: dashboard and API are on different subdomains of the
// operator's apex. Browser calls go straight to PUBLIC_SERVER_URL;
// cookies cross subdomains via AUTH_COOKIE_DOMAIN. No Worker proxy.
if (env.PUBLIC_IS_SELFHOSTED === 'true') {
return env.PUBLIC_SERVER_URL ?? '';
}
// Cloud (multi-tenant): same-origin via the Cloudflare Worker `/proxy`
// prefix so auth cookies stay host-only on whichever tenant or BYOD
// domain the user is currently visiting. The Worker strips `/proxy`
// before forwarding to the API.
return `${window.location.origin}/proxy`;
};
apps/dashboard/src/lib/utils/services/auth/client.ts
+22 -14
View File
@@ -2,25 +2,33 @@ import { createAuthClient } from 'better-auth/svelte';
import { env } from '$env/dynamic/public';
import { ssoClient } from '@better-auth/sso/client';
// Browser: same-origin via the Cloudflare Worker, so auth cookies stay
// host-only on whichever domain the user is on (app.classroomio.com,
// <org>.classroomio.school, or a BYOD domain). The URL is
// `<origin>/proxy/api/auth`:
// - `/proxy` is the Worker's same-origin escape hatch — it strips
// that prefix before forwarding to the upstream API.
// - `/api/auth` is where Better Auth is mounted on the Hono API.
// Better Auth's client treats any baseURL with a path as the auth root
// verbatim (it won't auto-append `/api/auth`), so we encode the full
// downstream path here.
// Browser baseURL depends on deployment shape:
//
// - Self-hosted: dashboard and API are on different subdomains under
// one apex. Browser calls go straight to PUBLIC_SERVER_URL; cookies
// cross subdomains via AUTH_COOKIE_DOMAIN. No Worker proxy.
//
// - Cloud (multi-tenant): same-origin via the Cloudflare Worker so
// auth cookies stay host-only on whichever tenant/BYOD domain the
// user is on. We encode `<origin>/proxy/api/auth` because Better
// Auth's client treats any baseURL with a path as the full auth
// root verbatim (won't auto-append `/api/auth`).
//
// SSR: `authClient` methods are never invoked server-side (the dashboard
// uses `authServerClient` for that), but Better Auth's constructor still
// validates baseURL with `new URL(...)`, so we hand it the public API
// URL as an absolute-URL placeholder.
const baseURL =
typeof window !== 'undefined'
? `${window.location.origin}/proxy/api/auth`
: env.PUBLIC_SERVER_URL || 'http://localhost:3002';
function resolveBaseURL() {
if (typeof window === 'undefined') {
return env.PUBLIC_SERVER_URL || 'http://localhost:3002';
}
if (env.PUBLIC_IS_SELFHOSTED === 'true') {
return env.PUBLIC_SERVER_URL || `${window.location.origin}/api/auth`;
}
return `${window.location.origin}/proxy/api/auth`;
}
const baseURL = resolveBaseURL();
export const authClient = createAuthClient({
baseURL,