Removed oauth2_callback.html, merged functionality into remoting.js and improved 'No thanks' UX.

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.
 
 var remoting = remoting || {};
 
 (function() {
 'use strict';
 
 window.addEventListener('blur', pluginLostFocus_, false);
@@ skipping 129 matching lines @@
   }
 }
 
 remoting.init = function() {
   l10n.localize();
   // Create global objects.
   remoting.oauth2 = new remoting.OAuth2();
   remoting.debug =
       new remoting.DebugLog(document.getElementById('debug-messages'));
 
+  // Process OAuth redirection
+  if (window.location.search) {
+    var parts = window.location.search.substring(1).split('&');
+    var queryArgs = {};
+    for (var i = 0; i < parts.length; i++) {
+      var pair = parts[i].split('=');
+      queryArgs[pair[0]] = pair[1];
+    }
+    // If this an OAuth2 redirect, then strip the parameters from the URL
+    // to prevent them getting stored in bookmarks.
+    if ('code' in queryArgs) {
+      remoting.oauth2.exchangeCodeForToken(queryArgs['code'], function() {
+          window.location.replace(chrome.extension.getURL('choice.html'));
+        });
+      return;
+    } else if ('error' in queryArgs) {
+      window.location.replace(chrome.extension.getURL('choice.html'));
+      return;

[Jamie, 2011/08/04 21:56:16]

Does location.replace automatically terminate the script, or is this return
necessary?

[awong, 2011/08/04 22:42:36]

I think it does go immediately, but the return still looks cleaner to me.

+    }
+  }
+
   refreshEmail_();
   var email = getEmail();
   if (email) {
     document.getElementById('current-email').innerText = email;
   }
   remoting.setMode(getAppStartupMode());
   if (isHostModeSupported()) {
     var unsupported = document.getElementById('client-footer-text-cros');
     unsupported.parentNode.removeChild(unsupported);
   } else {
@@ skipping 424 matching lines @@
 remoting.disconnect = function() {
   if (remoting.session) {
     remoting.session.disconnect();
     remoting.session = null;
     remoting.debug.log('Disconnected.');
     remoting.setMode(remoting.AppMode.CLIENT_SESSION_FINISHED);
   }
 }
 
 }());