Skip to content

Modern Docker Management, Designed for Everyone

fix: add redirect from /auth/oidc/callback to /oidc/callback

Kyle Mendellef621bf2b959
diff --git a/frontend/src/lib/services/api-service.ts b/frontend/src/lib/services/api-service.ts
index 76c9c240e..75b3b066d 100644
--- a/frontend/src/lib/services/api-service.ts
+++ b/frontend/src/lib/services/api-service.ts
@@ -76,7 +76,11 @@ abstract class BaseAPIService {
const isAuthApi = skipAuthPaths.some((p) => reqUrl.startsWith(p));
const pathname = window.location.pathname || '/';
- const isOnAuthPage = pathname.startsWith('/login') || pathname.startsWith('/logout') || pathname.startsWith('/oidc');
+ const isOnAuthPage =
+ pathname.startsWith('/login') ||
+ pathname.startsWith('/logout') ||
+ pathname.startsWith('/oidc') ||
+ pathname.startsWith('/auth/oidc');
if (!isAuthApi && !isOnAuthPage && !isVersionMismatch && BaseAPIService.tokenRefreshHandler) {
try {
diff --git a/frontend/src/lib/utils/redirect.util.ts b/frontend/src/lib/utils/redirect.util.ts
index 92af7828e..e4c6bc3be 100644
--- a/frontend/src/lib/utils/redirect.util.ts
+++ b/frontend/src/lib/utils/redirect.util.ts
@@ -31,6 +31,8 @@ export function getAuthRedirectPath(path: string, user: User | null) {
path.startsWith('/oidc/login') ||
path === '/oidc/callback' ||
path.startsWith('/oidc/callback') ||
+ path === '/auth/oidc/callback' ||
+ path.startsWith('/auth/oidc/callback') ||
path === '/img' ||
path.startsWith('/img') ||
path === '/favicon.ico';
diff --git a/frontend/src/routes/auth/oidc/callback/+page.ts b/frontend/src/routes/auth/oidc/callback/+page.ts
new file mode 100644
index 000000000..4c082b582
--- /dev/null
+++ b/frontend/src/routes/auth/oidc/callback/+page.ts
@@ -0,0 +1,10 @@
+import { redirect } from '@sveltejs/kit';
+import type { PageLoad } from './$types';
+
+// Temporary redirect to handle OIDC callback uniformly
+
+export const load: PageLoad = ({ url }) => {
+ const searchParams = url.searchParams.toString();
+ const redirectUrl = searchParams ? `/oidc/callback?${searchParams}` : '/oidc/callback';
+ redirect(307, redirectUrl);
+};