Merge pull request modelcontextprotocol#788 from modelcontextprotocol/davidsp/revert-677

Revert "feat: enhance auth server discovery with OAuth2 and OpenID metadata support"

Author: ihrpr

docs/specification/draft/basic/authorization.mdx

@@ -63,12 +63,9 @@ specifies how an MCP server indicates the location of its corresponding authoriz
 1. MCP servers **MUST** implement OAuth 2.0 Protected Resource Metadata ([RFC9728](https://datatracker.ietf.org/doc/html/rfc9728)).
    MCP clients **MUST** use OAuth 2.0 Protected Resource Metadata for authorization server discovery.
 
-1. Authorization servers **MUST** provide _at least one_ of the following discovery mechanisms:
-
-   - OAuth 2.0 Authorization Server Metadata ([RFC8414](https://datatracker.ietf.org/doc/html/rfc8414))
-   - [OpenID Connect Discovery 1.0](https://openid.net/specs/openid-connect-discovery-1_0-final.html)
-
-   MCP clients **MUST** support both discovery mechanisms to obtain the information required to interact with the authorization server.
+1. MCP authorization servers **MUST** provide OAuth 2.0 Authorization
+   Server Metadata ([RFC8414](https://datatracker.ietf.org/doc/html/rfc8414)).
+   MCP clients **MUST** use the OAuth 2.0 Authorization Server Metadata.
 
 ### Authorization Server Discovery
 
@@ -94,6 +91,11 @@ as described in [RFC9728 Section 5.1 "WWW-Authenticate Response"](https://datatr
 
 MCP clients **MUST** be able to parse `WWW-Authenticate` headers and respond appropriately to `HTTP 401 Unauthorized` responses from the MCP server.
 
+#### Server Metadata Discovery
+
+MCP clients **MUST** follow the OAuth 2.0 Authorization Server Metadata [RFC8414](https://datatracker.ietf.org/doc/html/rfc8414)
+specification to obtain the information required to interact with the authorization server.
+
 #### Sequence Diagram
 
 The following diagram outlines an example flow:
@@ -112,11 +114,7 @@ sequenceDiagram
     M-->>C: Resource metadata with authorization server URL
     Note over C: Validate RS metadata,<br />build AS metadata URL
 
-    alt OAuth 2.0 Authorization Server Metadata
-        C->>A: GET /.well-known/oauth-authorization-server
-    else OpenID Connect Discovery
-        C->>A: GET /.well-known/openid-configuration
-    end
+    C->>A: GET /.well-known/oauth-authorization-server
     A-->>C: Authorization server metadata
 
     Note over C,A: OAuth 2.1 authorization flow happens here
@@ -172,11 +170,7 @@ sequenceDiagram
 
     Note over C: Parse metadata and extract authorization server(s)<br/>Client determines AS to use
 
-    alt OAuth 2.0 Authorization Server Metadata
-        C->>A: GET /.well-known/oauth-authorization-server
-    else OpenID Connect Discovery
-        C->>A: GET /.well-known/openid-configuration
-    end
+    C->>A: GET /.well-known/oauth-authorization-server
     A->>C: Authorization server metadata response
 
     alt Dynamic client registration