Added method to host daemon to exchange an auth code for just an OAuth

refresh token.

This change is necessary because, if the host daemon attempts to
retrieve an email address for an auth code from GCD, the request
fails, causing the host daemon to report failure and not return a
refresh token.

BUG=471928

Review URL: https://codereview.chromium.org/1076093003

Cr-Commit-Position: refs/heads/master@{#326895}

remoting/host/setup/me2me_native_messaging_host.cc

@@ -49,7 +49,8 @@ const char* kServiceAccountRedirectUri = "oob";
 // Features supported in addition to the base protocol.
 const char* kSupportedFeatures[] = {
   "pairingRegistry",
-  "oauthClient"
+  "oauthClient",
+  "getRefreshTokenFromAuthCode",
 };
 
 // Helper to extract the "config" part of a message as a DictionaryValue.
@@ -160,7 +161,11 @@ void Me2MeNativeMessagingHost::OnMessage(scoped_ptr<base::Value> message) {
   } else if (type == "getHostClientId") {
     ProcessGetHostClientId(message_dict.Pass(), response.Pass());
   } else if (type == "getCredentialsFromAuthCode") {
-    ProcessGetCredentialsFromAuthCode(message_dict.Pass(), response.Pass());
+    ProcessGetCredentialsFromAuthCode(
+        message_dict.Pass(), response.Pass(), true);
+  } else if (type == "getRefreshTokenFromAuthCode") {
+    ProcessGetCredentialsFromAuthCode(
+        message_dict.Pass(), response.Pass(), false);
   } else {
     LOG(ERROR) << "Unsupported request type: " << type;
     OnError();
@@ -422,7 +427,8 @@ void Me2MeNativeMessagingHost::ProcessGetHostClientId(
 
 void Me2MeNativeMessagingHost::ProcessGetCredentialsFromAuthCode(
     scoped_ptr<base::DictionaryValue> message,
-    scoped_ptr<base::DictionaryValue> response) {
+    scoped_ptr<base::DictionaryValue> response,
+    bool need_user_email) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   std::string auth_code;
@@ -439,7 +445,7 @@ void Me2MeNativeMessagingHost::ProcessGetCredentialsFromAuthCode(
   };
 
   oauth_client_->GetCredentialsFromAuthCode(
-      oauth_client_info, auth_code, base::Bind(
+      oauth_client_info, auth_code, need_user_email, base::Bind(
           &Me2MeNativeMessagingHost::SendCredentialsResponse, weak_ptr_,
           base::Passed(&response)));
 }
@@ -513,7 +519,9 @@ void Me2MeNativeMessagingHost::SendCredentialsResponse(
     const std::string& refresh_token) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
-  response->SetString("userEmail", user_email);
+  if (!user_email.empty()) {
+    response->SetString("userEmail", user_email);
+  }
   response->SetString("refreshToken", refresh_token);
   channel_->SendMessage(response.Pass());
 }

remoting/host/setup/me2me_native_messaging_host.h

@@ -100,7 +100,8 @@ class Me2MeNativeMessagingHost
       scoped_ptr<base::DictionaryValue> response);
   void ProcessGetCredentialsFromAuthCode(
       scoped_ptr<base::DictionaryValue> message,
-      scoped_ptr<base::DictionaryValue> response);
+      scoped_ptr<base::DictionaryValue> response,
+      bool need_user_email);
 
   // These Send... methods get called on the DaemonController's internal thread,
   // or on the calling thread if called by the PairingRegistry.

remoting/host/setup/oauth_client.cc

@@ -23,13 +23,16 @@ OAuthClient::~OAuthClient() {
 void OAuthClient::GetCredentialsFromAuthCode(
     const gaia::OAuthClientInfo& oauth_client_info,
     const std::string& auth_code,
+    bool need_user_email,
     CompletionCallback on_done) {
 
   if (!on_done_.is_null()) {
-    pending_requests_.push(Request(oauth_client_info, auth_code, on_done));
+    pending_requests_.push(
+        Request(oauth_client_info, auth_code, need_user_email, on_done));
     return;
   }
 
+  need_user_email_ = need_user_email;
   on_done_ = on_done;
   // Map the authorization code to refresh and access tokens.
   gaia_oauth_client_.GetTokensFromAuthCode(oauth_client_info, auth_code,
@@ -41,8 +44,12 @@ void OAuthClient::OnGetTokensResponse(
     const std::string& access_token,
     int expires_in_seconds) {
   refresh_token_ = refresh_token;
-  // Get the email corresponding to the access token.
-  gaia_oauth_client_.GetUserEmail(access_token, kMaxGaiaRetries, this);
+  if (need_user_email_) {
+    // Get the email corresponding to the access token.
+    gaia_oauth_client_.GetUserEmail(access_token, kMaxGaiaRetries, this);
+  } else {
+    SendResponse("", refresh_token_);
+  }
 }
 
 void OAuthClient::OnRefreshTokenResponse(
@@ -64,7 +71,10 @@ void OAuthClient::SendResponse(const std::string& user_email,
     pending_requests_.pop();
     // GetCredentialsFromAuthCode is asynchronous, so it's safe to call it here.
     GetCredentialsFromAuthCode(
-        request.oauth_client_info, request.auth_code, request.on_done);
+        request.oauth_client_info,
+        request.auth_code,
+        request.need_user_email,
+        request.on_done);
   }
 }
 
@@ -83,9 +93,11 @@ void OAuthClient::OnNetworkError(int response_code) {
 OAuthClient::Request::Request(
     const gaia::OAuthClientInfo& oauth_client_info,
     const std::string& auth_code,
+    bool need_user_email,
     CompletionCallback on_done) {
   this->oauth_client_info = oauth_client_info;
   this->auth_code = auth_code;
+  this->need_user_email = need_user_email;
   this->on_done = on_done;
 }
 

remoting/host/setup/oauth_client.h

@@ -35,15 +35,17 @@ class OAuthClient : public gaia::GaiaOAuthClient::Delegate {
 
   ~OAuthClient() override;
 
-  // Redeems |auth_code| using |oauth_client_info| to obtain |refresh_token| and
-  // |access_token|, then uses the userinfo endpoint to obtain |user_email|.
-  // Calls CompletionCallback with |user_email| and |refresh_token| when done,
-  // or with empty strings on error.
-  // If a request is received while another one is  being processed, it is
-  // enqueued and processed after the first one is finished.
+  // Redeems |auth_code| using |oauth_client_info| to obtain
+  // |refresh_token| and |access_token|, then, if |need_user_email| is
+  // true, uses the userinfo endpoint to obtain |user_email|.  Calls
+  // CompletionCallback with |user_email| and |refresh_token| when
+  // done, or with empty strings on error.  If a request is received
+  // while another one is being processed, it is enqueued and
+  // processed after the first one is finished.
   void GetCredentialsFromAuthCode(
       const gaia::OAuthClientInfo& oauth_client_info,
       const std::string& auth_code,
+      bool need_user_email,
       CompletionCallback on_done);
 
   // gaia::GaiaOAuthClient::Delegate
@@ -61,10 +63,12 @@ class OAuthClient : public gaia::GaiaOAuthClient::Delegate {
   struct Request {
     Request(const gaia::OAuthClientInfo& oauth_client_info,
             const std::string& auth_code,
+            bool need_user_email,
             CompletionCallback on_done);
     virtual ~Request();
     gaia::OAuthClientInfo oauth_client_info;
     std::string auth_code;
+    bool need_user_email;
     CompletionCallback on_done;
   };
 
@@ -74,6 +78,7 @@ class OAuthClient : public gaia::GaiaOAuthClient::Delegate {
   std::queue<Request> pending_requests_;
   gaia::GaiaOAuthClient gaia_oauth_client_;
   std::string refresh_token_;
+  bool need_user_email_;
   CompletionCallback on_done_;
 
   DISALLOW_COPY_AND_ASSIGN(OAuthClient);

remoting/webapp/crd/js/host_daemon_facade.js

@@ -294,6 +294,14 @@ remoting.HostDaemonFacade.prototype.handleIncomingMessage_ =
         throw 'Missing userEmail or refreshToken';
       }
 
+    case 'getRefreshTokenFromAuthCodeResponse':
+      var refreshToken = base.getStringAttr(message, 'refreshToken');
+      if (refreshToken) {
+        return refreshToken;
+      } else {
+        throw 'Missing refreshToken';
+      }
+
     default:
       throw 'Unexpected native message: ' + message;
   }
@@ -495,7 +503,6 @@ remoting.HostDaemonFacade.prototype.getHostClientId = function() {
 };
 
 /**
- *
  * @param {string} authorizationCode OAuth authorization code.
  * @return {!Promise<{remoting.XmppCredentials}>}
  */
@@ -506,3 +513,15 @@ remoting.HostDaemonFacade.prototype.getCredentialsFromAuthCode =
     authorizationCode: authorizationCode
   });
 };
+
+/**
+ * @param {string} authorizationCode OAuth authorization code.
+ * @return {!Promise<string>}
+ */
+remoting.HostDaemonFacade.prototype.getRefreshTokenFromAuthCode =
+    function(authorizationCode) {
+  return this.postMessage_({
+    type: 'getRefreshTokenFromAuthCode',
+    authorizationCode: authorizationCode
+  });
+};