Revert of Inline sign in extracts gaia id from HTTP header and seeds account tracker

chrome/browser/resources/chromeos/login/screen_gaia_signin.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.
 
 /**
  * @fileoverview Oobe signin screen implementation.
  */
 
 <include src="../../gaia_auth_host/gaia_auth_host.js">
 
 login.createScreen('GaiaSigninScreen', 'gaia-signin', function() {
   // Gaia loading time after which error message must be displayed and
   // lazy portal check should be fired.
   /** @const */ var GAIA_LOADING_PORTAL_SUSSPECT_TIME_SEC = 7;
 
   // Maximum Gaia loading time in seconds.
   /** @const */ var MAX_GAIA_LOADING_TIME_SEC = 60;
 
   /** @const */ var HELP_TOPIC_ENTERPRISE_REPORTING = 2535613;
 
   return {
     EXTERNAL_API: [
       'loadAuthExtension',
       'updateAuthExtension',
+      'setAuthenticatedUserEmail',
       'doReload',
       'onFrameError',
       'updateCancelButtonState'
     ],
 
     /**
      * Frame loading error code (0 - no error).
      * @type {number}
      * @private
      */
@@ skipping 51 matching lines @@
      * SAML password confirmation attempt count.
      * @type {number}
      */
     samlPasswordConfirmAttempt_: 0,
 
     /** @override */
     decorate: function() {
       this.gaiaAuthHost_ = new cr.login.GaiaAuthHost($('signin-frame'));
       this.gaiaAuthHost_.addEventListener(
           'ready', this.onAuthReady_.bind(this));
+      this.gaiaAuthHost_.retrieveAuthenticatedUserEmailCallback =
+          this.onRetrieveAuthenticatedUserEmail_.bind(this);
       this.gaiaAuthHost_.confirmPasswordCallback =
           this.onAuthConfirmPassword_.bind(this);
       this.gaiaAuthHost_.noPasswordCallback =
           this.onAuthNoPassword_.bind(this);
       this.gaiaAuthHost_.insecureContentBlockedCallback =
           this.onInsecureContentBlocked_.bind(this);
-      this.gaiaAuthHost_.missingGaiaInfoCallback =
-          this.missingGaiaInfo_.bind(this);
-      this.gaiaAuthHost_.samlApiUsedCallback =
-          this.samlApiUsed_.bind(this);
       this.gaiaAuthHost_.addEventListener('authFlowChange',
           this.onAuthFlowChange_.bind(this));
 
       $('enterprise-info-hint-link').addEventListener('click', function(e) {
         chrome.send('launchHelpApp', [HELP_TOPIC_ENTERPRISE_REPORTING]);
         e.preventDefault();
       });
 
 
       this.updateLocalizedContent();
@@ skipping 216 matching lines @@
                          $('createAccount').hidden &&
                          $('guestSignin').hidden &&
                          $('createSupervisedUserPane').hidden &&
                          $('consumerManagementEnrollment').hidden;
       this.classList.toggle('no-right-panel', noRightPanel);
       if (Oobe.getInstance().currentScreen === this)
         Oobe.getInstance().updateScreenSize(this);
     },
 
     /**
+     * Sends the authenticated user's e-mail address to the auth extension.
+     * @param {number} attemptToken The opaque token provided to
+     *     onRetrieveAuthenticatedUserEmail_.
+     * @param {string} email The authenticated user's e-mail address.
+     */
+    setAuthenticatedUserEmail: function(attemptToken, email) {
+      if (!email) {
+        this.showFatalAuthError(
+            loadTimeData.getString('fatalErrorMessageNoEmail'));
+      } else {
+        this.gaiaAuthHost_.setAuthenticatedUserEmail(attemptToken, email);
+      }
+    },
+
+    /**
      * Updates [Cancel] button state. Allow cancellation of screen only when
      * user pods can be displayed.
      */
     updateCancelButtonState: function() {
       this.cancelAllowed_ = this.isShowUsers_ && $('pod-row').pods.length;
       $('login-header-bar').allowCancel = this.cancelAllowed_;
     },
 
     /**
      * Whether the current auth flow is SAML.
@@ skipping 40 matching lines @@
       }
 
       chrome.send('loginWebuiReady');
       chrome.send('loginVisible', ['gaia-signin']);
 
       // Warm up the user images screen.
       Oobe.getInstance().preloadScreen({id: SCREEN_USER_IMAGE_PICKER});
     },
 
     /**
+     * Invoked when the user has successfully authenticated via SAML and the
+     * auth host needs to retrieve the user's e-mail.
+     * @param {number} attemptToken Opaque token to be passed to
+     *     setAuthenticatedUserEmail along with the e-mail address.
+     * @param {boolean} apiUsed Whether the principals API was used during
+     *     authentication.
+     * @private
+     */
+    onRetrieveAuthenticatedUserEmail_: function(attemptToken, apiUsed) {
+      if (apiUsed) {
+        // If the principals API was used, report this to the C++ backend so
+        // that statistics can be kept. If password scraping was used instead,
+        // there is no need to inform the C++ backend at this point: Either
+        // onAuthNoPassword_ or onAuthConfirmPassword_ will be called in a
+        // moment, both of which imply to the backend that the API was not used.
+        chrome.send('usingSAMLAPI');
+      }
+      chrome.send('retrieveAuthenticatedUserEmail', [attemptToken]);
+    },
+
+    /**
      * Invoked when the user has successfully authenticated via SAML, the
      * principals API was not used and the auth host needs the user to confirm
      * the scraped password.
      * @param {number} passwordCount The number of passwords that were scraped.
      * @private
      */
     onAuthConfirmPassword_: function(passwordCount) {
       this.loading = true;
       Oobe.getInstance().headerHidden = false;
 
@@ skipping 49 matching lines @@
 
     /**
      * Shows the fatal auth error.
      * @param {string} message The error message to show.
      */
     showFatalAuthError: function(message) {
       login.FatalErrorScreen.show(message, Oobe.showSigninUI);
     },
 
     /**
-     * Show fatal auth error when information is missing from GAIA.
-     */
-    missingGaiaInfo_: function() {
-      this.showFatalAuthError(
-          loadTimeData.getString('fatalErrorMessageNoAccountDetails'));
-    },
-
-    /**
-     * Record that SAML API was used during sign-in.
-     */
-    samlApiUsed_: function() {
-      chrome.send('usingSAMLAPI');
-    },
-
-    /**
      * Invoked when auth is completed successfully.
      * @param {!Object} credentials Credentials of the completed authentication.
      * @private
      */
     onAuthCompleted_: function(credentials) {
       if (credentials.useOffline) {
         this.email = credentials.email;
         chrome.send('authenticateUser',
-                    [credentials.gaiaId,
-                     credentials.email,
-                     credentials.password]);
+                    [credentials.email, credentials.password]);
       } else if (credentials.authCode) {
         chrome.send('completeAuthentication',
-                    [credentials.gaiaId,
-                     credentials.email,
+                    [credentials.email,
                      credentials.password,
                      credentials.authCode]);
       } else {
         chrome.send('completeLogin',
-                    [credentials.gaiaId,
-                     credentials.email,
+                    [credentials.email,
                      credentials.password,
                      credentials.usingSAML]);
       }
 
       this.loading = true;
       // Now that we're in logged in state header should be hidden.
       Oobe.getInstance().headerHidden = true;
       // Clear any error messages that were shown before login.
       Oobe.clearErrors();
     },
@@ skipping 115 matching lines @@
      * For more info see C++ class 'WebUILoginView' which calls this method.
      * @param {number} error Error code.
      * @param {string} url The URL that failed to load.
      */
     onFrameError: function(error, url) {
       this.error_ = error;
       chrome.send('frameLoadingCompleted', [this.error_]);
     },
   };
 });