drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2025-12-19 21:13:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Format all C++ and Java code via clang-format

Browse Source 
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
This commit is contained in:
Konstantin Pastbin
2025-08-17 14:32:37 +07:00
parent 9f0290c0ec
commit bfffa1fff4
2169 changed files with 56441 additions and 64188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
libs/editor/osm_auth.cpp
View File

@@ -49,7 +49,7 @@ string FindOauthCode(string const & redirectUri)
string FindAccessToken(string const & body)
{
// Extract access_token from JSON in format {"access_token":"...", "token_type":"Bearer", "scope":"read_prefs"}
const base::Json root(body.c_str());
base::Json const root(body.c_str());
if (json_is_object(root.get()))
{
@@ -80,12 +80,12 @@ bool OsmOAuth::IsValid(string const & ks)
return !ks.empty();
}
OsmOAuth::OsmOAuth(string const & oauth2ClientId, string const & oauth2Scope,
string const & oauth2RedirectUri, string baseUrl, string apiUrl)
: m_oauth2params{oauth2ClientId, oauth2Scope, oauth2RedirectUri},
m_baseUrl(std::move(baseUrl)), m_apiUrl(std::move(apiUrl))
{
}
OsmOAuth::OsmOAuth(string const & oauth2ClientId, string const & oauth2Scope, string const & oauth2RedirectUri,
string baseUrl, string apiUrl)
: m_oauth2params{oauth2ClientId, oauth2Scope, oauth2RedirectUri}
, m_baseUrl(std::move(baseUrl))
, m_apiUrl(std::move(apiUrl))
{}
// static
OsmOAuth OsmOAuth::ServerAuth()
{
@@ -121,11 +121,20 @@ OsmOAuth OsmOAuth::ProductionServerAuth()
return {OSM_OAUTH2_CLIENT_ID, OSM_OAUTH2_SCOPE, OSM_OAUTH2_REDIRECT_URI, kOsmMainSiteURL, kOsmApiURL};
}
void OsmOAuth::SetAuthToken(string const & oauthToken) { m_oauth2token = oauthToken; }
void OsmOAuth::SetAuthToken(string const & oauthToken)
{
m_oauth2token = oauthToken;
}
string const & OsmOAuth::GetAuthToken() const { return m_oauth2token; }
string const & OsmOAuth::GetAuthToken() const
{
return m_oauth2token;
}
bool OsmOAuth::IsAuthorized() const{ return IsValid(m_oauth2token); }
bool OsmOAuth::IsAuthorized() const
{
return IsValid(m_oauth2token);
}
// Opens a login page and extract a cookie and a secret token.
OsmOAuth::SessionID OsmOAuth::FetchSessionId(string const & subUrl, string const & cookies) const
@@ -140,7 +149,7 @@ OsmOAuth::SessionID OsmOAuth::FetchSessionId(string const & subUrl, string const
if (request.ErrorCode() != HTTP::OK)
MYTHROW(FetchSessionIdError, (DebugPrint(request)));
SessionID sid = { request.CombinedCookies(), FindAuthenticityToken(request.ServerResponse()) };
SessionID sid = {request.CombinedCookies(), FindAuthenticityToken(request.ServerResponse())};
if (sid.m_cookies.empty() || sid.m_authenticityToken.empty())
MYTHROW(FetchSessionIdError, ("Cookies and/or token are empty for request", DebugPrint(request)));
return sid;
@@ -158,17 +167,15 @@ void OsmOAuth::LogoutUser(SessionID const & sid) const
bool OsmOAuth::LoginUserPassword(string const & login, string const & password, SessionID const & sid) const
{
auto params = BuildPostRequest({
{"username", login},
{"password", password},
{"referer", "/"},
{"commit", "Login"},
{"authenticity_token", sid.m_authenticityToken}
});
auto params = BuildPostRequest({{"username", login},
{"password", password},
{"referer", "/"},
{"commit", "Login"},
{"authenticity_token", sid.m_authenticityToken}});
HttpClient request(m_baseUrl + "/login");
request.SetBodyData(std::move(params), "application/x-www-form-urlencoded")
.SetCookies(sid.m_cookies)
.SetFollowRedirects(true);
.SetCookies(sid.m_cookies)
.SetFollowRedirects(true);
if (!request.RunHttpRequest())
MYTHROW(NetworkError, ("LoginUserPassword Network error while connecting to", request.UrlRequested()));
@@ -193,8 +200,7 @@ bool OsmOAuth::LoginSocial(string const & callbackPart, string const & socialTok
{
string const url = m_baseUrl + callbackPart + socialToken;
HttpClient request(url);
request.SetCookies(sid.m_cookies)
.SetFollowRedirects(true);
request.SetCookies(sid.m_cookies).SetFollowRedirects(true);
if (!request.RunHttpRequest())
MYTHROW(NetworkError, ("LoginSocial Network error while connecting to", request.UrlRequested()));
if (request.ErrorCode() != HTTP::OK && request.ErrorCode() != HTTP::Found)
@@ -215,18 +221,16 @@ bool OsmOAuth::LoginSocial(string const & callbackPart, string const & socialTok
// Fakes a buttons press to automatically accept requested permissions.
string OsmOAuth::SendAuthRequest(string const & requestTokenKey, SessionID const & lastSid) const
{
auto params = BuildPostRequest({
{"authenticity_token", requestTokenKey},
{"client_id", m_oauth2params.m_clientId},
{"redirect_uri", m_oauth2params.m_redirectUri},
{"scope", m_oauth2params.m_scope},
{"response_type", "code"}
});
auto params = BuildPostRequest({{"authenticity_token", requestTokenKey},
{"client_id", m_oauth2params.m_clientId},
{"redirect_uri", m_oauth2params.m_redirectUri},
{"scope", m_oauth2params.m_scope},
{"response_type", "code"}});
HttpClient request(m_baseUrl + "/oauth2/authorize");
request.SetBodyData(std::move(params), "application/x-www-form-urlencoded")
.SetCookies(lastSid.m_cookies)
//.SetRawHeader("Origin", m_baseUrl)
.SetFollowRedirects(false);
.SetCookies(lastSid.m_cookies)
//.SetRawHeader("Origin", m_baseUrl)
.SetFollowRedirects(false);
if (!request.RunHttpRequest())
MYTHROW(NetworkError, ("SendAuthRequest Network error while connecting to", request.UrlRequested()));
if (!request.WasRedirected())
@@ -242,8 +246,7 @@ string OsmOAuth::SendAuthRequest(string const & requestTokenKey, SessionID const
string OsmOAuth::FetchRequestToken(SessionID const & sid) const
{
HttpClient request(BuildOAuth2Url());
request.SetCookies(sid.m_cookies)
.SetFollowRedirects(false);
request.SetCookies(sid.m_cookies).SetFollowRedirects(false);
if (!request.RunHttpRequest())
MYTHROW(NetworkError, ("FetchRequestToken Network error while connecting to", request.UrlRequested()));
@@ -257,7 +260,8 @@ string OsmOAuth::FetchRequestToken(SessionID const & sid) const
// Recieved URL in format "{OSM_OAUTH2_REDIRECT_URI}?code=XXXX". Extract code value
string const oauthCode = FindOauthCode(request.UrlReceived());
if (oauthCode.empty())
MYTHROW(OsmOAuth::NetworkError, ("FetchRequestToken Redirect url has no 'code' parameter", request.UrlReceived()));
MYTHROW(OsmOAuth::NetworkError,
("FetchRequestToken Redirect url has no 'code' parameter", request.UrlReceived()));
return oauthCode;
}
else
@@ -275,15 +279,12 @@ string OsmOAuth::FetchRequestToken(SessionID const & sid) const
string OsmOAuth::BuildOAuth2Url() const
{
auto requestTokenUrl = m_baseUrl + "/oauth2/authorize";
auto const requestTokenQuery = BuildPostRequest(
{
{"client_id", m_oauth2params.m_clientId},
{"redirect_uri", m_oauth2params.m_redirectUri},
{"scope", m_oauth2params.m_scope},
{"response_type", "code"}
});
return requestTokenUrl.append("?").append(requestTokenQuery);
auto requestTokenUrl = m_baseUrl + "/oauth2/authorize";
auto const requestTokenQuery = BuildPostRequest({{"client_id", m_oauth2params.m_clientId},
{"redirect_uri", m_oauth2params.m_redirectUri},
{"scope", m_oauth2params.m_scope},
{"response_type", "code"}});
return requestTokenUrl.append("?").append(requestTokenQuery);
}
string OsmOAuth::FinishAuthorization(string const & oauth2code) const
@@ -297,8 +298,7 @@ string OsmOAuth::FinishAuthorization(string const & oauth2code) const
});
HttpClient request(m_baseUrl + "/oauth2/token");
request.SetBodyData(std::move(params), "application/x-www-form-urlencoded")
.SetFollowRedirects(true);
request.SetBodyData(std::move(params), "application/x-www-form-urlencoded").SetFollowRedirects(true);
if (!request.RunHttpRequest())
MYTHROW(NetworkError, ("FinishAuthorization Network error while connecting to", request.UrlRequested()));
if (request.ErrorCode() != HTTP::OK)