diff --git a/backend/src/ee/routes/v1/index.ts b/backend/src/ee/routes/v1/index.ts index de59c22aa..7431ec609 100644 --- a/backend/src/ee/routes/v1/index.ts +++ b/backend/src/ee/routes/v1/index.ts @@ -55,8 +55,13 @@ export const registerV1EERoutes = async (server: FastifyZodProvider) => { { prefix: "/dynamic-secrets" } ); - await server.register(registerSamlRouter, { prefix: "/sso" }); - await server.register(registerOidcRouter, { prefix: "/oidc" }); + await server.register( + async (ssoRouter) => { + await ssoRouter.register(registerSamlRouter); + await ssoRouter.register(registerOidcRouter, { prefix: "/oidc" }); + }, + { prefix: "/sso" } + ); await server.register(registerScimRouter, { prefix: "/scim" }); await server.register(registerLdapRouter, { prefix: "/ldap" }); await server.register(registerSecretScanningRouter, { prefix: "/secret-scanning" }); diff --git a/frontend/src/hooks/api/oidcConfig/mutations.tsx b/frontend/src/hooks/api/oidcConfig/mutations.tsx index 44d976170..bfcf92d1f 100644 --- a/frontend/src/hooks/api/oidcConfig/mutations.tsx +++ b/frontend/src/hooks/api/oidcConfig/mutations.tsx @@ -28,7 +28,7 @@ export const useUpdateOIDCConfig = () => { isActive?: boolean; orgSlug: string; }) => { - const { data } = await apiRequest.patch("/api/v1/oidc/config", { + const { data } = await apiRequest.patch("/api/v1/sso/oidc/config", { issuer, authorizationEndpoint, jwksUri, @@ -72,7 +72,7 @@ export const useCreateOIDCConfig = () => { isActive: boolean; orgSlug: string; }) => { - const { data } = await apiRequest.post("/api/v1/oidc/config", { + const { data } = await apiRequest.post("/api/v1/sso/oidc/config", { issuer, authorizationEndpoint, jwksUri, diff --git a/frontend/src/hooks/api/oidcConfig/queries.tsx b/frontend/src/hooks/api/oidcConfig/queries.tsx index 590c39848..08b38cbb8 100644 --- a/frontend/src/hooks/api/oidcConfig/queries.tsx +++ b/frontend/src/hooks/api/oidcConfig/queries.tsx @@ -13,7 +13,7 @@ export const useGetOIDCConfig = (orgSlug: string) => { queryKey: oidcConfigKeys.getOIDCConfig(orgSlug), queryFn: async () => { const { data } = await apiRequest.get( - `/api/v1/oidc/config?orgSlug=${orgSlug}` + `/api/v1/sso/oidc/config?orgSlug=${orgSlug}` ); return data;