pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Fixed ServerApi06::TestUserExists() method.

Browse source
This commit is contained in:
Alex Zolotarev 2016-01-09 11:45:52 +03:00 • committed by Sergey Yershov
parent bdfb608c8d
commit 7344df35c3
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
editor/editor_tests/server_api_test.cpp
View file

@ -21,8 +21,8 @@ UNIT_TEST(OSM_ServerAPI_TestUserExists)
{
OsmOAuth auth(kOsmConsumerKey, kOsmConsumerSecret, kOsmDevServer);
ServerApi06 api(auth);
TEST(api.TestUserExists(kValidOsmUser), ());
TEST(!api.TestUserExists(kInvalidOsmUser), ());
TEST_EQUAL(OsmOAuth::ResponseCode::OK, api.TestUserExists(kValidOsmUser), ());
TEST_EQUAL(OsmOAuth::ResponseCode::NotFound, api.TestUserExists(kInvalidOsmUser), ());
}
namespace

5
editor/server_api.cpp
View file

@ -94,11 +94,10 @@ bool ServerApi06::CloseChangeSet(uint64_t changesetId) const
return false;
}
bool ServerApi06::TestUserExists(string const & userName)
OsmOAuth::ResponseCode ServerApi06::TestUserExists(string const & userName)
{
string const method = "/user/" + UrlEncode(userName);
OsmOAuth::Response const response = m_auth.DirectRequest(method, false);
return response.first == OsmOAuth::ResponseCode::OK;
return m_auth.DirectRequest(method, false).first;
}
string ServerApi06::GetXmlFeaturesInRect(m2::RectD const & latLonRect) const

3
editor/server_api.hpp
View file

@ -28,7 +28,8 @@ public:
ServerApi06(OsmOAuth & auth);
/// This function can be used to check if user did not confirm email validation link after registration.
bool TestUserExists(string const & userName);
/// @returns OK if user exists, NotFound if it is not, and ServerError if there is no connection.
OsmOAuth::ResponseCode TestUserExists(string const & userName);
/// Please use at least created_by=* and comment=* tags.
bool CreateChangeSet(TKeyValueTags const & kvTags, uint64_t & outChangeSetId) const;
/// nodeXml should be wrapped into <osm> ... </osm> tags.