Use HTML messages to inform GAIA about deviceId.

chrome/browser/resources/gaia_auth_host/authenticator.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.
 
 <include src="saml_handler.js">
 
 /**
  * @fileoverview An UI component to authenciate to Chrome. The component hosts
  * IdP web pages in a webview. A client who is interested in monitoring
  * authentication events should pass a listener object of type
@@ skipping 229 matching lines @@
       path = IDP_PATH;
     var url = this.idpOrigin_ + path;
 
     if (this.isNewGaiaFlowChromeOS) {
       if (data.chromeType)
         url = appendParam(url, 'chrometype', data.chromeType);
       if (data.clientId)
         url = appendParam(url, 'client_id', data.clientId);
       if (data.enterpriseDomain)
         url = appendParam(url, 'manageddomain', data.enterpriseDomain);
-      this.setDeviceId(data.deviceId);
+      this.deviceId_ = data.deviceId;
       this.sessionIsEphemeral_ = data.sessionIsEphemeral;
     } else {
       url = appendParam(url, 'continue', this.continueUrl_);
       url = appendParam(url, 'service', data.service || SERVICE_ID);
     }
     if (data.hl)
       url = appendParam(url, 'hl', data.hl);
     if (data.gaiaId)
       url = appendParam(url, 'user_id', data.gaiaId);
     if (data.email)
       url = appendParam(url, 'Email', data.email);
     if (this.isConstrainedWindow_)
       url = appendParam(url, 'source', CONSTRAINED_FLOW_SOURCE);
     if (data.flow)
       url = appendParam(url, 'flow', data.flow);
     if (data.emailDomain)
       url = appendParam(url, 'emaildomain', data.emailDomain);
     return url;
   };
 
   /**
-   * Invoked when deviceId is set or updated.
-   */
-  Authenticator.prototype.setDeviceId = function(deviceId) {
-    this.deviceId_ = deviceId;
-  };
-
-  /**
    * Invoked when a main frame request in the webview has completed.
    * @private
    */
   Authenticator.prototype.onRequestCompleted_ = function(details) {
     var currentUrl = details.url;
 
     if (currentUrl.lastIndexOf(this.continueUrlWithoutParams_, 0) == 0) {
       if (currentUrl.indexOf('ntp=1') >= 0)
         this.skipForNow_ = true;
 
@@ skipping 104 matching lines @@
    * Handler for webView.request.onBeforeSendHeaders .
    * @return {!Object} Modified request headers.
    * @private
    */
   Authenticator.prototype.onBeforeSendHeaders_ = function(details) {
     // deviceId_ is empty when we do not need to send it. For example,
     // in case of device enrollment.
     if (this.isNewGaiaFlowChromeOS && this.deviceId_) {
       var headers = details.requestHeaders;
       var found = false;
-      var deviceId;
-      if (this.sessionIsEphemeral_)
-        deviceId = EPHEMERAL_DEVICE_ID_PREFIX + this.deviceId_;
-      else
-        deviceId = this.deviceId_;
+      var deviceId = this.getGAIADeviceId_();
 
       for (var i = 0, l = headers.length; i < l; ++i) {
         if (headers[i].name == X_DEVICE_ID_HEADER) {
           headers[i].value = deviceId;
           found = true;
           break;
         }
       }
       if (!found) {
         details.requestHeaders.push(
             {name: X_DEVICE_ID_HEADER, value: deviceId});
       }
     }
     return {
       requestHeaders: details.requestHeaders
     };
   };
 
   /**
+   * Returns true if given HTML5 message is received from the webview element.
+   * @param {object} e Payload of the received HTML5 message.
+   */
+  Authenticator.prototype.isGaiaMessage = function(e) {
+    if (!this.isWebviewEvent_(e))
+      return false;
+
+    // The event origin does not have a trailing slash.
+    if (e.origin != this.idpOrigin_.substring(0, this.idpOrigin_.length - 1)) {
+      return false;
+    }
+
+    // Gaia messages must be an object with 'method' property.
+    if (typeof e.data != 'object' || !e.data.hasOwnProperty('method')) {
+      return false;
+    }
+    return true;
+  };
+
+  /**
    * Invoked when an HTML5 message is received from the webview element.
    * @param {object} e Payload of the received HTML5 message.
    * @private
    */
   Authenticator.prototype.onMessageFromWebview_ = function(e) {
-    if (!this.isWebviewEvent_(e))
+    if (!this.isGaiaMessage(e))
       return;
 
-    // The event origin does not have a trailing slash.
-    if (e.origin != this.idpOrigin_.substring(0, this.idpOrigin_.length - 1)) {
-      return;
-    }
-
-    // Gaia messages must be an object with 'method' property.
-    if (typeof e.data != 'object' || !e.data.hasOwnProperty('method')) {
-      return;
-    }
-
     var msg = e.data;
     if (msg.method == 'attemptLogin') {
       this.email_ = msg.email;
       this.password_ = msg.password;
       this.chooseWhatToSync_ = msg.chooseWhatToSync;
+      // We need to dispatch only first event, before user enters password.
+      if (!msg.password) {
+        this.dispatchEvent(
+            new CustomEvent('attemptLogin', {detail: msg.email}));
+      }
     } else if (msg.method == 'dialogShown') {
       this.dispatchEvent(new Event('dialogShown'));
     } else if (msg.method == 'dialogHidden') {
       this.dispatchEvent(new Event('dialogHidden'));
     } else if (msg.method == 'backButton') {
       this.dispatchEvent(new CustomEvent('backButton', {detail: msg.show}));
     } else if (msg.method == 'showView') {
       this.dispatchEvent(new Event('showView'));
     } else {
       console.warn('Unrecognized message from GAIA: ' + msg.method);
@@ skipping 145 matching lines @@
       // webview from the zooming of other webviews using the 'per-view' zoom
       // mode, and then set it to 100% zoom.
       this.webview_.setZoomMode('per-view');
       this.webview_.setZoom(1);
     }
 
     // Posts a message to IdP pages to initiate communication.
     var currentUrl = this.webview_.src;
     if (currentUrl.lastIndexOf(this.idpOrigin_) == 0) {
       var msg = {
-        'method': 'handshake'
+        'method': 'handshake',
+        'deviceId': this.getGAIADeviceId_(),
       };
+
       this.webview_.contentWindow.postMessage(msg, currentUrl);
     }
   };
 
   /**
    * Invoked when the webview fails loading a page.
    * @private
    */
   Authenticator.prototype.onLoadAbort_ = function(e) {
     this.dispatchEvent(new CustomEvent('loadAbort',
@@ skipping 31 matching lines @@
    */
   Authenticator.prototype.isWebviewEvent_ = function(e) {
     // Note: <webview> prints error message to console if |contentWindow| is not
     // defined.
     // TODO(dzhioev): remove the message. http://crbug.com/469522
     var webviewWindow = this.webview_.contentWindow;
     return !!webviewWindow && webviewWindow === e.source;
   };
 
   /**
+   * Format deviceId for GAIA .
+   * @return {string} deviceId.
+   * @private
+   */
+  Authenticator.prototype.getGAIADeviceId_ = function() {
+    // deviceId_ is empty when we do not need to send it. For example,
+    // in case of device enrollment.
+    if (!(this.isNewGaiaFlowChromeOS && this.deviceId_))
+      return;
+
+    if (this.sessionIsEphemeral_)
+      return EPHEMERAL_DEVICE_ID_PREFIX + this.deviceId_;
+    else
+      return this.deviceId_;
+  };
+
+  /**
+   * Informs Gaia of new deviceId to be used.
+   */
+  Authenticator.prototype.updateDeviceId = function(deviceId) {
+    this.deviceId_ = deviceId;
+    var msg = {
+      'method': 'updateDeviceId',
+      'deviceId': this.getGAIADeviceId_(),
+    };
+
+    var currentUrl = this.webview_.src;
+    this.webview_.contentWindow.postMessage(msg, currentUrl);
+  };
+
+  /**
    * The current auth flow of the hosted auth page.
    * @type {AuthFlow}
    */
   cr.defineProperty(Authenticator, 'authFlow');
 
   Authenticator.AuthFlow = AuthFlow;
   Authenticator.AuthMode = AuthMode;
   Authenticator.SUPPORTED_PARAMS = SUPPORTED_PARAMS;
 
   return {
     // TODO(guohui, xiyuan): Rename GaiaAuthHost to Authenticator once the old
     // iframe-based flow is deprecated.
     GaiaAuthHost: Authenticator,
     Authenticator: Authenticator
   };
 });