From 50b59fdd627927faec9a58c39a6679f188c09856 Mon Sep 17 00:00:00 2001 From: Ilya Zverev Date: Sat, 23 Jan 2016 13:00:50 +0300 Subject: [PATCH] [editor] Review fixes for reset password --- editor/editor_tests/osm_auth_test.cpp | 4 ++-- editor/osm_auth.cpp | 5 ++--- editor/osm_auth.hpp | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/editor/editor_tests/osm_auth_test.cpp b/editor/editor_tests/osm_auth_test.cpp index fad29fefc6..2f57ea578e 100644 --- a/editor/editor_tests/osm_auth_test.cpp +++ b/editor/editor_tests/osm_auth_test.cpp @@ -59,8 +59,8 @@ UNIT_TEST(OSM_Auth_Facebook) UNIT_TEST(OSM_Auth_ForgotPassword) { OsmOAuth auth = OsmOAuth::IZServerAuth(); - auto result = auth.RestorePassword(kIZForgotPasswordEmail); + auto result = auth.ResetPassword(kIZForgotPasswordEmail); TEST_EQUAL(result, OsmOAuth::AuthResult::OK, ("Correct email")); - result = auth.RestorePassword("incorrect@ema.il"); + result = auth.ResetPassword("not@registered.email"); TEST_EQUAL(result, OsmOAuth::AuthResult::NoEmail, ("Incorrect email")); } diff --git a/editor/osm_auth.cpp b/editor/osm_auth.cpp index 688fe2a721..3ad446b944 100644 --- a/editor/osm_auth.cpp +++ b/editor/osm_auth.cpp @@ -296,7 +296,7 @@ OsmOAuth::TUrlKeySecret OsmOAuth::GetGoogleOAuthURL() const return TUrlKeySecret(url, requestToken); } -OsmOAuth::AuthResult OsmOAuth::RestorePassword(string const & email) const +OsmOAuth::AuthResult OsmOAuth::ResetPassword(string const & email) const { string const kForgotPasswordUrlPart = "/user/forgot-password"; @@ -316,8 +316,7 @@ OsmOAuth::AuthResult OsmOAuth::RestorePassword(string const & email) const if (!request.RunHTTPRequest()) return AuthResult::NetworkError; - string const content = request.server_response(); - return content.find("
") == string::npos ? AuthResult::NoEmail : AuthResult::OK; + return request.was_redirected() && request.url_received().find(m_baseUrl) != string::npos ? AuthResult::OK : AuthResult::NoEmail; } OsmOAuth::Response OsmOAuth::Request(TKeySecret const & keySecret, string const & method, string const & httpMethod, string const & body) const diff --git a/editor/osm_auth.hpp b/editor/osm_auth.hpp index d6673d8a48..61edafa901 100644 --- a/editor/osm_auth.hpp +++ b/editor/osm_auth.hpp @@ -66,7 +66,7 @@ public: AuthResult AuthorizePassword(string const & login, string const & password, TKeySecret & outKeySecret) const; AuthResult AuthorizeFacebook(string const & facebookToken, TKeySecret & outKeySecret) const; AuthResult AuthorizeGoogle(string const & googleToken, TKeySecret & outKeySecret) const; - AuthResult RestorePassword(string const & email) const; + AuthResult ResetPassword(string const & email) const; /// @param[method] The API method, must start with a forward slash. Response Request(TKeySecret const & keySecret, string const & method, string const & httpMethod = "GET", string const & body = "") const; //@}