Apps v2 identity integration.

remoting/webapp/remoting.js

 // Copyright (c) 2012 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.
 
 'use strict';
 
 /** @suppress {duplicate} */
 var remoting = remoting || {};
 
 /** @type {remoting.HostSession} */ remoting.hostSession = null;
@@ skipping 11 matching lines @@
   BAD_PLUGIN_VERSION: /*i18n-content*/'ERROR_BAD_PLUGIN_VERSION',
   NETWORK_FAILURE: /*i18n-content*/'ERROR_NETWORK_FAILURE',
   HOST_OVERLOAD: /*i18n-content*/'ERROR_HOST_OVERLOAD',
   UNEXPECTED: /*i18n-content*/'ERROR_UNEXPECTED',
   SERVICE_UNAVAILABLE: /*i18n-content*/'ERROR_SERVICE_UNAVAILABLE',
   NOT_AUTHENTICATED: /*i18n-content*/'ERROR_NOT_AUTHENTICATED',
   INVALID_HOST_DOMAIN: /*i18n-content*/'ERROR_INVALID_HOST_DOMAIN'
 };
 
 /**
+ * Show the authorization consent UI and register a one-shot event handler to
+ * continue the authorization process.
+ *
+ * @param {function():void} authContinue Callback to invoke when the user
+ *     clicks "Continue".
+ */
+function consentRequired_(authContinue) {
+  /** @type {HTMLElement} */
+  var dialog = document.getElementById('auth-dialog');
+  /** @type {HTMLElement} */
+  var button = document.getElementById('auth-button');
+  var consentGranted = function(event) {
+    dialog.hidden = true;
+    button.removeEventListener('click', consentGranted, false);
+    authContinue();
+  };
+  dialog.hidden = false;
+  button.addEventListener('click', consentGranted, false);
+}
+
+/**
  * Entry point for app initialization.
  */
 remoting.init = function() {
-  // TODO(jamiewalch): Remove this when we migrate to apps v2.
+  // TODO(jamiewalch): Remove this when we migrate to apps v2
+  // (http://crbug.com/ 134213).
   remoting.initMockStorage();
 
   remoting.logExtensionInfoAsync_();
   l10n.localize();
   // Create global objects.
   remoting.oauth2 = new remoting.OAuth2();
+  // TODO(jamiewalch): Reinstate this when we migrate to apps v2
+  // (http://crbug.com/ 134213).
+  // remoting.identity = new remoting.Identity(consentRequired_);
+  remoting.identity = remoting.oauth2;
   remoting.stats = new remoting.ConnectionStats(
       document.getElementById('statistics'));
   remoting.formatIq = new remoting.FormatIq();
   remoting.hostList = new remoting.HostList(
       document.getElementById('host-list'),
       document.getElementById('host-list-empty'),
       document.getElementById('host-list-error-message'),
       document.getElementById('host-list-refresh-failed-button'));
   remoting.toolbar = new remoting.Toolbar(
       document.getElementById('session-toolbar'));
   remoting.clipboard = new remoting.Clipboard();
   remoting.suspendMonitor = new remoting.SuspendMonitor(
       function() {
         if (remoting.clientSession) {
           remoting.clientSession.logErrors(false);
         }
       }
   );
 
-  remoting.oauth2.getEmail(remoting.onEmail, remoting.showErrorMessage);
+  remoting.identity.getEmail(remoting.onEmail, remoting.showErrorMessage);
 
   remoting.showOrHideIt2MeUi();
   remoting.showOrHideMe2MeUi();
 
   // The plugin's onFocus handler sends a paste command to |window|, because
   // it can't send one to the plugin element itself.
   window.addEventListener('paste', pluginGotPaste_, false);
   window.addEventListener('copy', pluginGotCopy_, false);
 
   remoting.initModalDialogs();
@@ skipping 34 matching lines @@
   document.getElementById('get-started-it2me').disabled = false;
   document.getElementById('get-started-me2me').disabled = false;
 };
 
 // initDaemonUi is called if the app is not starting up in session mode, and
 // also if the user cancels pin entry or the connection in session mode.
 remoting.initDaemonUi = function () {
   remoting.hostController = new remoting.HostController();
   document.getElementById('share-button').disabled =
       !remoting.hostController.isPluginSupported();
-  remoting.setMode(getAppStartupMode_());
+  remoting.setMode(remoting.AppMode.HOME);
+  if (!remoting.oauth2.isAuthenticated()) {
+    document.getElementById('auth-dialog').hidden = false;
+  }
   remoting.hostSetupDialog =
       new remoting.HostSetupDialog(remoting.hostController);
   // Display the cached host list, then asynchronously update and re-display it.
   remoting.updateLocalHostState();
   remoting.hostList.refresh(remoting.updateLocalHostState);
 };
 
 /**
  * Fetches local host state and updates host list accordingly.
  */
@@ skipping 56 matching lines @@
 
 /**
  * Sign the user out of Chromoting by clearing (and revoking, if possible) the
  * OAuth refresh token.
  *
  * Also clear all local storage, to avoid leaking information.
  */
 remoting.signOut = function() {
   remoting.oauth2.clear();
   chrome.storage.local.clear();
-  remoting.setMode(remoting.AppMode.UNAUTHENTICATED);
+  remoting.setMode(remoting.AppMode.HOME);
+  document.getElementById('auth-dialog').hidden = false;
 };
 
 /**
  * Returns whether the app is running on ChromeOS.
  *
  * @return {boolean} True if the app is running on ChromeOS.
  */
 remoting.runningOnChromeOS = function() {
   return !!navigator.userAgent.match(/\bCrOS\b/);
 }
@@ skipping 21 matching lines @@
   var event = /** @type {remoting.ClipboardEvent} */ eventUncast;
   if (event && event.clipboardData) {
     if (remoting.clipboard.toOs(event.clipboardData)) {
       // The default action may overwrite items that we added to clipboardData.
       event.preventDefault();
     }
   }
 }
 
 /**
- * Gets the major-mode that this application should start up in.
- *
- * @return {remoting.AppMode} The mode to start in.
- */
-function getAppStartupMode_() {
-  if (!remoting.oauth2.isAuthenticated()) {
-    return remoting.AppMode.UNAUTHENTICATED;
-  }
-  return remoting.AppMode.HOME;
-}
-
-/**
  * Returns whether Host mode is supported on this platform.
  *
  * @return {boolean} True if Host mode is supported.
  */
 function isHostModeSupported_() {
   // Currently, sharing on Chromebooks is not supported.
   return !remoting.runningOnChromeOS();
 }
 
 /**
@@ skipping 56 matching lines @@
  */
 remoting.showErrorMessage = function(error) {
   l10n.localizeElementFromTag(
       document.getElementById('token-refresh-error-message'),
       error);
   var auth_failed = (error == remoting.Error.AUTHENTICATION_FAILED);
   document.getElementById('token-refresh-auth-failed').hidden = !auth_failed;
   document.getElementById('token-refresh-other-error').hidden = auth_failed;
   remoting.setMode(remoting.AppMode.TOKEN_REFRESH_FAILED);
 };