chrome/browser/ui/webui/signin/inline_login_handler_impl.cc - Issue 617183003: Make sure GetAuthenticatedAccountId() returns a canonicalized id.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/webui/signin/inline_login_handler_impl.cc

Issue 617183003: Make sure GetAuthenticatedAccountId() returns a canonicalized id. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebased Created 6 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/app_list/search/people/people_provider.cc ('k') | components/enhanced_bookmarks/bookmark_server_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/signin/inline_login_handler_impl.cc

diff --git a/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc b/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc

index 03dd905e4a1572a5280f9a90cba11bd8d07e10bc..9da3ddb27033e23a46627f5aec16bbc2230b2dbd 100644

--- a/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc

+++ b/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc

@@ -13,6 +13,7 @@

#include "base/values.h"

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/signin/about_signin_internals_factory.h"

+#include "chrome/browser/signin/account_tracker_service_factory.h"

#include "chrome/browser/signin/chrome_signin_client_factory.h"

#include "chrome/browser/signin/local_auth.h"

#include "chrome/browser/signin/profile_oauth2_token_service_factory.h"

@@ -29,6 +30,7 @@

#include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"

#include "chrome/common/url_constants.h"

#include "components/signin/core/browser/about_signin_internals.h"

+#include "components/signin/core/browser/account_tracker_service.h"

#include "components/signin/core/browser/profile_oauth2_token_service.h"

#include "components/signin/core/browser/signin_error_controller.h"

#include "components/signin/core/browser/signin_oauth_helper.h"

@@ -131,8 +133,14 @@ void InlineSigninHelper::OnSigninOAuthInformationAvailable(

if (source == signin::SOURCE_AVATAR_BUBBLE_ADD_ACCOUNT ||

source == signin::SOURCE_REAUTH) {

+ // TODO(rogerta): the javascript code will need to pass in the gaia-id

+ // of the account instead of the email when chrome uses gaia-id as key.

+ DCHECK_EQ(AccountTrackerService::MIGRATION_NOT_STARTED,

+ AccountTrackerServiceFactory::GetForProfile(profile_)->

+ GetMigrationState());

+ const std::string account_id = gaia::CanonicalizeEmail(email);

ProfileOAuth2TokenServiceFactory::GetForProfile(profile_)->

- UpdateCredentials(email, refresh_token);

+ UpdateCredentials(account_id, refresh_token);

if (signin::IsAutoCloseEnabledInURL(current_url_)) {

// Close the gaia sign in tab via a task to make sure we aren't in the