Use ApiBundle's Auth::TLS instance in serve and execute servers

1 files changed, 3 insertions, 5 deletions

diff --git a/src/buildtool/execution_api/execution_service/server_implementation.cpp b/src/buildtool/execution_api/execution_service/server_implementation.cpp
index 30974d4f..4a9f23cf 100644
--- a/src/buildtool/execution_api/execution_service/server_implementation.cpp
+++ b/src/buildtool/execution_api/execution_service/server_implementation.cpp
@@ -26,7 +26,6 @@
 #include "fmt/core.h"
 #include "grpcpp/grpcpp.h"
 #include "nlohmann/json.hpp"
-#include "src/buildtool/auth/authentication.hpp"
 #include "src/buildtool/common/remote/port.hpp"
 #include "src/buildtool/compatibility/compatibility.hpp"
 #include "src/buildtool/execution_api/execution_service/ac_server.hpp"
@@ -72,13 +71,12 @@ auto ServerImpl::Run(ApiBundle const& apis) -> bool {
         .RegisterService(&op);
 
     std::shared_ptr<grpc::ServerCredentials> creds;
-    if (Auth::Instance().GetAuthMethod() == AuthMethod::kTLS) {
+    if (apis.auth != nullptr) {
         auto tls_opts = grpc::SslServerCredentialsOptions{};
 
-        tls_opts.pem_root_certs = Auth::TLS::Instance().CACert();
+        tls_opts.pem_root_certs = apis.auth->CACert();
         grpc::SslServerCredentialsOptions::PemKeyCertPair keycert = {
-            Auth::TLS::Instance().ServerKey(),
-            Auth::TLS::Instance().ServerCert()};
+            apis.auth->ServerKey(), apis.auth->ServerCert()};
 
         tls_opts.pem_key_cert_pairs.emplace_back(keycert);