diff options
| author | idana@chromium.org <idana@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-13 01:23:29 +0000 |
|---|---|---|
| committer | idana@chromium.org <idana@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-13 01:23:29 +0000 |
| commit | cc3abd1c3aa8f6fa72f7a2954474a81510ff03c1 (patch) | |
| tree | 3973dc9584f0105e3d4fbea06db9fcca6990f7ad /chrome/browser/sync | |
| parent | e6097d9ff69599093ad2101a513104dffd70a40e (diff) | |
| download | chromium_src-cc3abd1c3aa8f6fa72f7a2954474a81510ff03c1.zip chromium_src-cc3abd1c3aa8f6fa72f7a2954474a81510ff03c1.tar.gz chromium_src-cc3abd1c3aa8f6fa72f7a2954474a81510ff03c1.tar.bz2 | |
Revert 31865 - This change is patched from http://codereview.chromium.org/276071 by randy.posynick@gmail.com
Don't overwrite email with lowercase value from GetUserInfo().
BUG=20848
TEST=See bug for description
TBR=brg@chromium.org
Review URL: http://codereview.chromium.org/392016
TBR=idana@chromium.org
Review URL: http://codereview.chromium.org/384106
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31872 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync')
| -rw-r--r-- | chrome/browser/sync/engine/auth_watcher.cc | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/chrome/browser/sync/engine/auth_watcher.cc b/chrome/browser/sync/engine/auth_watcher.cc index b087671..1f78d15 100644 --- a/chrome/browser/sync/engine/auth_watcher.cc +++ b/chrome/browser/sync/engine/auth_watcher.cc @@ -107,24 +107,30 @@ void AuthWatcher::DoAuthenticateWithToken(const std::string& gaia_email, Authenticator auth(scm_, user_settings_); Authenticator::AuthenticationResult result = auth.AuthenticateToken(auth_token); + string email = gaia_email; + if (auth.display_email() && *auth.display_email()) { + email = auth.display_email(); + LOG(INFO) << "Auth returned email " << email << " for gaia email " << + gaia_email; + } AuthWatcherEvent event = {AuthWatcherEvent::ILLEGAL_VALUE , 0}; - gaia_->SetUsername(gaia_email); + gaia_->SetUsername(email); gaia_->SetAuthToken(auth_token, SAVE_IN_MEMORY_ONLY); const bool was_authenticated = NOT_AUTHENTICATED != status_; switch (result) { case Authenticator::SUCCESS: { status_ = GAIA_AUTHENTICATED; - const PathString& share_name = gaia_email; - user_settings_->SwitchUser(gaia_email); + const PathString& share_name = email; + user_settings_->SwitchUser(email); // Set the authentication token for notifications - talk_mediator_->SetAuthToken(gaia_email, auth_token); + talk_mediator_->SetAuthToken(email, auth_token); scm_->set_auth_token(auth_token); if (!was_authenticated) LoadDirectoryListAndOpen(share_name); - NotifyAuthSucceeded(gaia_email); + NotifyAuthSucceeded(email); return; } case Authenticator::BAD_AUTH_TOKEN: @@ -142,7 +148,7 @@ void AuthWatcher::DoAuthenticateWithToken(const std::string& gaia_email, return; } // Always fall back to local authentication. - if (was_authenticated || AuthenticateLocally(gaia_email)) { + if (was_authenticated || AuthenticateLocally(email)) { if (AuthWatcherEvent::SERVICE_CONNECTION_FAILED == event.what_happened) return; } |