Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(410)

Unified Diff: remoting/host/remoting_me2me_host.cc

Issue 959033004: Remove ClientLogin support from remoting host (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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 | « remoting/host/it2me/it2me_native_messaging_host.cc ('k') | remoting/host/signaling_connector.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/remoting_me2me_host.cc
diff --git a/remoting/host/remoting_me2me_host.cc b/remoting/host/remoting_me2me_host.cc
index 8cf6ccee505728f99c5e5587acba15fe03f03f5e..51331685545149971eb38bd295ca6849fd48cc2a 100644
--- a/remoting/host/remoting_me2me_host.cc
+++ b/remoting/host/remoting_me2me_host.cc
@@ -947,29 +947,13 @@ bool HostProcess::ApplyConfig(const base::DictionaryValue& config) {
return false;
}
- // Use an XMPP connection to the Talk network for session signalling.
+ // Use an XMPP connection to the Talk network for session signaling.
if (!config.GetString(kXmppLoginConfigPath, &xmpp_server_config_.username) ||
- !(config.GetString(kXmppAuthTokenConfigPath,
- &xmpp_server_config_.auth_token) ||
- config.GetString(kOAuthRefreshTokenConfigPath,
- &oauth_refresh_token_))) {
+ !config.GetString(kOAuthRefreshTokenConfigPath, &oauth_refresh_token_)) {
LOG(ERROR) << "XMPP credentials are not defined in the config.";
return false;
}
- if (!oauth_refresh_token_.empty()) {
- // SignalingConnector (inside HostSignalingManager) is responsible for
- // getting OAuth token.
- xmpp_server_config_.auth_token = "";
- xmpp_server_config_.auth_service = "oauth2";
- } else if (!config.GetString(kXmppAuthServiceConfigPath,
- &xmpp_server_config_.auth_service)) {
- // For the me2me host, we default to ClientLogin token for chromiumsync
- // because earlier versions of the host had no HTTP stack with which to
- // request an OAuth2 access token.
- xmpp_server_config_.auth_service = kChromotingTokenDefaultServiceName;
- }
-
if (config.GetString(kHostOwnerConfigPath, &host_owner_)) {
// Service account configs have a host_owner, different from the xmpp_login.
use_service_account_ = true;
« no previous file with comments | « remoting/host/it2me/it2me_native_messaging_host.cc ('k') | remoting/host/signaling_connector.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698