Update MSC2965 OIDC Discovery implementation (#12245)

Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>

test/components/structures/MatrixChat-test.tsx

@@ -211,6 +211,11 @@ describe("<MatrixChat />", () => {
             unstable_features: {},
             versions: SERVER_SUPPORTED_MATRIX_VERSIONS,
         });
+        fetchMock.catch({
+            status: 404,
+            body: '{"errcode": "M_UNRECOGNIZED", "error": "Unrecognized request"}',
+            headers: { "content-type": "application/json" },
+        });
 
         jest.spyOn(StorageManager, "idbLoad").mockReset();
         jest.spyOn(StorageManager, "idbSave").mockResolvedValue(undefined);

test/components/structures/auth/Registration-test.tsx

@@ -37,7 +37,6 @@ jest.mock("matrix-js-sdk/src/matrix", () => ({
     ...jest.requireActual("matrix-js-sdk/src/matrix"),
     createClient: jest.fn(),
 }));
-jest.useFakeTimers();
 
 /** The matrix versions our mock server claims to support */
 const SERVER_SUPPORTED_MATRIX_VERSIONS = ["v1.1", "v1.5", "v1.6", "v1.8", "v1.9"];
@@ -160,11 +159,17 @@ describe("Registration", function () {
             // mock a statically registered client to avoid dynamic registration
             SdkConfig.put({
                 oidc_static_clients: {
-                    [authConfig.issuer]: {
+                    [authConfig.metadata.issuer]: {
                         client_id: clientId,
                     },
                 },
             });
+
+            fetchMock.get(`${defaultHsUrl}/_matrix/client/unstable/org.matrix.msc2965/auth_issuer`, {
+                issuer: authConfig.metadata.issuer,
+            });
+            fetchMock.get("https://auth.org/.well-known/openid-configuration", authConfig.metadata);
+            fetchMock.get(authConfig.metadata.jwks_uri!, { keys: [] });
         });
 
         describe("when oidc native flow is not enabled in settings", () => {
@@ -192,14 +197,14 @@ describe("Registration", function () {
                 // no form
                 expect(container.querySelector("form")).toBeFalsy();
 
-                expect(screen.getByText("Continue")).toBeTruthy();
+                expect(await screen.findByText("Continue")).toBeTruthy();
             });
 
             it("should start OIDC login flow as registration on button click", async () => {
                 getComponent(defaultHsUrl, defaultIsUrl, authConfig);
                 await waitForElementToBeRemoved(() => screen.queryAllByLabelText("Loading…"));
 
-                fireEvent.click(screen.getByText("Continue"));
+                fireEvent.click(await screen.findByText("Continue"));
 
                 expect(startOidcLogin).toHaveBeenCalledWith(
                     authConfig,

test/components/views/dialogs/ServerPickerDialog-test.tsx

@@ -64,6 +64,11 @@ describe("<ServerPickerDialog />", () => {
         });
 
         fetchMock.resetHistory();
+        fetchMock.catch({
+            status: 404,
+            body: '{"errcode": "M_UNRECOGNIZED", "error": "Unrecognized request"}',
+            headers: { "content-type": "application/json" },
+        });
     });
 
     it("should render dialog", () => {