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

remoting/webapp/me2mom/remoting.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.
 
 // TODO(ajwong): This seems like a bad idea to share the exact same object
 // with the background page.  Why are we doing it like this?
 var remoting = chrome.extension.getBackgroundPage().remoting;
 
 XMPP_LOGIN_NAME = 'xmpp_login';
 XMPP_TOKEN_NAME = 'xmpp_token';
@@ skipping 13 matching lines @@
     document.getElementById('oauth2_code_button').style.display = 'inline';
     document.getElementById('oauth2_clear_button').style.display = 'none';
     document.getElementById('oauth2_form').style.display = 'inline';
   }
   var xmpp_status = document.getElementById('xmpp_status');
   if (remoting.getItem(XMPP_TOKEN_NAME) && remoting.getItem(XMPP_LOGIN_NAME)) {
     document.getElementById('xmpp_clear').style.display = 'inline';
     document.getElementById('xmpp_form').style.display = 'none';
     xmpp_status.innerText = 'OK';
     xmpp_status.style.color = 'green';
-    remoting.xmppAuthToken = remoting.getItem(XMPP_TOKEN_NAME);
   } else {
     document.getElementById('xmpp_clear').style.display = 'none';
     document.getElementById('xmpp_form').style.display = 'inline';
     xmpp_status.innerText = 'Unauthorized';
     xmpp_status.style.color = 'red';
   }
+  var current_email = document.getElementById('current_email');
+  if (remoting.getItem(XMPP_LOGIN_NAME)) {

[Wez, 2011/05/25 03:57:46]

It's a bit confusing that XMPP_LOGIN_NAME contains a field called "email"...

[awong, 2011/05/25 16:56:56]

Yes...I'm not going to change this for now.  We're going to overhaul the storage
of everything soonish.  For right now, the logic is a bit tangled and I want to
easily revert to XMPP-land by just re-exposing the div.

+    oauth2_status.style.color = 'green';
+    current_email.innerText = remoting.getItem(XMPP_LOGIN_NAME);
+  } else {
+    oauth2_status.style.color = 'red';
+    current_email.innerText = 'missing e-mail';
+  }
 }
 
 function clientLoginError_(xhr) {
   // If there's an error URL, load it into an iframe.
   var url_line = xhr.responseText.match('Url=.*');
   if (url_line) {
     url = url_line[0].substr(4);
     var error_frame = document.getElementById('xmpp_error');
     error_frame.src = url;
     error_frame.style.display = 'block';
@@ skipping 81 matching lines @@
       '&Email=' + encodeURIComponent(form['xmpp_username'].value) +
       '&Passwd=' + encodeURIComponent(form['xmpp_password'].value);
 
   if (captcha_result[0]) {
     post_data += '&logintoken=' + encodeURIComponent(captcha_result[0]) +
         '&logincaptcha=' + encodeURIComponent(captcha_result[1]);
   }
   xhr.send(post_data);
 }
 
+function setEmail(form) {
+  remoting.setItem(XMPP_LOGIN_NAME, form['new_email'].value);
+  updateAuthStatus_();
+}
+
 function authorizeOAuth2(code) {
   remoting.oauth2.exchangeCodeForToken(code, updateAuthStatus_);
 }
 
 function clearOAuth2() {
   remoting.oauth2.clear();
   updateAuthStatus_();
 }
 
 function clearXmpp() {
@@ skipping 35 matching lines @@
                   'preparing_to_share',
                   'ready_to_share',
                   'shared']);
 }
 
 function setClientMode(mode) {
   setMode_(mode, ['unconnected', 'connecting', 'connect_failed']);
 }
 
 function tryShare() {
+  if (remoting.oauth2.needsNewAccessToken()) {
+    remoting.oauth2.refreshAccessToken(tryShare);
+    return;
+  }
+
   var div = document.getElementById('plugin_wrapper');
   var plugin = document.createElement('embed');
   plugin.setAttribute('type', 'HOST_PLUGIN_MIMETYPE');
   plugin.setAttribute('hidden', 'true');
   plugin.setAttribute('id', HOST_PLUGIN_ID);
   div.appendChild(plugin);
   plugin.onStateChanged = onStateChanged_;
   plugin.connect(remoting.getItem(XMPP_LOGIN_NAME),
-                 remoting.getItem(XMPP_TOKEN_NAME));
+                 'oauth2:' + remoting.oauth2.getAccessToken());
 }
 
 function onStateChanged_() {
   var plugin = document.getElementById(HOST_PLUGIN_ID);
   var state = plugin.state;
   if (state == plugin.REQUESTED_ACCESS_CODE) {
     setHostMode('preparing_to_share');
   } else if (state == plugin.RECEIVED_ACCESS_CODE) {
     var access_code = plugin.accessCode;
     var access_code_display = document.getElementById('access_code_display');
@@ skipping 64 matching lines @@
 
     xhr.open('GET',
              'https://www.googleapis.com/chromoting/v1/support-hosts/' +
                  encodeURIComponent(support_id),
              true);
     xhr.setRequestHeader('Authorization',
                          'OAuth ' + remoting.oauth2.getAccessToken());
     xhr.send(null);
 }
 
-function tryConnect(form) {
-  remoting.accessCode = normalizeAccessCode(form['access_code_entry'].value);
+function tryConnect(accessCode) {
+  if (remoting.oauth2.needsNewAccessToken()) {
+    remoting.oauth2.refreshAccessToken(function() {
+      tryConnect(accessCode);

[Wez, 2011/05/25 03:57:46]

Is there any possibility of this getting stuck in a loop if something goes
wrong?

[awong, 2011/05/25 17:07:31]

Good point.  Added simple break for now.

+    });
+    return;
+  }
+
+  remoting.accessCode = accessCode;
   // TODO(jamiewalch): Since the mapping from (SupportId, HostSecret) to
   // AccessCode is not yet defined, assume it's hyphen-separated for now.
   var parts = remoting.accessCode.split('-');
   if (parts.length != 2) {
     showConnectError_(404);
   } else {
     setClientMode('connecting');
-    if (remoting.oauth2.needsNewAccessToken()) {
-      remoting.oauth2.refreshAccessToken(function() {
-        resolveSupportId(parts[0]);
-      });
-      return;
-    } else {
-      resolveSupportId(parts[0]);
-    }
+    resolveSupportId(parts[0]);
   }
 }
 
 function cancelConnect() {
   remoting.accessCode = '';
   setClientMode('unconnected');
 }