Add in support for connecting with just the OAuth2 token. Default to OAuth2.

remoting/client/appengine/static_files/chromoting_session.js

 // 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.
 
 // Maximum numer of lines to record in the debug log.
 // Only the most recent <n> lines are displayed.
 var MAX_DEBUG_LOG_SIZE = 1000;
 
 // Message id so that we can identify (and ignore) message fade operations for
 // old messages.  This starts at 1 and is incremented for each new message.
@@ skipping 35 matching lines @@
   xhr.withCredentials = true;
   xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
   xhr.onreadystatechange = function() {
     if (xhr.readyState == 4) {
       if (xhr.status == 200) {
         addToDebugLog('Receiving Iq: --' + xhr.responseText + '--');
         var clientjid = xhr.responseText;
 
         chromoting.plugin.sendIq = sendIq;
         // TODO:(jamiewalch): Pass in the correct nonce.
-        chromoting.plugin.connectSandboxed(clientjid, chromoting.hostjid, '');
+        chromoting.plugin.connectSandboxed(clientjid, chromoting.hostjid);

[Jamie, 2011/05/23 19:24:12]

Add a TODO here to revisit once it's been renamed and supports oauth2 tokens?

[awong, 2011/05/23 20:43:23]

Don't think it's necessary.  All that code will just break anyways. :)

         // TODO(ajwong): This should just be feedIq();
         window.setTimeout(feedIq, 1000);
       } else {
         addToDebugLog('FailedToConnect: --' + xhr.responseText +
                       '-- (status=' + xhr.status + ')');
         setClientStateMessage("Failed")
       }
     }
   }
   xhr.send('host_jid=' + encodeURIComponent(chromoting.hostjid) +
            '&username=' + encodeURIComponent(chromoting.username) +
-           '&password=' + encodeURIComponent(chromoting.xmppAuthToken));
+           '&password=' + encodeURIComponent(chromoting.talkToken));
   setClientStateMessage("Connecting")
 }
 
 function sendIq(msg) {
   addToDebugLog('Sending Iq: ' + msg);
 
   // Extract the top level fields of the Iq packet.
   // TODO(ajwong): Can the plugin just return these fields broken out.
   parser = new DOMParser();
   iqNode = parser.parseFromString(msg,"text/xml").firstChild;
@@ skipping 14 matching lines @@
 }
 
 function init() {
   // Kick off the connection.
   var plugin = document.getElementById('chromoting');
 
   chromoting.plugin = plugin;
   chromoting.username = document.username;
   chromoting.hostname = document.hostname;
   chromoting.hostjid = document.hostjid;
-  chromoting.xmppAuthToken = document.xmppAuthToken;
+  chromoting.talkToken = document.talkToken;
   chromoting.connectMethod = document.connectMethod;
 
   // Only allow https connections to the httpXmppProxy unless we're running in
   // insecure mode.
   if (document.insecure != "1" &&
       document.httpXmppProxy.search(/^ *https:\/\//) == -1) {
     addToDebugLog('Aborting. httpXmppProxy does not specify https protocol: ' +
                   document.httpXmppProxy);
     return;
   }
@@ skipping 11 matching lines @@
   addToDebugLog('Connect to ' + chromoting.hostname + ' as user ' +
                 chromoting.username);
 
   // TODO(garykac): Clean exit if |connect| isn't a function.
   if (typeof plugin.connect === 'function') {
     if (chromoting.connectMethod == "sandboxed") {
       registerConnection();
     } else {
       // TODO:(jamiewalch): Pass in the correct nonce.
       plugin.connect(chromoting.username, chromoting.hostjid,
-                     chromoting.xmppAuthToken, '');
+                     chromoting.talkToken, '');
     }
   } else {
     addToDebugLog('ERROR: chromoting plugin not loaded');
     setClientStateMessage('Plugin not loaded');
   }
 
   document.getElementById('title').innerText = chromoting.hostname;
 }
 
 function toggleDebugLog() {
@@ skipping 193 matching lines @@
   setClientStateMessage(
       "Video stats: bandwidth: " + videoBandwidth.toFixed(2) + "Kbps" +
       ", Latency: capture: " + videoCaptureLatency.toFixed(2) + "ms" +
       ", encode: " + videoEncodeLatency.toFixed(2) + "ms" +
       ", decode: " + videoDecodeLatency.toFixed(2) + "ms" +
       ", render: " + videoRenderLatency.toFixed(2) + "ms");
 
   // Update the stats once per second.
   window.setTimeout("updateStatusBarStats()", 1000);
 }