SERVER-56550 Require consistent API params in getMore and txns

Transaction-continuing commands must use the same API parameters as the
transaction's first command (it is no longer optional), and similarly
getMore must use the same as the cursor-creating command.

2 files changed, 7 insertions, 16 deletions

diff --git a/src/mongo/db/commands/getmore_cmd.cpp b/src/mongo/db/commands/getmore_cmd.cpp
index 9624761a5e9..1772d5b3a25 100644
--- a/src/mongo/db/commands/getmore_cmd.cpp
+++ b/src/mongo/db/commands/getmore_cmd.cpp
@@ -225,18 +225,11 @@ void setUpOperationContextStateForGetMore(OperationContext* opCtx,
     opCtx->setWriteConcern(cursor.getWriteConcernOptions());
 
     auto apiParamsFromClient = APIParameters::get(opCtx);
-    // TODO (SERVER-56550): Do this check even if !apiParamsFromClient.getParamsPassed().
-    if (apiParamsFromClient.getParamsPassed()) {
-        uassert(
-            ErrorCodes::APIMismatchError,
-            "API param conflict: getMore used params {}, the cursor-creating command used {}"_format(
-                apiParamsFromClient.toBSON().toString(),
-                cursor.getAPIParameters().toBSON().toString()),
-            apiParamsFromClient == cursor.getAPIParameters());
-    }
-
-    // TODO (SERVER-56550): Remove.
-    APIParameters::get(opCtx) = cursor.getAPIParameters();
+    uassert(
+        ErrorCodes::APIMismatchError,
+        "API parameter mismatch: getMore used params {}, the cursor-creating command used {}"_format(
+            apiParamsFromClient.toBSON().toString(), cursor.getAPIParameters().toBSON().toString()),
+        apiParamsFromClient == cursor.getAPIParameters());
 
     setUpOperationDeadline(opCtx, cursor, cmd, disableAwaitDataFailpointActive);
 
diff --git a/src/mongo/db/commands/user_management_commands.cpp b/src/mongo/db/commands/user_management_commands.cpp
index d8c7582ad16..9c42dec4997 100644
--- a/src/mongo/db/commands/user_management_commands.cpp
+++ b/src/mongo/db/commands/user_management_commands.cpp
@@ -885,10 +885,8 @@ private:
             _sessionInfo.serialize(cmdBuilder);
         }
 
-        if (_state == TransactionState::kInit || !_isReplSet) {
-            // Set a default apiVersion for all UMC commands
-            cmdBuilder->append("apiVersion", kOne);
-        }
+        // Set a default apiVersion for all UMC commands
+        cmdBuilder->append("apiVersion", kOne);
 
         auto svcCtx = _client->getServiceContext();
         auto sep = svcCtx->getServiceEntryPoint();