SERVER-44264 Add IAM client code to shell and clients

1 files changed, 9 insertions, 2 deletions

diff --git a/src/mongo/client/sasl_client_authenticate_impl.cpp b/src/mongo/client/sasl_client_authenticate_impl.cpp
index 4d19e5597d2..8a5794f95e0 100644
--- a/src/mongo/client/sasl_client_authenticate_impl.cpp
+++ b/src/mongo/client/sasl_client_authenticate_impl.cpp
@@ -144,9 +144,11 @@ Status configureSession(SaslClientSession* session,
     session->setParameter(SaslClientSession::parameterServiceHostAndPort, hostname.toString());
 
     status = bsonExtractStringField(saslParameters, saslCommandUserFieldName, &value);
-    if (!status.isOK())
+    if (status.isOK()) {
+        session->setParameter(SaslClientSession::parameterUser, value);
+    } else if ((targetDatabase != "$external") || (mechanism != "MONGODB-IAM")) {
         return status;
-    session->setParameter(SaslClientSession::parameterUser, value);
+    }
 
     const bool digestPasswordDefault = (mechanism == "SCRAM-SHA-1");
     bool digestPassword;
@@ -163,6 +165,11 @@ Status configureSession(SaslClientSession* session,
         return status;
     }
 
+    status = bsonExtractStringField(saslParameters, saslCommandIamSessionToken, &value);
+    if (status.isOK()) {
+        session->setParameter(SaslClientSession::parameterIamSessionToken, value);
+    }
+
     return session->initialize();
 }