From 282d71730b1d2903620dc2eb21c56b51ddb715be Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Fri, 23 Feb 2024 16:43:07 +0000 Subject: [PATCH] Gather validated OIDC config during autodiscovery (#27047) --- src/vector/app.tsx | 2 +- test/app-tests/loading-test.tsx | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/vector/app.tsx b/src/vector/app.tsx index 68dd8229a2..afcb58d931 100644 --- a/src/vector/app.tsx +++ b/src/vector/app.tsx @@ -199,7 +199,7 @@ async function verifyServerConfig(): Promise { } } - validatedConfig = AutoDiscoveryUtils.buildValidatedConfigFromDiscovery(serverName, discoveryResult, true); + validatedConfig = await AutoDiscoveryUtils.buildValidatedConfigFromDiscovery(serverName, discoveryResult, true); } catch (e) { const { hsUrl, isUrl, userId } = await Lifecycle.getStoredSessionVars(); if (hsUrl && userId) { diff --git a/test/app-tests/loading-test.tsx b/test/app-tests/loading-test.tsx index 2eee6a251c..fffdd95945 100644 --- a/test/app-tests/loading-test.tsx +++ b/test/app-tests/loading-test.tsx @@ -223,6 +223,9 @@ describe("loading:", function () { // Pass the liveliness checks httpBackend.when("GET", "/versions").respond(200, { versions: SERVER_SUPPORTED_MATRIX_VERSIONS }); httpBackend.when("GET", "/_matrix/identity/v2").respond(200, {}); + httpBackend + .when("GET", "/_matrix/client/unstable/org.matrix.msc2965/auth_issuer") + .respond(404, { errcode: "M_UNRECOGNIZED", error: "Unrecognized request" }); return sleep(1) .then(async () => {