sending auth header in api_client

mlibrary · Apr 29, 2024 · 2225e8e · 2225e8e
1 parent def8844
commit 2225e8e
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 8 deletions.
diff --git a/apache/client/include/lauth/api_client.hpp b/apache/client/include/lauth/api_client.hpp
@@ -12,6 +12,7 @@ namespace mlibrary::lauth {
     public:
       ApiClient(const std::string& url, const std::string& basicAuth) : client(std::make_unique<HttpClient>(url)), basicAuth(basicAuth) {};
       ApiClient(std::unique_ptr<HttpClient>&& client) : client(std::move(client)) {};
+      ApiClient(std::unique_ptr<HttpClient>&& client, const std::string& basicAuth) : client(std::move(client)), basicAuth(basicAuth) {};
       ApiClient(const ApiClient&) = delete;
       ApiClient& operator=(const ApiClient&) = delete;
       ApiClient(ApiClient&&) = delete;

diff --git a/apache/client/src/lauth/api_client.cpp b/apache/client/src/lauth/api_client.cpp
@@ -13,8 +13,11 @@ namespace mlibrary::lauth {
       {"uri", req.uri},
       {"user", req.user}
     };
-    HttpHeaders headers {
 
+    std::string authValue = "Basic " + basicAuth;
+
+    HttpHeaders headers {
+      {"Authorization", authValue}
     };
 
     auto result = client->get("/authorized", params, headers);

diff --git a/apache/client/test/lauth/api_client_test.cpp b/apache/client/test/lauth/api_client_test.cpp
@@ -28,10 +28,14 @@ TEST(ApiClient, HttpRequestByApiClientIsCorrect) {
       {"user", req.user}
   };
 
+  HttpHeaders headers {
+      {"Authorization", "Basic dGVzdA=="}
+  };
+
   auto body = R"({"determination":"allowed"})";
 
-  EXPECT_CALL(*client, get("/authorized", params)).WillOnce(Return(body));
-  ApiClient api_client(std::move(client));
+  EXPECT_CALL(*client, get("/authorized", params, headers)).WillOnce(Return(body));
+  ApiClient api_client(std::move(client), "dGVzdA==");
 
   api_client.authorize(req);
 }
@@ -40,7 +44,7 @@ TEST(ApiClient, DeterminationAllowedReturnsTrue) {
   auto client = std::make_unique<MockHttpClient>();
   auto body = R"({"determination":"allowed"})";
 
-  EXPECT_CALL(*client, get(_, _)).WillOnce(Return(body));
+  EXPECT_CALL(*client, get(_, _, _)).WillOnce(Return(body));
   ApiClient api_client(std::move(client));
 
   auto result = api_client.authorize(Request());
@@ -51,7 +55,7 @@ TEST(ApiClient, DeterminationDeniedReturnsFalse) {
   auto client = std::make_unique<MockHttpClient>();
   auto body = R"({"determination":"denied"})";
 
-  EXPECT_CALL(*client, get(_, _)).WillOnce(Return(body));
+  EXPECT_CALL(*client, get(_, _, _)).WillOnce(Return(body));
   ApiClient api_client(std::move(client));
 
   auto result = api_client.authorize(Request());
@@ -62,7 +66,7 @@ TEST(ApiClient, MismatchedJsonReturnsFalse) {
   auto client = std::make_unique<MockHttpClient>();
   auto body = R"({"should_ignore_this_key":"allowed"})";
 
-  EXPECT_CALL(*client, get(_, _)).WillOnce(Return(body));
+  EXPECT_CALL(*client, get(_, _, _)).WillOnce(Return(body));
   ApiClient api_client(std::move(client));
 
   auto result = api_client.authorize(Request());
@@ -73,7 +77,7 @@ TEST(ApiClient, MalformedJsonReturnsFalse) {
   auto client = std::make_unique<MockHttpClient>();
   auto body = R"({"should_ignore_this_key":"allowed",)";
 
-  EXPECT_CALL(*client, get(_, _)).WillOnce(Return(body));
+  EXPECT_CALL(*client, get(_, _, _)).WillOnce(Return(body));
   ApiClient api_client(std::move(client));
 
   auto result = api_client.authorize(Request());
@@ -84,7 +88,7 @@ TEST(ApiClient, EmptyBodyReturnsFalse) {
   auto client = std::make_unique<MockHttpClient>();
   auto body = "";
 
-  EXPECT_CALL(*client, get(_, _)).WillOnce(Return(body));
+  EXPECT_CALL(*client, get(_, _, _)).WillOnce(Return(body));
   ApiClient api_client(std::move(client));
 
   auto result = api_client.authorize(Request());

diff --git a/apache/client/test/lauth/mocks.hpp b/apache/client/test/lauth/mocks.hpp
@@ -5,6 +5,7 @@
 #include "lauth/authorization_result.hpp"
 #include "lauth/http_client.hpp"
 #include "lauth/http_params.hpp"
+#include "lauth/http_headers.hpp"
 
 #include <optional>
 
@@ -15,6 +16,8 @@ class MockHttpClient : public HttpClient {
     MockHttpClient() : HttpClient("http://api.invalid") {};
     MOCK_METHOD(std::optional<std::string>, get, (const std::string&), (override));
     MOCK_METHOD(std::optional<std::string>, get, (const std::string&, const HttpParams&), (override));
+    MOCK_METHOD(std::optional<std::string>, get, (const std::string&, const HttpHeaders&), (override));
+    MOCK_METHOD(std::optional<std::string>, get, (const std::string&, const HttpParams&, const HttpHeaders&), (override));
 };
 
 class MockApiClient : public ApiClient {