jingle/notifier/base/notifier_options_util.cc - Issue 15421011: Use OAuth2 token for sync

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: jingle/notifier/base/notifier_options_util.cc

Issue 15421011: Use OAuth2 token for sync (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Remove token prefetch. Move UMA counters. Fix some tests. Etc. Created 7 years, 7 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:

Index: jingle/notifier/base/notifier_options_util.cc

diff --git a/jingle/notifier/base/notifier_options_util.cc b/jingle/notifier/base/notifier_options_util.cc

index 93bd173ea8e64b85f636a0e19be7f037ae1eeecb..fa48209ea699a5844288ff88bff8308ff2809cdf 100644

--- a/jingle/notifier/base/notifier_options_util.cc

+++ b/jingle/notifier/base/notifier_options_util.cc

@@ -24,10 +24,13 @@ buzz::XmppClientSettings MakeXmppClientSettings(

xmpp_client_settings.set_resource("chrome-sync");

xmpp_client_settings.set_host(jid.domain());

xmpp_client_settings.set_use_tls(buzz::TLS_ENABLED);

- xmpp_client_settings.set_auth_token(buzz::AUTH_MECHANISM_GOOGLE_TOKEN,

+ xmpp_client_settings.set_auth_token(notifier_options.auth_mechanism,

notifier_options.invalidate_xmpp_login ?

token + "bogus" : token);

- xmpp_client_settings.set_token_service("chromiumsync");

+ if (notifier_options.auth_mechanism == buzz::AUTH_MECHANISM_OAUTH2)

+ xmpp_client_settings.set_token_service("oauth2");

+ else

+ xmpp_client_settings.set_token_service("chromiumsync");

if (notifier_options.allow_insecure_connection) {

xmpp_client_settings.set_allow_plain(true);

xmpp_client_settings.set_use_tls(buzz::TLS_DISABLED);