From 316cf47cebdb7337cef13a533a8105ef4364b6f5 Mon Sep 17 00:00:00 2001
From: Elias Schneider <login@eliasschneider.com>
Date: Mon, 13 Jul 2026 10:09:20 +0200
Subject: [PATCH] fix: `INTERNAL_APP_URL` not reflected in UI URLs

---
 frontend/src/lib/types/oidc.type.ts           |  9 ++++++++
 .../admin/oidc-clients/[id]/+page.svelte      | 15 +++++++------
 .../settings/admin/oidc-clients/[id]/+page.ts | 20 ++++++++++++++----
 tests/specs/oidc-client-settings.spec.ts      | 21 +++++++++++++++++++
 4 files changed, 53 insertions(+), 12 deletions(-)

diff --git a/frontend/src/lib/types/oidc.type.ts b/frontend/src/lib/types/oidc.type.ts
index fb1380e7..d03e36bb 100644
--- a/frontend/src/lib/types/oidc.type.ts
+++ b/frontend/src/lib/types/oidc.type.ts
@@ -22,6 +22,15 @@ export type OidcClientCredentials = {
 	federatedIdentities: OidcClientFederatedIdentity[];
 };
 
+export type OidcDiscoveryConfiguration = {
+	issuer: string;
+	authorization_endpoint: string;
+	token_endpoint: string;
+	userinfo_endpoint: string;
+	end_session_endpoint: string;
+	jwks_uri: string;
+};
+
 export type OidcClient = OidcClientMetaData & {
 	callbackURLs: string[];
 	logoutCallbackURLs: string[];
diff --git a/frontend/src/routes/settings/admin/oidc-clients/[id]/+page.svelte b/frontend/src/routes/settings/admin/oidc-clients/[id]/+page.svelte
index 28185113..19e04ae9 100644
--- a/frontend/src/routes/settings/admin/oidc-clients/[id]/+page.svelte
+++ b/frontend/src/routes/settings/admin/oidc-clients/[id]/+page.svelte
@@ -1,6 +1,5 @@
 <script lang="ts">
 	import { beforeNavigate } from '$app/navigation';
-	import { page } from '$app/state';
 	import { openConfirmDialog } from '$lib/components/confirm-dialog';
 	import CopyToClipboard from '$lib/components/copy-to-clipboard.svelte';
 	import FormattedMessage from '$lib/components/formatted-message.svelte';
@@ -47,13 +46,13 @@
 	const backNavigation = backNavigate('/settings/admin/oidc-clients');
 
 	const setupDetails = $state({
-		[m.issuer_url()]: `https://${page.url.host}`,
-		[m.authorization_url()]: `https://${page.url.host}/authorize`,
-		[m.oidc_discovery_url()]: `https://${page.url.host}/.well-known/openid-configuration`,
-		[m.token_url()]: `https://${page.url.host}/api/oidc/token`,
-		[m.userinfo_url()]: `https://${page.url.host}/api/oidc/userinfo`,
-		[m.logout_url()]: `https://${page.url.host}/api/oidc/end-session`,
-		[m.certificate_url()]: `https://${page.url.host}/.well-known/jwks.json`,
+		[m.issuer_url()]: data.oidcConfiguration.issuer,
+		[m.authorization_url()]: data.oidcConfiguration.authorization_endpoint,
+		[m.oidc_discovery_url()]: `${data.oidcConfiguration.issuer}/.well-known/openid-configuration`,
+		[m.token_url()]: data.oidcConfiguration.token_endpoint,
+		[m.userinfo_url()]: data.oidcConfiguration.userinfo_endpoint,
+		[m.logout_url()]: data.oidcConfiguration.end_session_endpoint,
+		[m.certificate_url()]: data.oidcConfiguration.jwks_uri,
 		[m.pkce()]: client.pkceEnabled ? m.enabled() : m.disabled(),
 		[m.requires_reauthentication()]: client.requiresReauthentication ? m.enabled() : m.disabled(),
 		[m.requires_pushed_authorization_requests()]: client.requiresPushedAuthorizationRequests
diff --git a/frontend/src/routes/settings/admin/oidc-clients/[id]/+page.ts b/frontend/src/routes/settings/admin/oidc-clients/[id]/+page.ts
index ef8465b6..456107b0 100644
--- a/frontend/src/routes/settings/admin/oidc-clients/[id]/+page.ts
+++ b/frontend/src/routes/settings/admin/oidc-clients/[id]/+page.ts
@@ -1,16 +1,28 @@
 import OidcService from '$lib/services/oidc-service';
+import type { OidcDiscoveryConfiguration } from '$lib/types/oidc.type';
 import type { PageLoad } from './$types';
 
-export const load: PageLoad = async ({ params }) => {
+export const load: PageLoad = async ({ fetch, params }) => {
 	const oidcService = new OidcService();
 
-	const client = await oidcService.getClient(params.id);
-	const scimServiceProvider = await oidcService
+	const clientPromise = oidcService.getClient(params.id);
+	const scimServiceProviderPromise = oidcService
 		.getScimResourceProvider(params.id)
 		.then((p) => p)
 		.catch(() => undefined);
+	const oidcConfigurationPromise = fetch('/.well-known/openid-configuration').then(
+		(response) => response.json() as Promise<OidcDiscoveryConfiguration>
+	);
+
+	const [client, scimServiceProvider, oidcConfiguration] = await Promise.all([
+		clientPromise,
+		scimServiceProviderPromise,
+		oidcConfigurationPromise
+	]);
+
 	return {
 		client,
-		scimServiceProvider
+		scimServiceProvider,
+		oidcConfiguration
 	};
 };
diff --git a/tests/specs/oidc-client-settings.spec.ts b/tests/specs/oidc-client-settings.spec.ts
index 577b7124..a7001c38 100644
--- a/tests/specs/oidc-client-settings.spec.ts
+++ b/tests/specs/oidc-client-settings.spec.ts
@@ -89,6 +89,27 @@ test('Edit OIDC client', async ({ page }) => {
 		.then((res) => expect.soft(res.status()).toBe(200));
 });
 
+test('Displays OIDC client endpoints from discovery configuration', async ({ page }) => {
+	const oidcConfiguration = {
+		issuer: 'https://id.example.com',
+		authorization_endpoint: 'https://id.example.com/authorize',
+		token_endpoint: 'http://pocket-id:1411/api/oidc/token',
+		userinfo_endpoint: 'http://pocket-id:1411/api/oidc/userinfo',
+		end_session_endpoint: 'https://id.example.com/api/oidc/end-session',
+		jwks_uri: 'http://pocket-id:1411/.well-known/jwks.json'
+	};
+
+	await page.route('**/.well-known/openid-configuration', async (route) => {
+		await route.fulfill({ json: oidcConfiguration });
+	});
+	await page.goto(`/settings/admin/oidc-clients/${oidcClients.nextcloud.id}`);
+	await page.getByRole('button', { name: 'Show more details' }).click();
+
+	await expect(page.getByText(oidcConfiguration.token_endpoint, { exact: true })).toBeVisible();
+	await expect(page.getByText(oidcConfiguration.userinfo_endpoint, { exact: true })).toBeVisible();
+	await expect(page.getByText(oidcConfiguration.jwks_uri, { exact: true })).toBeVisible();
+});
+
 test('Create new OIDC client secret', async ({ page }) => {
 	const oidcClient = oidcClients.nextcloud;
 	await page.goto(`/settings/admin/oidc-clients/${oidcClient.id}`);