Revert "SERVER-70700 Use UserRequest to in authorization workflow"

This reverts commit 8728459da343c79cc2f8157856a5b8e03c1bfdf1.

3 files changed, 8 insertions, 5 deletions

diff --git a/src/mongo/db/session/SConscript b/src/mongo/db/session/SConscript
index a0021e3ac81..9862c8a660b 100644
--- a/src/mongo/db/session/SConscript
+++ b/src/mongo/db/session/SConscript
@@ -155,7 +155,6 @@ env.Library(
         '$BUILD_DIR/mongo/db/api_parameters',
         '$BUILD_DIR/mongo/db/auth/auth',
         '$BUILD_DIR/mongo/db/auth/authprivilege',
-        '$BUILD_DIR/mongo/db/auth/user',
         '$BUILD_DIR/mongo/idl/idl_parser',
         '$BUILD_DIR/mongo/rpc/client_metadata',
         'logical_session_id_helpers',
diff --git a/src/mongo/db/session/kill_sessions.cpp b/src/mongo/db/session/kill_sessions.cpp
index 99d8fd5122a..7626afa111b 100644
--- a/src/mongo/db/session/kill_sessions.cpp
+++ b/src/mongo/db/session/kill_sessions.cpp
@@ -109,8 +109,12 @@ KillAllSessionsByPatternItem makeKillAllSessionsByPattern(OperationContext* opCt
                                                           const KillAllSessionsUser& kasu) {
     KillAllSessionsByPatternItem item = makeKillAllSessionsByPattern(opCtx);
 
-    User user(UserRequest(UserName(kasu.getUser(), kasu.getDb()), boost::none));
-    item.pattern.setUid(user.getDigest());
+    auto authMgr = AuthorizationManager::get(opCtx->getServiceContext());
+
+    UserName un(kasu.getUser(), kasu.getDb());
+
+    auto user = uassertStatusOK(authMgr->acquireUser(opCtx, un));
+    item.pattern.setUid(user->getDigest());
     return item;
 }
 
diff --git a/src/mongo/db/session/logical_session_id_test.cpp b/src/mongo/db/session/logical_session_id_test.cpp
index 1142e4335ef..736525ecf0f 100644
--- a/src/mongo/db/session/logical_session_id_test.cpp
+++ b/src/mongo/db/session/logical_session_id_test.cpp
@@ -111,7 +111,7 @@ public:
                                            << "db"
                                            << "test"))),
             BSONObj()));
-        ASSERT_OK(authzSession->addAndAuthorizeUser(_opCtx.get(), {un, boost::none}));
+        ASSERT_OK(authzSession->addAndAuthorizeUser(_opCtx.get(), un));
         return authzSession->lookupUser(un);
     }
 
@@ -126,7 +126,7 @@ public:
                                            << "db"
                                            << "admin"))),
             BSONObj()));
-        ASSERT_OK(authzSession->addAndAuthorizeUser(_opCtx.get(), {un, boost::none}));
+        ASSERT_OK(authzSession->addAndAuthorizeUser(_opCtx.get(), un));
         return authzSession->lookupUser(un);
     }
 };