Wire in OAuth2 support into non-sandboxed connections in libjingle.

remoting/client/plugin/chromoting_scriptable_object.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "remoting/client/plugin/chromoting_scriptable_object.h"
 
 #include "base/logging.h"
 #include "base/stringprintf.h"
 #include "ppapi/cpp/var.h"
+#include "remoting/base/auth_token_util.h"
 #include "remoting/client/client_config.h"
 #include "remoting/client/chromoting_stats.h"
 #include "remoting/client/plugin/chromoting_instance.h"
 #include "remoting/client/plugin/pepper_xmpp_proxy.h"
 
 using pp::Var;
 
 namespace remoting {
 
 namespace {
@@ skipping 360 matching lines @@
 
   return Var();
 }
 
 Var ChromotingScriptableObject::DoConnectUnsandboxed(
     const std::vector<Var>& args,
     Var* exception) {
   // Parameter order is:
   //   host_jid
   //   username
-  //   xmpp_token
+  //   auth_token
   //   access_code (optional)
   unsigned int arg = 0;
   if (!args[arg].is_string()) {
     *exception = Var("The host_jid must be a string.");
     return Var();
   }
   std::string host_jid = args[arg++].AsString();
 
   if (!args[arg].is_string()) {
     *exception = Var("The username must be a string.");
     return Var();
   }
   std::string username = args[arg++].AsString();
 
   if (!args[arg].is_string()) {
-    *exception = Var("The auth_token must be a string.");
+    *exception = Var("The auth_token_with_service must be a string.");
     return Var();
   }
-  std::string auth_token = args[arg++].AsString();
+  std::string auth_token_with_service = args[arg++].AsString();
+
+  std::string auth_service;
+  std::string auth_token;
+  ParseAuthTokenWithService(auth_token_with_service, &auth_token,
+                            &auth_service);
 
   std::string access_code;
   if (args.size() > arg) {
     if (!args[arg].is_string()) {
       *exception = Var("The access code must be a string.");
       return Var();
     }
     access_code = args[arg++].AsString();
   }
 
   if (args.size() != arg) {
     *exception = Var("Too many agruments passed to connect().");
     return Var();
   }
 
   LogDebugInfo("Connecting to host.");
   ClientConfig config;
   config.host_jid = host_jid;
   config.username = username;
   config.auth_token = auth_token;
+  config.auth_service = auth_service;
   config.nonce = access_code;
   VLOG(1) << "host_jid: " << host_jid << ", username: " << username
+          << ", auth_service: " << auth_service
           << ", access_code: " << access_code;
   instance_->Connect(config);
 
   return Var();
 }
 
 Var ChromotingScriptableObject::DoDisconnect(const std::vector<Var>& args,
                                              Var* exception) {
   LogDebugInfo("Disconnecting from host.");
 
@@ skipping 53 matching lines @@
     *exception = Var("response_xml must be a string.");
     return Var();
   }
 
   xmpp_proxy_->OnIq(args[0].AsString());
 
   return Var();
 }
 
 }  // namespace remoting