From 787d1e1aafeb53f474e1069b39fa40ed5326c2f3 Mon Sep 17 00:00:00 2001 From: 7w1 Date: Sat, 25 Jul 2026 16:32:23 -0500 Subject: [PATCH] fix: ensure correct url for acccount management --- .../settings/devices/OtherDevices.tsx | 10 +++++-- .../settings/devices/Verification.tsx | 8 ++++- src/app/hooks/useAccountManagement.test.ts | 30 +++++++++++++++++++ src/app/hooks/useAccountManagement.ts | 5 ++-- 4 files changed, 48 insertions(+), 5 deletions(-) create mode 100644 src/app/hooks/useAccountManagement.test.ts diff --git a/src/app/features/settings/devices/OtherDevices.tsx b/src/app/features/settings/devices/OtherDevices.tsx index 117bc77a8..78877a492 100644 --- a/src/app/features/settings/devices/OtherDevices.tsx +++ b/src/app/features/settings/devices/OtherDevices.tsx @@ -62,7 +62,12 @@ export function OtherDevices({ devices, refreshDeviceList, showVerification }: O const [deleted, setDeleted] = useState(new Set()); const handleDashboardOIDC = useCallback(() => { - const url = getAccountManagementUrl(authMetadata, accountManagementActions.sessionsList); + const url = getAccountManagementUrl( + authMetadata, + accountManagementActions.sessionsList, + undefined, + mx.getHomeserverUrl() + ); if (!url) return; if (isTauri()) { import('@tauri-apps/plugin-opener') @@ -78,7 +83,8 @@ export function OtherDevices({ devices, refreshDeviceList, showVerification }: O const url = getAccountManagementUrl( authMetadata, accountManagementActions.sessionEnd, - deviceId + deviceId, + mx.getHomeserverUrl() ); if (!url) return; if (isTauri()) { diff --git a/src/app/features/settings/devices/Verification.tsx b/src/app/features/settings/devices/Verification.tsx index b50b01fca..990ca7aad 100644 --- a/src/app/features/settings/devices/Verification.tsx +++ b/src/app/features/settings/devices/Verification.tsx @@ -257,6 +257,7 @@ export function EnableVerification({ visible }: EnableVerificationProps) { export function DeviceVerificationOptions() { const [menuCords, setMenuCords] = useState(); const authMetadata = useAuthMetadata(); + const mx = useMatrixClient(); const accountManagementActions = useAccountManagementActions(); const [reset, setReset] = useState(false); @@ -272,7 +273,12 @@ export function DeviceVerificationOptions() { const handleReset = () => { setMenuCords(undefined); - const url = getAccountManagementUrl(authMetadata, accountManagementActions.crossSigningReset); + const url = getAccountManagementUrl( + authMetadata, + accountManagementActions.crossSigningReset, + undefined, + mx.getHomeserverUrl() + ); if (url) { if (isTauri()) { import('@tauri-apps/plugin-opener') diff --git a/src/app/hooks/useAccountManagement.test.ts b/src/app/hooks/useAccountManagement.test.ts new file mode 100644 index 000000000..a318da56e --- /dev/null +++ b/src/app/hooks/useAccountManagement.test.ts @@ -0,0 +1,30 @@ +import { describe, expect, it } from 'vitest'; +import type { ValidatedAuthMetadata } from '$types/matrix-sdk'; +import { getAccountManagementUrl } from './useAccountManagement'; + +const metadata = { + issuer: 'https://auth.example', + authorization_endpoint: 'https://auth.example/authorize', + token_endpoint: 'https://auth.example/token', + registration_endpoint: 'https://auth.example/register', + revocation_endpoint: 'https://auth.example/revoke', + response_types_supported: ['code'], + response_modes_supported: ['query', 'fragment'], + grant_types_supported: ['authorization_code', 'refresh_token'], + code_challenge_methods_supported: ['S256'], + account_management_uri: '/_continuwuity/', + account_management_actions_supported: ['org.matrix.devices_list'], +} as ValidatedAuthMetadata; + +describe('getAccountManagementUrl', () => { + it('resolves account paths against the discovered homeserver URL', () => { + expect( + getAccountManagementUrl( + metadata, + 'org.matrix.devices_list', + undefined, + 'https://actual-homeserver.example/matrix' + ) + ).toBe('https://actual-homeserver.example/_continuwuity/?action=org.matrix.devices_list'); + }); +}); diff --git a/src/app/hooks/useAccountManagement.ts b/src/app/hooks/useAccountManagement.ts index 4e10c4287..4456ec899 100644 --- a/src/app/hooks/useAccountManagement.ts +++ b/src/app/hooks/useAccountManagement.ts @@ -4,11 +4,12 @@ import type { ValidatedAuthMetadata } from '$types/matrix-sdk'; export const getAccountManagementUrl = ( metadata: ValidatedAuthMetadata | undefined, action: string, - deviceId?: string + deviceId?: string, + homeserverUrl?: string ): string | undefined => { if (!metadata?.account_management_uri) return undefined; - const url = new URL(metadata.account_management_uri); + const url = new URL(metadata.account_management_uri, homeserverUrl); if (metadata.account_management_actions_supported?.includes(action)) { url.searchParams.set('action', action); if (deviceId) url.searchParams.set('device_id', deviceId);