Skip to content

Commit e510ae7

Browse files
committed
fix: fix breaking change in cpr
1 parent 5c672be commit e510ae7

File tree

1 file changed

+15
-10
lines changed

1 file changed

+15
-10
lines changed

src/lobby/curl_client.cpp

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ oopetris::http::implementation::ActualResult::~ActualResult() = default;
1212
oopetris::http::implementation::ActualResult::ActualResult(ActualResult&& other) noexcept
1313
: m_result{ std::move(other.m_result) } { }
1414

15-
[[nodiscard]] std::optional<std::string> oopetris::http::implementation::ActualResult::get_header(const std::string& key
15+
[[nodiscard]] std::optional<std::string> oopetris::http::implementation::ActualResult::get_header(
16+
const std::string& key
1617
) const {
1718

1819
if (not m_result.header.contains(key)) {
@@ -60,13 +61,17 @@ oopetris::http::implementation::ActualClient::ActualClient(const std::string& ap
6061
: m_base_url{ normalize_url(api_url) } {
6162

6263
m_session->SetUrl(cpr::Url{ api_url });
63-
m_session->SetAcceptEncoding(cpr::AcceptEncoding{
64-
{ cpr::AcceptEncodingMethods::deflate, cpr::AcceptEncodingMethods::gzip,
65-
cpr::AcceptEncodingMethods::zlib }
66-
});
67-
m_session->SetHeader(cpr::Header{
68-
{ "Accept", ::http::constants::json_content_type }
69-
});
64+
m_session->SetAcceptEncoding(
65+
cpr::AcceptEncoding{
66+
{ cpr::AcceptEncodingMethods::deflate, cpr::AcceptEncodingMethods::gzip,
67+
cpr::AcceptEncodingMethods::zlib }
68+
}
69+
);
70+
m_session->SetHeader(
71+
cpr::Header{
72+
{ "Accept", ::http::constants::json_content_type }
73+
}
74+
);
7075
}
7176

7277

@@ -128,7 +133,7 @@ void oopetris::http::implementation::ActualClient::SetBearerAuth(const std::stri
128133

129134

130135
#if CPR_LIBCURL_VERSION_NUM >= 0x073D00
131-
m_session->SetBearer(token);
136+
m_session->SetBearer(cpr::Bearer{ token });
132137
#else
133138
m_session->SetHeader(cpr::Header{ "Authorization", fmt::format("Bearer {}", token) });
134139
#endif
@@ -139,7 +144,7 @@ void oopetris::http::implementation::ActualClient::ResetBearerAuth() {
139144

140145

141146
#if CPR_LIBCURL_VERSION_NUM >= 0x073D00
142-
m_session->SetBearer(std::string{});
147+
m_session->SetBearer(cpr::Bearer{""});
143148
#else
144149
m_session->SetHeader();
145150
#endif

0 commit comments

Comments
 (0)