Merge fce0ca0 into 71ced36

thibault-martinez · Jun 20, 2018 · e299cac · e299cac
2 parents 71ced36 + fce0ca0
commit e299cac
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 12 deletions.
diff --git a/include/iota/api/core.hpp b/include/iota/api/core.hpp
@@ -51,7 +51,7 @@ class Core {
    * @param timeout Timeout for the requests.
    */
   explicit Core(const std::string& host, const uint16_t& port, bool localPow = true,
-                int timeout = 60);
+                int timeout = 60, const std::string& user = "", const std::string& pass = "");
   /**
    * Default dtor.
    */

diff --git a/include/iota/api/extended.hpp b/include/iota/api/extended.hpp
@@ -48,7 +48,7 @@ class Extended : public Core {
    * @param localPow Whether to do local or remote proof of work.
    * @param timeout Timeout for the requests.
    */
-  Extended(const std::string& host, const uint16_t& port, bool localPow = true, int timeout = 60);
+  Extended(const std::string& host, const uint16_t& port, bool localPow = true, int timeout = 60, const std::string& user = "", const std::string& pass = "");
   /**
    * Default dtor.
    */

diff --git a/include/iota/api/service.hpp b/include/iota/api/service.hpp
@@ -26,6 +26,7 @@
 #pragma once
 
 #include <cpr/cpr.h>
+#include <cpr/auth.h>
 #include <json.hpp>
 
 #include <iota/constants.hpp>
@@ -53,7 +54,7 @@ class Service {
    * @param port Port of the node.
    * @param timeout Request timeout.
    */
-  Service(const std::string& host, const uint16_t& port, int timeout = 60);
+  Service(const std::string& host, const uint16_t& port, int timeout = 60, const std::string& user = "", const std::string& pass = "");
   /**
    * Default dtor;
    */
@@ -74,13 +75,17 @@ class Service {
     json data;
     request.serialize(data);
 
-    auto url     = cpr::Url{ "http://" + host_ + ":" + std::to_string(port_) };
+    auto url     = cpr::Url{ host_ + ":" + std::to_string(port_) };
     auto body    = cpr::Body{ data.dump() };
     auto headers = cpr::Header{ { "Content-Type", "application/json" },
                                 { "Content-Length", std::to_string(body.size()) },
                                 { "X-IOTA-API-Version", APIVersion } };
-    auto res     = cpr::Post(url, body, headers, cpr::Timeout{ timeout_ * 1000 });
-
+
+    auto res     = cpr::Post(url, body, headers, cpr::Timeout{ timeout_ * 1000 });;
+    if(user_.compare("") != 0 && pass_.compare("") != 0 && host_.compare(0,5,"https") == 0){
+      auto auth = cpr::Authentication{user_, pass_};
+      res = cpr::Post(url, body, headers, cpr::Timeout{ timeout_ * 1000 }, auth);
+    }
     if (res.error.code != cpr::ErrorCode::OK)
       throw Errors::Network(res.error.message);
 
@@ -135,6 +140,14 @@ class Service {
    * Timeout for requests.
    */
   const int timeout_;
+  /**
+   * Username for authenticated requests.
+   */
+  std::string user_;
+  /**
+   * Password for authenticated requests.
+   */
+  std::string pass_;
 };
 
 }  // namespace API

diff --git a/source/api/core.cpp b/source/api/core.cpp
@@ -63,8 +63,8 @@ namespace IOTA {
 
 namespace API {
 
-Core::Core(const std::string& host, const uint16_t& port, bool localPow, int timeout)
-    : service_(host, port, timeout), localPow_(localPow) {
+Core::Core(const std::string& host, const uint16_t& port, bool localPow, int timeout, const std::string& user, const std::string& pass)
+    : service_(host, port, timeout, user, pass), localPow_(localPow) {
 }
 
 Responses::GetNodeInfo

diff --git a/source/api/extended.cpp b/source/api/extended.cpp
@@ -59,8 +59,8 @@ namespace IOTA {
 
 namespace API {
 
-Extended::Extended(const std::string& host, const uint16_t& port, bool localPow, int timeout)
-    : Core(host, port, localPow, timeout) {
+Extended::Extended(const std::string& host, const uint16_t& port, bool localPow, int timeout, const std::string& user, const std::string& pass)
+    : Core(host, port, localPow, timeout, user, pass) {
 }
 
 /*

diff --git a/source/api/service.cpp b/source/api/service.cpp
@@ -29,8 +29,8 @@ namespace IOTA {
 
 namespace API {
 
-Service::Service(const std::string& host, const uint16_t& port, int timeout)
-    : host_(host), port_(port), timeout_(timeout) {
+Service::Service(const std::string& host, const uint16_t& port, int timeout, const std::string& user, const std::string& pass)
+    : host_(host), port_(port), timeout_(timeout), user_(user), pass_(pass) {
 }
 
 }  // namespace API