matrix-js-sdk 41.9.0 → 42.0.0

package/lib/client.js

@@ -73,7 +73,7 @@ import { getRelationsThreadFilter } from "./thread-utils.js";
 import { KnownMembership } from "./@types/membership.js";
 import { ServerCapabilities } from "./serverCapabilities.js";
 import { sha256 } from "./digest.js";
-import { discoverAndValidateOIDCIssuerWellKnown, validateAuthMetadataAndKeys } from "./oidc/index.js";
+import { OAuth2Error, isValidAuthMetadata } from "./oauth/index.js";
 import { UnsupportedDelayedEventsEndpointError, UnsupportedStickyEventsEndpointError } from "./errors.js";
 import { RetentionPolicyService } from "./retentionPolicy.js";
 const SCROLLBACK_DELAY_MS = 3000;
@@ -6921,33 +6921,21 @@ export class MatrixClient extends TypedEventEmitter {
   /**
    * Discover and validate the auth metadata for the OAuth 2.0 API.
    *
-   * Fetches /auth_metadata falling back to legacy implementation using /auth_issuer followed by
-   * https://oidc-issuer.example.com/.well-known/openid-configuration and other files linked therein.
    * When successful, validated metadata is returned.
    *
-   * @returns validated authentication metadata and optionally signing keys
+   * @returns validated authentication metadata
    * @throws when delegated auth config is invalid or unreachable
    */
   async getAuthMetadata() {
-    let authMetadata;
-    try {
-      const useStable = await this.isVersionSupported("v1.15");
-      authMetadata = await this.http.request(Method.Get, "/auth_metadata", undefined, undefined, {
-        prefix: useStable ? ClientPrefix.V1 : ClientPrefix.Unstable + "/org.matrix.msc2965"
-      });
-    } catch (e) {
-      if (e instanceof MatrixError && e.errcode === "M_UNRECOGNIZED") {
-        // Fall back to older variant of MSC2965
-        const {
-          issuer
-        } = await this.http.request(Method.Get, "/auth_issuer", undefined, undefined, {
-          prefix: ClientPrefix.Unstable + "/org.matrix.msc2965"
-        });
-        return discoverAndValidateOIDCIssuerWellKnown(issuer);
-      }
-      throw e;
+    const useStable = await this.isVersionSupported("v1.15");
+    const authMetadata = await this.http.request(Method.Get, "/auth_metadata", undefined, undefined, {
+      prefix: useStable ? ClientPrefix.V1 : ClientPrefix.Unstable + "/org.matrix.msc2965"
+    });
+    if (isValidAuthMetadata(authMetadata)) {
+      return authMetadata;
     }
-    return validateAuthMetadataAndKeys(authMetadata);
+    logger.error("Issuer configuration not valid");
+    throw new Error(OAuth2Error.OpSupport);
   }
 }
 _defineProperty(MatrixClient, "RESTORE_BACKUP_ERROR_BAD_KEY", "RESTORE_BACKUP_ERROR_BAD_KEY");