Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
104 changes: 84 additions & 20 deletions src/HTTPRequest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -578,29 +578,93 @@ void HTTPRequest::delete_(std::variant<TRequestParameters<std::string>,
std::visit(
[&](auto&& arg)
{
auto req {DeleteRequest::builder(
FactoryRequestWrapper<wrapperType>::create(response, handlerType, shouldRun))};
req.url(arg.url.url(), arg.secureCommunication)
.appendHeaders(arg.httpHeaders)
.timeout(timeout)
.userAgent(userAgent)
.outputFile(outputFile)
.execute();
using T = std::decay_t<decltype(arg)>;
if constexpr (std::is_same_v<T, TRequestParameters<std::string>>)
{
auto req {DeleteRequest::builder(
FactoryRequestWrapper<wrapperType>::create(response, handlerType, shouldRun))};
req.url(arg.url.url(), arg.secureCommunication)
.template postData<const std::string&>(arg.data)
.appendHeaders(arg.httpHeaders)
.timeout(timeout)
.userAgent(userAgent)
.outputFile(outputFile)
.execute();

std::visit(
[&](auto&& arg)
{
using Tb = std::decay_t<decltype(arg)>;
if constexpr (std::is_same_v<Tb, TPostRequestParameters<const std::string&>>)
std::visit(
[&](auto&& arg)
{
arg.onSuccess(response);
}
else if constexpr (std::is_same_v<Tb, TPostRequestParameters<std::string&&>>)
using Tb = std::decay_t<decltype(arg)>;
if constexpr (std::is_same_v<Tb, TPostRequestParameters<const std::string&>>)
{
arg.onSuccess(response);
}
else if constexpr (std::is_same_v<Tb, TPostRequestParameters<std::string&&>>)
{
arg.onSuccess(std::move(response));
}
},
postRequestParameters);
}
else if constexpr (std::is_same_v<T, TRequestParameters<std::string_view>>)
{
auto req {DeleteRequest::builder(
FactoryRequestWrapper<wrapperType>::create(response, handlerType, shouldRun))};
req.url(arg.url.url(), arg.secureCommunication)
.template postData<std::string_view>(arg.data)
.appendHeaders(arg.httpHeaders)
.timeout(timeout)
.userAgent(userAgent)
.outputFile(outputFile)
.execute();
Comment thread
NahuFigueroa97 marked this conversation as resolved.

std::visit(
[&](auto&& arg)
{
arg.onSuccess(std::move(response));
}
},
postRequestParameters);
using Tb = std::decay_t<decltype(arg)>;
if constexpr (std::is_same_v<Tb, TPostRequestParameters<const std::string&>>)
{
arg.onSuccess(response);
}
else if constexpr (std::is_same_v<Tb, TPostRequestParameters<std::string&&>>)
{
arg.onSuccess(std::move(response));
}
},
postRequestParameters);
}
else if constexpr (std::is_same_v<T, TRequestParameters<nlohmann::json>>)
{
const std::string data = arg.data.dump();
auto req {DeleteRequest::builder(
FactoryRequestWrapper<wrapperType>::create(response, handlerType, shouldRun))};
req.url(arg.url.url(), arg.secureCommunication)
.template postData<const std::string&>(data)
.appendHeaders(arg.httpHeaders)
.timeout(timeout)
.userAgent(userAgent)
.outputFile(outputFile)
.execute();

std::visit(
[&](auto&& arg)
{
using Tb = std::decay_t<decltype(arg)>;
if constexpr (std::is_same_v<Tb, TPostRequestParameters<const std::string&>>)
{
arg.onSuccess(response);
}
else if constexpr (std::is_same_v<Tb, TPostRequestParameters<std::string&&>>)
{
arg.onSuccess(std::move(response));
}
},
postRequestParameters);
}
else
{
throw std::runtime_error("Invalid type");
}
},
requestParameters);
}
Expand Down
104 changes: 84 additions & 20 deletions src/UNIXSocketRequest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -574,29 +574,93 @@ void UNIXSocketRequest::delete_(std::variant<TRequestParameters<std::string>,
std::visit(
[&](auto&& arg)
{
auto req {DeleteRequest::builder(
FactoryRequestWrapper<wrapperType>::create(response, handlerType, shouldRun))};
req.url(arg.url.url(), arg.secureCommunication)
.unixSocketPath(arg.url.unixSocketPath())
.timeout(timeout)
.userAgent(userAgent)
.outputFile(outputFile)
.execute();
using T = std::decay_t<decltype(arg)>;
if constexpr (std::is_same_v<T, TRequestParameters<std::string>>)
{
auto req {DeleteRequest::builder(
FactoryRequestWrapper<wrapperType>::create(response, handlerType, shouldRun))};
req.url(arg.url.url(), arg.secureCommunication)
.unixSocketPath(arg.url.unixSocketPath())
.timeout(timeout)
.userAgent(userAgent)
.template postData<const std::string&>(arg.data)
.outputFile(outputFile)
.execute();
Comment thread
NahuFigueroa97 marked this conversation as resolved.

std::visit(
[&](auto&& arg)
{
using Tb = std::decay_t<decltype(arg)>;
if constexpr (std::is_same_v<Tb, TPostRequestParameters<const std::string&>>)
std::visit(
[&](auto&& arg)
{
arg.onSuccess(response);
}
else if constexpr (std::is_same_v<Tb, TPostRequestParameters<std::string&&>>)
using Tb = std::decay_t<decltype(arg)>;
if constexpr (std::is_same_v<Tb, TPostRequestParameters<const std::string&>>)
{
arg.onSuccess(response);
}
else if constexpr (std::is_same_v<Tb, TPostRequestParameters<std::string&&>>)
{
arg.onSuccess(std::move(response));
}
},
postRequestParameters);
}
else if constexpr (std::is_same_v<T, TRequestParameters<std::string_view>>)
{
auto req {DeleteRequest::builder(
FactoryRequestWrapper<wrapperType>::create(response, handlerType, shouldRun))};
req.url(arg.url.url(), arg.secureCommunication)
.unixSocketPath(arg.url.unixSocketPath())
.timeout(timeout)
.userAgent(userAgent)
.template postData<std::string_view>(arg.data)
.outputFile(outputFile)
.execute();
Comment thread
NahuFigueroa97 marked this conversation as resolved.

std::visit(
[&](auto&& arg)
{
arg.onSuccess(std::move(response));
}
},
postRequestParameters);
using Tb = std::decay_t<decltype(arg)>;
if constexpr (std::is_same_v<Tb, TPostRequestParameters<const std::string&>>)
{
arg.onSuccess(response);
}
else if constexpr (std::is_same_v<Tb, TPostRequestParameters<std::string&&>>)
{
arg.onSuccess(std::move(response));
}
},
postRequestParameters);
}
else if constexpr (std::is_same_v<T, TRequestParameters<nlohmann::json>>)
{
const auto data = arg.data.dump();
auto req {DeleteRequest::builder(
FactoryRequestWrapper<wrapperType>::create(response, handlerType, shouldRun))};
req.url(arg.url.url(), arg.secureCommunication)
.template postData<const std::string&>(data)
.appendHeaders(arg.httpHeaders)
.timeout(timeout)
.userAgent(userAgent)
.outputFile(outputFile)
.execute();

std::visit(
[&](auto&& arg)
{
using Tb = std::decay_t<decltype(arg)>;
if constexpr (std::is_same_v<Tb, TPostRequestParameters<const std::string&>>)
{
arg.onSuccess(response);
}
else if constexpr (std::is_same_v<Tb, TPostRequestParameters<std::string&&>>)
{
arg.onSuccess(std::move(response));
}
},
postRequestParameters);
}
else
{
throw std::runtime_error("Invalid type");
}
},
requestParameters);
}
Expand Down
3 changes: 2 additions & 1 deletion src/urlRequest.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,7 @@ class GetRequest final : public cURLRequest<GetRequest>
/**
* @brief This class is a wrapper for curl library. It provides a simple interface to perform HTTP DELETE requests.
*/
class DeleteRequest final : public cURLRequest<DeleteRequest>
class DeleteRequest final : public cURLRequest<DeleteRequest>, public PostData<DeleteRequest>
{
public:
/**
Expand All @@ -445,6 +445,7 @@ class DeleteRequest final : public cURLRequest<DeleteRequest>
*/
explicit DeleteRequest(std::shared_ptr<IRequestImplementator> requestImplementator)
: cURLRequest<DeleteRequest>(requestImplementator)
, PostData<DeleteRequest>(requestImplementator)
{
requestImplementator->setOptionString(OPT_CUSTOMREQUEST, METHOD_TYPE_MAP.at(METHOD_DELETE));
}
Expand Down
27 changes: 17 additions & 10 deletions test_tool/actions.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ class PutAction final : public IAction
void execute() override
{
HTTPRequest::instance().put(
RequestParameters {.url = HttpURL(m_url),
TRequestParameters<nlohmann::json> {.url = HttpURL(m_url),
.data = m_data,
.secureCommunication = m_secureCommunication,
.httpHeaders = m_headers},
Expand Down Expand Up @@ -286,7 +286,7 @@ class PatchAction final : public IAction
void execute() override
{
HTTPRequest::instance().patch(
RequestParameters {.url = HttpURL(m_url),
TRequestParameters<nlohmann::json> {.url = HttpURL(m_url),
.data = m_data,
.secureCommunication = m_secureCommunication,
.httpHeaders = m_headers},
Expand All @@ -309,6 +309,7 @@ class DeleteAction final : public IAction
{
private:
std::string m_url;
nlohmann::json m_data;
std::unordered_set<std::string> m_headers;
SecureCommunication m_secureCommunication;
long m_timeout;
Expand All @@ -322,10 +323,12 @@ class DeleteAction final : public IAction
* @param timeout Timeout for the request.
*/
explicit DeleteAction(const std::string& url,
const nlohmann::json& data,
const std::unordered_set<std::string>& headers,
const SecureCommunication& secureCommunication,
const long timeout)
: m_url(url)
, m_data(data)
, m_headers(headers)
, m_secureCommunication(secureCommunication)
, m_timeout(timeout)
Expand All @@ -338,17 +341,21 @@ class DeleteAction final : public IAction
void execute() override
{
HTTPRequest::instance().delete_(
RequestParameters {
.url = HttpURL(m_url), .secureCommunication = m_secureCommunication, .httpHeaders = m_headers},
PostRequestParameters {
TRequestParameters<nlohmann::json> {
.url = HttpURL(m_url),
.data = m_data,
.secureCommunication = m_secureCommunication,
.httpHeaders = m_headers
},
PostRequestParameters{
.onSuccess = [](const std::string& msg) { std::cout << msg << std::endl; },
.onError =
[](const std::string& msg, const long responseCode, const std::string& responseBody)
.onError = [](const std::string& msg, const long code, const std::string& body)
{
std::cerr << msg << ": " << responseCode << ". Response body: " << responseBody << std::endl;
std::cerr << msg << ": " << code << ". Response body: " << body << std::endl;
throw std::runtime_error(msg);
}},
ConfigurationParameters {.timeout = m_timeout});
}
},
ConfigurationParameters{.timeout = m_timeout});
}
};

Expand Down
3 changes: 2 additions & 1 deletion test_tool/factoryAction.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,8 @@ class FactoryAction final
}
else if (0 == args.type().compare("delete"))
{
return std::make_unique<DeleteAction>(args.url(), headers, secureCommunication, timeout);
return std::make_unique<DeleteAction>(
args.url(), args.postArguments(), headers, secureCommunication, timeout);
}
else
{
Expand Down