From 5d9bb59e18d0d1bf76afe0119f3856a840ea10c5 Mon Sep 17 00:00:00 2001
From: Durran Jordan <durran@gmail.com>
Date: Thu, 8 Feb 2024 00:42:13 +0100
Subject: [PATCH] test: sync auth spec tests

---
 test/spec/auth/legacy/connection-string.json | 75 +++-----------------
 test/spec/auth/legacy/connection-string.yml  | 49 ++++---------
 2 files changed, 26 insertions(+), 98 deletions(-)

diff --git a/test/spec/auth/legacy/connection-string.json b/test/spec/auth/legacy/connection-string.json
index 2a7a0b0dc5c..982edb8b36a 100644
--- a/test/spec/auth/legacy/connection-string.json
+++ b/test/spec/auth/legacy/connection-string.json
@@ -480,54 +480,9 @@
           "AWS_SESSION_TOKEN": "token!@#$%^&*()_+"
         }
       }
-    },
-     {
-      "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": {
-            "OIDC_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": {
-            "OIDC_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": {
-            "OIDC_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": {
@@ -536,12 +491,12 @@
         "source": "$external",
         "mechanism": "MONGODB-OIDC",
         "mechanism_properties": {
-            "PROVIDER_NAME": "aws"
+          "PROVIDER_NAME": "aws"
         }
       }
     },
     {
-      "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": {
@@ -550,39 +505,31 @@
         "source": "$external",
         "mechanism": "MONGODB-OIDC",
         "mechanism_properties": {
-            "PROVIDER_NAME": "aws"
+          "PROVIDER_NAME": "aws"
         }
       }
     },
     {
-      "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",
-      "valid": false,
-      "credential": null
-    },
-    {
-      "description": "should throw an exception if neither deviceName nor callbacks specified (MONGODB-OIDC)",
-      "uri": "mongodb://localhost/?authMechanism=MONGODB-OIDC",
+      "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 when only refresh callback is specified (MONGODB-OIDC)",
+      "description": "should throw an exception if neither provider nor callbacks specified (MONGODB-OIDC)",
       "uri": "mongodb://localhost/?authMechanism=MONGODB-OIDC",
-      "callback": ["oidcRefresh"],
       "valid": false,
       "credential": null
     },
diff --git a/test/spec/auth/legacy/connection-string.yml b/test/spec/auth/legacy/connection-string.yml
index 096b848fd6d..d2658e0309b 100644
--- a/test/spec/auth/legacy/connection-string.yml
+++ b/test/spec/auth/legacy/connection-string.yml
@@ -350,10 +350,8 @@ tests:
     mechanism: MONGODB-AWS
     mechanism_properties:
       AWS_SESSION_TOKEN: token!@#$%^&*()_+
-- description: should recognise the mechanism and request callback (MONGODB-OIDC)
-  uri: mongodb://localhost/?authMechanism=MONGODB-OIDC
-  callback:
-  - oidcRequest
+- description: should recognise the mechanism with aws provider (MONGODB-OIDC)
+  uri: mongodb://localhost/?authMechanism=MONGODB-OIDC&authMechanismProperties=PROVIDER_NAME:aws
   valid: true
   credential:
     username:
@@ -361,12 +359,9 @@ tests:
     source: "$external"
     mechanism: MONGODB-OIDC
     mechanism_properties:
-      OIDC_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
+      PROVIDER_NAME: aws
+- 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:
     username:
@@ -374,38 +369,24 @@ tests:
     source: "$external"
     mechanism: MONGODB-OIDC
     mechanism_properties:
-      OIDC_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
+      PROVIDER_NAME: aws
+- 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:
-    username: principalName
-    password:
-    source: "$external"
-    mechanism: MONGODB-OIDC
-    mechanism_properties:
-      OIDC_TOKEN_CALLBACK: true
-- description: should throw an exception if username and password are specified (MONGODB-OIDC)
-  uri: mongodb://user:pass@localhost/?authMechanism=MONGODB-OID
-  callback:
-  - oidcRequest
+- 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:
-- description: should throw an exception if neither deviceName nor callbacks specified
-    (MONGODB-OIDC)
-  uri: mongodb://localhost/?authMechanism=MONGODB-OIDC
+- 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:
-- description: should throw an exception when only refresh callback is specified (MONGODB-OIDC)
+- description: should throw an exception if neither provider nor callbacks specified (MONGODB-OIDC)
   uri: mongodb://localhost/?authMechanism=MONGODB-OIDC
-  callback:
-  - oidcRefresh
   valid: false
   credential:
-- description: should throw an exception when unsupported auth property is specified
-    (MONGODB-OIDC)
+- 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: