Add application pre-authorization.

remoting/webapp/crd/js/desktop_remoting.js

 // Copyright 2014 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.
 
 /**
  * @fileoverview
  * This class implements the functionality that is specific to desktop
  * remoting ("Chromoting" or CRD).
  */
 
@@ skipping 23 matching lines @@
    * Whether to refresh the JID and retry the connection if the current JID
    * is offline.
    *
    * @type {boolean}
    * @private
    */
   this.refreshHostJidIfOffline_ = true;
 };
 
 /**
- * Display the user's email address and allow access to the rest of the app,
- * including parsing URL parameters.
- *
- * @param {string} email The user's email address.
- * @param {string} fullName The user's full name. This is always null since
- *     CRD doesn't request userinfo.profile permission.
- * @return {void} Nothing.
- */
-remoting.onUserInfoAvailable = function(email, fullName) {
-  document.getElementById('current-email').innerText = email;
-  document.getElementById('get-started-it2me').disabled = false;
-  document.getElementById('get-started-me2me').disabled = false;
-};
-
-/**
  * Initialize the application and register all event handlers. After this
  * is called, the app is running and waiting for user events.
  *
  * @return {void} Nothing.
  */
 remoting.DesktopRemoting.prototype.init = function() {
-  remoting.initGlobalObjects();
-  remoting.initIdentity(remoting.onUserInfoAvailable);
-
   remoting.initElementEventHandlers();
 
   if (base.isAppsV2()) {
     remoting.windowFrame = new remoting.WindowFrame(
         document.getElementById('title-bar'));
     remoting.optionsMenu = remoting.windowFrame.createOptionsMenu();
 
     var START_FULLSCREEN = 'start-fullscreen';
     remoting.fullscreen = new remoting.FullscreenAppsV2();
     remoting.fullscreen.addListener(function(isFullscreen) {
@@ skipping 58 matching lines @@
         document.getElementById('startup-mode-box-it2me').hidden = false;
       }
     };
     isWindowed_(onIsWindowed);
   }
 
   remoting.ClientPlugin.factory.preloadPlugin();
 }
 
 /**
+ * Start the application. Once start() is called, the delegate can assume that
+ * the user has consented to all permissions specified in the manifest.
+ *
+ * @param {remoting.SessionConnector} connector
+ * @param {string} token An OAuth access token. The delegate should not cache
+ *     this token, but can assume that it will remain valid during application
+ *     start-up.
+ */
+remoting.DesktopRemoting.prototype.start = function(connector, token) {
+  remoting.identity.getEmail().then(
+      function(/** string */ email) {
+        document.getElementById('current-email').innerText = email;
+        document.getElementById('get-started-it2me').disabled = false;
+        document.getElementById('get-started-me2me').disabled = false;
+      });
+};
+
+/**
+ * Report an authentication error to the user. This is called in lieu of start()
+ * if the user cannot be authenticated or if they decline the app permissions.
+ *
+ * @param {remoting.Error} error The failure reason.
+ */
+remoting.DesktopRemoting.prototype.signInFailed = function(error) {
+  if (error == remoting.Error.CANCELLED) {
+    chrome.app.window.current().close();

[garykac, 2015/03/05 02:38:25]

if AppsV2?

[Jamie, 2015/03/05 19:01:36]

I'm assuming that there is only apps v2 for this change. Once we update the
webstore entry, there's no going back.

[garykac, 2015/03/06 21:16:25]

Acknowledged.

+  } else {
+    remoting.showErrorMessage(error);
+  }
+};
+
+/**
  * @return {string} Application product name to be used in UI.
  */
 remoting.DesktopRemoting.prototype.getApplicationName = function() {
   return chrome.i18n.getMessage(/*i18n-content*/'PRODUCT_NAME');
 };
 
 /**
  * @return {string} The default remap keys for the current platform.
  */
 remoting.DesktopRemoting.prototype.getDefaultRemapKeys = function() {
@@ skipping 70 matching lines @@
     clientSession.requestPairing(clientName, onPairingComplete);
   }
 };
 
 /**
  * Called when the current session has been disconnected.
  *
  * @return {void} Nothing.
  */
 remoting.DesktopRemoting.prototype.handleDisconnected = function() {
 };

[garykac, 2015/03/05 02:38:26]

if AppsV2, then chrome.app.window.current().close?

[Jamie, 2015/03/05 19:01:36]

No, we don't want to close the widow on disconnect for desktop-remoting.

[garykac, 2015/03/06 21:16:25]

Acknowledged.

 
 /**
  * Called when the current session's connection has failed.
  *
  * @param {remoting.SessionConnector} connector
  * @param {remoting.Error} error
  * @return {void} Nothing.
  */
 remoting.DesktopRemoting.prototype.handleConnectionFailed = function(
     connector, error) {
@@ skipping 64 matching lines @@
   l10n.localizeElementFromTag(errorDiv, /** @type {string} */ (errorTag));
 
   var mode = remoting.clientSession ? remoting.desktopConnectedView.getMode()
       : this.app_.getSessionConnector().getConnectionMode();
   if (mode == remoting.DesktopConnectedView.Mode.IT2ME) {
     remoting.setMode(remoting.AppMode.CLIENT_CONNECT_FAILED_IT2ME);
   } else {
     remoting.setMode(remoting.AppMode.CLIENT_CONNECT_FAILED_ME2ME);
   }
 };