Skip to content

Commit 2d068f9

Browse files
committed
fix: fix curl http backend, after update of cpr
1 parent f89fb41 commit 2d068f9

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

src/lobby/curl_client.cpp

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -59,34 +59,34 @@ oopetris::http::implementation::ActualClient::~ActualClient() = default;
5959
oopetris::http::implementation::ActualClient::ActualClient(const std::string& api_url)
6060
: m_base_url{ normalize_url(api_url) } {
6161

62-
m_session.SetUrl(cpr::Url{ api_url });
63-
m_session.SetAcceptEncoding(cpr::AcceptEncoding{
62+
m_session->SetUrl(cpr::Url{ api_url });
63+
m_session->SetAcceptEncoding(cpr::AcceptEncoding{
6464
{ cpr::AcceptEncodingMethods::deflate, cpr::AcceptEncodingMethods::gzip,
6565
cpr::AcceptEncodingMethods::zlib }
6666
});
67-
m_session.SetHeader(cpr::Header{
67+
m_session->SetHeader(cpr::Header{
6868
{ "Accept", ::http::constants::json_content_type }
6969
});
7070
}
7171

7272

7373
void oopetris::http::implementation::ActualClient::set_url(const std::string& url) {
74-
m_session.SetUrl(cpr::Url{ m_base_url, url });
74+
m_session->SetUrl(cpr::Url{ m_base_url, url });
7575
}
7676

7777

7878
[[nodiscard]] std::unique_ptr<oopetris::http::Result> oopetris::http::implementation::ActualClient::Get(
7979
const std::string& url
8080
) {
8181
set_url(url);
82-
return TRANSFORM_RESULT(m_session.Get());
82+
return TRANSFORM_RESULT(m_session->Get());
8383
}
8484

8585
[[nodiscard]] std::unique_ptr<oopetris::http::Result> oopetris::http::implementation::ActualClient::Delete(
8686
const std::string& url
8787
) {
8888
set_url(url);
89-
return TRANSFORM_RESULT(m_session.Delete());
89+
return TRANSFORM_RESULT(m_session->Delete());
9090
}
9191

9292
[[nodiscard]] std::unique_ptr<oopetris::http::Result> oopetris::http::implementation::ActualClient::Post(
@@ -97,14 +97,14 @@ void oopetris::http::implementation::ActualClient::set_url(const std::string& ur
9797
set_url(url);
9898

9999
if (not payload.has_value()) {
100-
return TRANSFORM_RESULT(m_session.Post());
100+
return TRANSFORM_RESULT(m_session->Post());
101101
}
102102

103103
auto [content, content_type] = payload.value();
104104

105-
m_session.SetBody(cpr::Body{ content });
105+
m_session->SetBody(cpr::Body{ content });
106106

107-
return TRANSFORM_RESULT(m_session.Post());
107+
return TRANSFORM_RESULT(m_session->Post());
108108
}
109109

110110
[[nodiscard]] std::unique_ptr<oopetris::http::Result> oopetris::http::implementation::ActualClient::Put(
@@ -114,22 +114,22 @@ void oopetris::http::implementation::ActualClient::set_url(const std::string& ur
114114
set_url(url);
115115

116116
if (not payload.has_value()) {
117-
return TRANSFORM_RESULT(m_session.Put());
117+
return TRANSFORM_RESULT(m_session->Put());
118118
}
119119

120120
auto [content, content_type] = payload.value();
121121

122-
m_session.SetBody(cpr::Body{ content });
122+
m_session->SetBody(cpr::Body{ content });
123123

124-
return TRANSFORM_RESULT(m_session.Put());
124+
return TRANSFORM_RESULT(m_session->Put());
125125
}
126126

127127
void oopetris::http::implementation::ActualClient::SetBearerAuth(const std::string& token) {
128128

129129

130130
#if CPR_LIBCURL_VERSION_NUM >= 0x073D00
131-
m_session.SetBearer(token);
131+
m_session->SetBearer(token);
132132
#else
133-
m_session.SetHeader(cpr::Header{ "Authorization", fmt::format("Bearer {}", token) });
133+
m_session->SetHeader(cpr::Header{ "Authorization", fmt::format("Bearer {}", token) });
134134
#endif
135135
}

src/lobby/curl_client.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ namespace oopetris::http::implementation {
3737

3838
struct ActualClient : ::oopetris::http::Client {
3939
private:
40-
cpr::Session m_session;
40+
std::unique_ptr<cpr::Session> m_session;
4141
std::string m_base_url;
4242

4343
void set_url(const std::string& url);

0 commit comments

Comments
 (0)