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

Removed unused code for oauth2 client secret

Browse Source 
Signed-off-by: map per <map-per@gmx.de>
This commit is contained in:
map per
2025-06-14 09:39:55 +02:00
parent 47c9940ee3
commit a1bb9769f3
3 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
editor/osm_auth.cpp
View File

@@ -80,9 +80,9 @@ bool OsmOAuth::IsValid(string const & ks)
return !ks.empty(); return !ks.empty();
} }
OsmOAuth::OsmOAuth(string const & oauth2ClientId, string const & oauth2Secret, string const & oauth2Scope, OsmOAuth::OsmOAuth(string const & oauth2ClientId, string const & oauth2Scope,
string const & oauth2RedirectUri, string baseUrl, string apiUrl) string const & oauth2RedirectUri, string baseUrl, string apiUrl)
: m_oauth2params{oauth2ClientId, oauth2Secret, oauth2Scope, oauth2RedirectUri}, : m_oauth2params{oauth2ClientId, oauth2Scope, oauth2RedirectUri},
m_baseUrl(std::move(baseUrl)), m_apiUrl(std::move(apiUrl)) m_baseUrl(std::move(baseUrl)), m_apiUrl(std::move(apiUrl))
{ {
} }
@@ -108,18 +108,17 @@ OsmOAuth OsmOAuth::DevServerAuth()
constexpr char const * kOsmDevServer = "https://master.apis.dev.openstreetmap.org"; constexpr char const * kOsmDevServer = "https://master.apis.dev.openstreetmap.org";
// CoMaps keys for OSM dev server // CoMaps keys for OSM dev server
constexpr char const * kOsmDevClientId = "Tj8yyx3FWy_N5wz6sUTAXTM6YBAiwVgM7sRLrLix2u8"; constexpr char const * kOsmDevClientId = "Tj8yyx3FWy_N5wz6sUTAXTM6YBAiwVgM7sRLrLix2u8";
constexpr char const * kOsmDevClientSecret = "TdEQaoAQkcu_E2HWfr0RDaG5hMDk3gThO1RvWQtQc8o";
constexpr char const * kOsmDevScope = "read_prefs write_api write_notes"; constexpr char const * kOsmDevScope = "read_prefs write_api write_notes";
constexpr char const * kOsmDevRedirectUri = "cm://oauth2/osm/callback"; constexpr char const * kOsmDevRedirectUri = "cm://oauth2/osm/callback";
return {kOsmDevClientId, kOsmDevClientSecret, kOsmDevScope, kOsmDevRedirectUri, kOsmDevServer, kOsmDevServer}; return {kOsmDevClientId, kOsmDevScope, kOsmDevRedirectUri, kOsmDevServer, kOsmDevServer};
} }
// static // static
OsmOAuth OsmOAuth::ProductionServerAuth() OsmOAuth OsmOAuth::ProductionServerAuth()
{ {
constexpr char const * kOsmMainSiteURL = "https://www.openstreetmap.org"; constexpr char const * kOsmMainSiteURL = "https://www.openstreetmap.org";
constexpr char const * kOsmApiURL = "https://api.openstreetmap.org"; constexpr char const * kOsmApiURL = "https://api.openstreetmap.org";
return {OSM_OAUTH2_CLIENT_ID, OSM_OAUTH2_CLIENT_SECRET, OSM_OAUTH2_SCOPE, OSM_OAUTH2_REDIRECT_URI, kOsmMainSiteURL, kOsmApiURL}; 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; }
@@ -289,12 +288,10 @@ string OsmOAuth::BuildOAuth2Url() const
string OsmOAuth::FinishAuthorization(string const & oauth2code) const string OsmOAuth::FinishAuthorization(string const & oauth2code) const
{ {
/// @todo(pastk): remove client_secret everywhere, its not required for auth through non-confidential apps
auto params = BuildPostRequest({ auto params = BuildPostRequest({
{"grant_type", "authorization_code"}, {"grant_type", "authorization_code"},
{"code", oauth2code}, {"code", oauth2code},
{"client_id", m_oauth2params.m_clientId}, {"client_id", m_oauth2params.m_clientId},
//{"client_secret", m_oauth2params.m_clientSecret},
{"redirect_uri", m_oauth2params.m_redirectUri}, {"redirect_uri", m_oauth2params.m_redirectUri},
{"scope", m_oauth2params.m_scope}, {"scope", m_oauth2params.m_scope},
}); });

4
editor/osm_auth.hpp
View File

@@ -10,7 +10,6 @@ namespace osm
struct Oauth2Params struct Oauth2Params
{ {
std::string m_clientId; std::string m_clientId;
std::string m_clientSecret;
std::string m_scope; std::string m_scope;
std::string m_redirectUri; std::string m_redirectUri;
}; };
@@ -60,7 +59,7 @@ public:
static bool IsValid(std::string const & ks); static bool IsValid(std::string const & ks);
/// The constructor. Simply stores a lot of strings in fields. /// The constructor. Simply stores a lot of strings in fields.
OsmOAuth(std::string const & oauth2ClientId, std::string const & oauth2Secret, std::string const & oauth2Scope, OsmOAuth(std::string const & oauth2ClientId, std::string const & oauth2Scope,
std::string const & oauth2RedirectUri, std::string baseUrl, std::string apiUrl); std::string const & oauth2RedirectUri, std::string baseUrl, std::string apiUrl);
/// Should be used everywhere in production code instead of servers below. /// Should be used everywhere in production code instead of servers below.
@@ -96,7 +95,6 @@ public:
// Getters // Getters
std::string GetBaseUrl() const { return m_baseUrl; } std::string GetBaseUrl() const { return m_baseUrl; }
std::string GetClientId() const { return m_oauth2params.m_clientId; } std::string GetClientId() const { return m_oauth2params.m_clientId; }
std::string GetClientSecret() const { return m_oauth2params.m_clientSecret; }
std::string GetScope() const { return m_oauth2params.m_scope; } std::string GetScope() const { return m_oauth2params.m_scope; }
std::string GetRedirectUri() const { return m_oauth2params.m_redirectUri; } std::string GetRedirectUri() const { return m_oauth2params.m_redirectUri; }

1
private.h
View File

@@ -1,7 +1,6 @@
#pragma once #pragma once
#define OSM_OAUTH2_CLIENT_ID "feHq7fMSmKzZD6XLgPPah3whHPbavSTrJCgwhLMmqT0" #define OSM_OAUTH2_CLIENT_ID "feHq7fMSmKzZD6XLgPPah3whHPbavSTrJCgwhLMmqT0"
#define OSM_OAUTH2_CLIENT_SECRET ""
#define OSM_OAUTH2_REDIRECT_URI "cm://oauth2/osm/callback" #define OSM_OAUTH2_REDIRECT_URI "cm://oauth2/osm/callback"
#define OSM_OAUTH2_SCOPE "read_prefs write_api write_notes" #define OSM_OAUTH2_SCOPE "read_prefs write_api write_notes"
#define MWM_GEOLOCATION_SERVER "" #define MWM_GEOLOCATION_SERVER ""