Iterate

Signed-off-by: Michael Telatynski <[email protected]>
matrix-org · Jan 17, 2025 · 1fe7e9b · 1fe7e9b
1 parent 6111f7c
commit 1fe7e9b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/spec/integ/rendezvous/MSC4108SignInWithQR.spec.ts b/spec/integ/rendezvous/MSC4108SignInWithQR.spec.ts
@@ -36,7 +36,7 @@ import {
     MatrixError,
     MatrixHttpApi,
 } from "../../../src";
-import { mockOpenIdConfiguration } from "../../test-utils/oidc";
+import { makeDelegatedAuthConfig } from "../../test-utils/oidc";
 
 function makeMockClient(opts: { userId: string; deviceId: string; msc4108Enabled: boolean }): MatrixClient {
     const baseUrl = "https://example.com";
@@ -57,7 +57,7 @@ function makeMockClient(opts: { userId: string; deviceId: string; msc4108Enabled
         getDomain: () => "example.com",
         getDevice: jest.fn(),
         getCrypto: jest.fn(() => crypto),
-        getAuthIssuer: jest.fn().mockResolvedValue({ issuer: "https://issuer/" }),
+        getAuthMetadata: jest.fn().mockResolvedValue(makeDelegatedAuthConfig("https://issuer/", [DEVICE_CODE_SCOPE])),
     } as unknown as MatrixClient;
     client.http = new MatrixHttpApi<IHttpOpts & { onlyData: true }>(client, {
         baseUrl: client.baseUrl,
@@ -69,10 +69,6 @@ function makeMockClient(opts: { userId: string; deviceId: string; msc4108Enabled
 
 describe("MSC4108SignInWithQR", () => {
     beforeEach(() => {
-        fetchMock.get(
-            "https://issuer/.well-known/openid-configuration",
-            mockOpenIdConfiguration("https://issuer/", [DEVICE_CODE_SCOPE]),
-        );
         fetchMock.get("https://issuer/jwks", {
             status: 200,
             headers: {

diff --git a/spec/test-utils/oidc.ts b/spec/test-utils/oidc.ts
@@ -19,10 +19,14 @@ import { OidcClientConfig, ValidatedIssuerMetadata } from "../../src";
 /**
  * Makes a valid OidcClientConfig with minimum valid values
  * @param issuer used as the base for all other urls
+ * @param additionalGrantTypes to add to the default grant types
  * @returns OidcClientConfig
  */
-export const makeDelegatedAuthConfig = (issuer = "https://auth.org/"): OidcClientConfig => {
-    const metadata = mockOpenIdConfiguration(issuer);
+export const makeDelegatedAuthConfig = (
+    issuer = "https://auth.org/",
+    additionalGrantTypes: string[] = [],
+): OidcClientConfig => {
+    const metadata = mockOpenIdConfiguration(issuer, additionalGrantTypes);
 
     return {
         issuer,
@@ -37,6 +41,7 @@ export const makeDelegatedAuthConfig = (issuer = "https://auth.org/"): OidcClien
 /**
  * Useful for mocking <issuer>/.well-known/openid-configuration
  * @param issuer used as the base for all other urls
+ * @param additionalGrantTypes to add to the default grant types
  * @returns ValidatedIssuerMetadata
  */
 export const mockOpenIdConfiguration = (