Conform to latest spec; remove lock around server auth

Author: katcharov

Diff for: driver-core/src/main/com/mongodb/MongoCredential.java

@@ -187,7 +187,7 @@ public final class MongoCredential {
      * The provider name. The value must be a string.
      * <p>
      * If this is provided,
-     * {@link MongoCredential#REQUEST_TOKEN_CALLBACK_KEY}
+     * {@link MongoCredential#OIDC_CALLBACK_KEY}
      * must not be provided.
      *
      * @see #createOidcCredential(String)
@@ -206,7 +206,7 @@ public final class MongoCredential {
      * @see #createOidcCredential(String)
      * @since 4.10
      */
-    public static final String REQUEST_TOKEN_CALLBACK_KEY = "REQUEST_TOKEN_CALLBACK";
+    public static final String OIDC_CALLBACK_KEY = "OIDC_CALLBACK";
 
     /**
      * Creates a MongoCredential instance with an unspecified mechanism.  The client will negotiate the best mechanism based on the
@@ -364,7 +364,7 @@ public static MongoCredential createAwsCredential(@Nullable final String userNam
      * @since 4.10
      * @see #withMechanismProperty(String, Object)
      * @see #PROVIDER_NAME_KEY
-     * @see #REQUEST_TOKEN_CALLBACK_KEY
+     * @see #OIDC_CALLBACK_KEY
      * @mongodb.server.release 7.0
      */
     public static MongoCredential createOidcCredential(@Nullable final String userName) {
@@ -602,6 +602,11 @@ public interface OidcRequestContext {
          * @return The timeout that this callback must complete within.
          */
         Duration getTimeout();
+
+        /**
+         * @return The OIDC callback version.
+         */
+        int getVersion();
     }
 
     /**

Diff for: driver-core/src/main/com/mongodb/internal/connection/OidcAuthenticator.java

@@ -446,52 +446,7 @@
       }
     },
     {
-      "description": "should recognise the mechanism and request callback (MONGODB-OIDC)",
-      "uri": "mongodb://localhost/?authMechanism=MONGODB-OIDC",
-      "callback": ["oidcRequest"],
-      "valid": true,
-      "credential": {
-        "username": null,
-        "password": null,
-        "source": "$external",
-        "mechanism": "MONGODB-OIDC",
-        "mechanism_properties": {
-          "REQUEST_TOKEN_CALLBACK": true
-        }
-      }
-    },
-    {
-      "description": "should recognise the mechanism when auth source is explicitly specified and with request callback (MONGODB-OIDC)",
-      "uri": "mongodb://localhost/?authMechanism=MONGODB-OIDC&authSource=$external",
-      "callback": ["oidcRequest"],
-      "valid": true,
-      "credential": {
-        "username": null,
-        "password": null,
-        "source": "$external",
-        "mechanism": "MONGODB-OIDC",
-        "mechanism_properties": {
-          "REQUEST_TOKEN_CALLBACK": true
-        }
-      }
-    },
-    {
-      "description": "should recognise the mechanism and username with request callback (MONGODB-OIDC)",
-      "uri": "mongodb://principalName@localhost/?authMechanism=MONGODB-OIDC",
-      "callback": ["oidcRequest"],
-      "valid": true,
-      "credential": {
-        "username": "principalName",
-        "password": null,
-        "source": "$external",
-        "mechanism": "MONGODB-OIDC",
-        "mechanism_properties": {
-          "REQUEST_TOKEN_CALLBACK": true
-        }
-      }
-    },
-    {
-      "description": "should recognise the mechanism with aws device (MONGODB-OIDC)",
+      "description": "should recognise the mechanism with aws provider (MONGODB-OIDC)",
       "uri": "mongodb://localhost/?authMechanism=MONGODB-OIDC&authMechanismProperties=PROVIDER_NAME:aws",
       "valid": true,
       "credential": {
@@ -505,7 +460,7 @@
       }
     },
     {
-      "description": "should recognise the mechanism when auth source is explicitly specified and with aws device (MONGODB-OIDC)",
+      "description": "should recognise the mechanism when auth source is explicitly specified and with provider (MONGODB-OIDC)",
       "uri": "mongodb://localhost/?authMechanism=MONGODB-OIDC&authSource=$external&authMechanismProperties=PROVIDER_NAME:aws",
       "valid": true,
       "credential": {
@@ -519,42 +474,34 @@
       }
     },
     {
-      "description": "should throw an exception if username and password are specified (MONGODB-OIDC)",
-      "uri": "mongodb://user:pass@localhost/?authMechanism=MONGODB-OIDC",
-      "callback": ["oidcRequest"],
+      "description": "should throw an exception if supplied a password (MONGODB-OIDC)",
+      "uri": "mongodb://user:pass@localhost/?authMechanism=MONGODB-OIDC&authMechanismProperties=PROVIDER_NAME:aws",
       "valid": false,
       "credential": null
     },
     {
-      "description": "should throw an exception if username and deviceName are specified (MONGODB-OIDC)",
-      "uri": "mongodb://principalName@localhost/?authMechanism=MONGODB-OIDC&PROVIDER_NAME:gcp",
+      "description": "should throw an exception if username is specified for aws (MONGODB-OIDC)",
+      "uri": "mongodb://principalName@localhost/?authMechanism=MONGODB-OIDC&PROVIDER_NAME:aws",
       "valid": false,
       "credential": null
     },
     {
-      "description": "should throw an exception if specified deviceName is not supported (MONGODB-OIDC)",
-      "uri": "mongodb://localhost/?authMechanism=MONGODB-OIDC&authMechanismProperties=PROVIDER_NAME:unexisted",
+      "description": "should throw an exception if specified provider is not supported (MONGODB-OIDC)",
+      "uri": "mongodb://localhost/?authMechanism=MONGODB-OIDC&authMechanismProperties=PROVIDER_NAME:invalid",
       "valid": false,
       "credential": null
     },
     {
-      "description": "should throw an exception if neither deviceName nor callbacks specified (MONGODB-OIDC)",
+      "description": "should throw an exception if neither provider nor callbacks specified (MONGODB-OIDC)",
       "uri": "mongodb://localhost/?authMechanism=MONGODB-OIDC",
       "valid": false,
       "credential": null
     },
-    {
-      "description": "should throw an exception if provider name and request callback are specified",
-      "uri": "mongodb://localhost/?authMechanism=MONGODB-OIDC&authMechanismProperties=PROVIDER_NAME:aws",
-      "callback": ["oidcRequest"],
-      "valid": false,
-      "credential": null
-    },
     {
       "description": "should throw an exception when unsupported auth property is specified (MONGODB-OIDC)",
       "uri": "mongodb://localhost/?authMechanism=MONGODB-OIDC&authMechanismProperties=UnsupportedProperty:unexisted",
       "valid": false,
       "credential": null
     }
   ]
-}
+}