Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
118 changes: 98 additions & 20 deletions src/UNIXSocketRequest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ void UNIXSocketRequest::download(std::variant<TRequestParameters<std::string>,
GetRequest::builder(FactoryRequestWrapper<wrapperType>::create(response, handlerType, shouldRun))
.url(arg.url.url(), arg.secureCommunication)
.unixSocketPath(arg.url.unixSocketPath())
.appendHeaders(arg.httpHeaders)
.timeout(timeout)
.userAgent(userAgent)
.outputFile(outputFile)
Expand Down Expand Up @@ -102,6 +103,7 @@ void UNIXSocketRequest::post(std::variant<TRequestParameters<std::string>,
FactoryRequestWrapper<wrapperType>::create(response, handlerType, shouldRun))};
req.url(arg.url.url(), arg.secureCommunication)
.unixSocketPath(arg.url.unixSocketPath())
.appendHeaders(arg.httpHeaders)
.timeout(timeout)
.userAgent(userAgent)
.template postData<const std::string&>(arg.data)
Expand All @@ -128,6 +130,7 @@ void UNIXSocketRequest::post(std::variant<TRequestParameters<std::string>,
FactoryRequestWrapper<wrapperType>::create(response, handlerType, shouldRun))};
req.url(arg.url.url(), arg.secureCommunication)
.unixSocketPath(arg.url.unixSocketPath())
.appendHeaders(arg.httpHeaders)
.timeout(timeout)
.userAgent(userAgent)
.template postData<std::string_view>(arg.data)
Expand Down Expand Up @@ -156,6 +159,7 @@ void UNIXSocketRequest::post(std::variant<TRequestParameters<std::string>,
FactoryRequestWrapper<wrapperType>::create(response, handlerType, shouldRun))};
req.url(arg.url.url(), arg.secureCommunication)
.unixSocketPath(arg.url.unixSocketPath())
.appendHeaders(arg.httpHeaders)
.timeout(timeout)
.userAgent(userAgent)
.template postData<const std::string&>(data)
Expand Down Expand Up @@ -234,6 +238,7 @@ void UNIXSocketRequest::get(std::variant<TRequestParameters<std::string>,
GetRequest::builder(FactoryRequestWrapper<wrapperType>::create(response, handlerType, shouldRun))};
req.url(arg.url.url(), arg.secureCommunication)
.unixSocketPath(arg.url.unixSocketPath())
.appendHeaders(arg.httpHeaders)
.timeout(timeout)
.userAgent(userAgent)
.outputFile(outputFile)
Expand Down Expand Up @@ -309,6 +314,7 @@ void UNIXSocketRequest::put(std::variant<TRequestParameters<std::string>,
FactoryRequestWrapper<wrapperType>::create(response, handlerType, shouldRun))};
req.url(arg.url.url(), arg.secureCommunication)
.unixSocketPath(arg.url.unixSocketPath())
.appendHeaders(arg.httpHeaders)
.timeout(timeout)
.userAgent(userAgent)
.template postData<const std::string&>(arg.data)
Expand Down Expand Up @@ -336,6 +342,7 @@ void UNIXSocketRequest::put(std::variant<TRequestParameters<std::string>,
FactoryRequestWrapper<wrapperType>::create(response, handlerType, shouldRun))};
req.url(arg.url.url(), arg.secureCommunication)
.unixSocketPath(arg.url.unixSocketPath())
.appendHeaders(arg.httpHeaders)
.timeout(timeout)
.userAgent(userAgent)
.template postData<std::string_view>(arg.data)
Expand Down Expand Up @@ -364,6 +371,7 @@ void UNIXSocketRequest::put(std::variant<TRequestParameters<std::string>,
FactoryRequestWrapper<wrapperType>::create(response, handlerType, shouldRun))};
req.url(arg.url.url(), arg.secureCommunication)
.template postData<const std::string&>(data)
.unixSocketPath(arg.url.unixSocketPath())
.appendHeaders(arg.httpHeaders)
.timeout(timeout)
.userAgent(userAgent)
Expand Down Expand Up @@ -445,6 +453,7 @@ void UNIXSocketRequest::patch(std::variant<TRequestParameters<std::string>,
FactoryRequestWrapper<wrapperType>::create(response, handlerType, shouldRun))};
req.url(arg.url.url(), arg.secureCommunication)
.unixSocketPath(arg.url.unixSocketPath())
.appendHeaders(arg.httpHeaders)
.timeout(timeout)
.userAgent(userAgent)
.template postData<const std::string&>(arg.data)
Expand Down Expand Up @@ -472,6 +481,7 @@ void UNIXSocketRequest::patch(std::variant<TRequestParameters<std::string>,
FactoryRequestWrapper<wrapperType>::create(response, handlerType, shouldRun))};
req.url(arg.url.url(), arg.secureCommunication)
.unixSocketPath(arg.url.unixSocketPath())
.appendHeaders(arg.httpHeaders)
.timeout(timeout)
.userAgent(userAgent)
.template postData<std::string_view>(arg.data)
Expand Down Expand Up @@ -500,6 +510,7 @@ void UNIXSocketRequest::patch(std::variant<TRequestParameters<std::string>,
FactoryRequestWrapper<wrapperType>::create(response, handlerType, shouldRun))};
req.url(arg.url.url(), arg.secureCommunication)
.unixSocketPath(arg.url.unixSocketPath())
.appendHeaders(arg.httpHeaders)
.timeout(timeout)
.userAgent(userAgent)
.template postData<const std::string&>(data)
Expand Down Expand Up @@ -574,29 +585,96 @@ 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())
.appendHeaders(arg.httpHeaders)
.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())
.appendHeaders(arg.httpHeaders)
.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)
.unixSocketPath(arg.url.unixSocketPath())
.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
Loading