1 files changed, 22 insertions, 19 deletions

diff --git a/src/web_service/web_backend.cpp b/src/web_service/web_backend.cpp
index dff380cca..f41d8af0e 100644
--- a/src/web_service/web_backend.cpp
+++ b/src/web_service/web_backend.cpp
@@ -32,9 +32,14 @@ struct Client::Impl {
     Impl(std::string host_, std::string username_, std::string token_)
         : host{std::move(host_)}, username{std::move(username_)}, token{std::move(token_)} {
         std::scoped_lock lock{jwt_cache.mutex};
-        if (username == jwt_cache.username && token == jwt_cache.token) {
+        if (this->username == jwt_cache.username && this->token == jwt_cache.token) {
             jwt = jwt_cache.jwt;
         }
+
+        // Normalize host expression
+        if (!this->host.empty() && this->host.back() == '/') {
+            static_cast<void>(this->host.pop_back());
+        }
     }
 
     /// A generic function handles POST, GET and DELETE request together
@@ -47,7 +52,7 @@ struct Client::Impl {
 
         if (jwt.empty() && !allow_anonymous) {
             LOG_ERROR(WebService, "Credentials must be provided for authenticated requests");
-            return WebResult{WebResult::Code::CredentialsMissing, "Credentials needed", ""};
+            return WebResult{WebResult::Code::CredentialsMissing, "Credentials needed"};
         }
 
         auto result = GenericRequest(method, path, data, accept, jwt);
@@ -71,18 +76,16 @@ struct Client::Impl {
                              const std::string& jwt_ = "", const std::string& username_ = "",
                              const std::string& token_ = "") {
         if (cli == nullptr) {
-            cli = std::make_unique<httplib::Client>(host);
+            cli = std::make_unique<httplib::Client>(host.c_str());
+            cli->set_connection_timeout(TIMEOUT_SECONDS);
+            cli->set_read_timeout(TIMEOUT_SECONDS);
+            cli->set_write_timeout(TIMEOUT_SECONDS);
         }
-
         if (!cli->is_valid()) {
-            LOG_ERROR(WebService, "Client is invalid, skipping request!");
-            return {};
+            LOG_ERROR(WebService, "Invalid URL {}", host + path);
+            return WebResult{WebResult::Code::InvalidURL, "Invalid URL"};
         }
 
-        cli->set_connection_timeout(TIMEOUT_SECONDS);
-        cli->set_read_timeout(TIMEOUT_SECONDS);
-        cli->set_write_timeout(TIMEOUT_SECONDS);
-
         httplib::Headers params;
         if (!jwt_.empty()) {
             params = {
@@ -107,32 +110,32 @@ struct Client::Impl {
         request.headers = params;
         request.body = data;
 
-        httplib::Response response;
-        httplib::Error error;
+        httplib::Result result = cli->send(request);
 
-        if (!cli->send(request, response, error)) {
-            LOG_ERROR(WebService, "{} to {} returned null (httplib Error: {})", method, host + path,
-                      httplib::to_string(error));
-            return WebResult{WebResult::Code::LibError, "Null response", ""};
+        if (!result) {
+            LOG_ERROR(WebService, "{} to {} returned null", method, host + path);
+            return WebResult{WebResult::Code::LibError, "Null response"};
         }
 
+        httplib::Response response = result.value();
+
         if (response.status >= 400) {
             LOG_ERROR(WebService, "{} to {} returned error status code: {}", method, host + path,
                       response.status);
-            return WebResult{WebResult::Code::HttpError, std::to_string(response.status), ""};
+            return WebResult{WebResult::Code::HttpError, std::to_string(response.status)};
         }
 
         auto content_type = response.headers.find("content-type");
 
         if (content_type == response.headers.end()) {
             LOG_ERROR(WebService, "{} to {} returned no content", method, host + path);
-            return WebResult{WebResult::Code::WrongContent, "", ""};
+            return WebResult{WebResult::Code::WrongContent, ""};
         }
 
         if (content_type->second.find(accept) == std::string::npos) {
             LOG_ERROR(WebService, "{} to {} returned wrong content: {}", method, host + path,
                       content_type->second);
-            return WebResult{WebResult::Code::WrongContent, "Wrong content", ""};
+            return WebResult{WebResult::Code::WrongContent, "Wrong content"};
         }
         return WebResult{WebResult::Code::Success, "", response.body};
     }