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 406 matching lines @@
         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;
+      this.dispatchEvent(new CustomEvent('attemptLogin', {detail: msg.email}));

[Nikita (slow), 2015/04/22 16:51:52]

As discussed, we should only process 'attemptLogin' in such way when it only
contains email. No need to process further 'attemptLogin' messages (email +
password).

[Alexander Alekseev, 2015/04/22 17:58:07]

Done.

     } 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 198 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;
   };
 
   /**
+   * Informs Gaia of new deviceId to be used.
+   */
+  Authenticator.prototype.updateDeviceId = function(deviceId) {
+    var msg = {
+      'method': 'updateDeviceId',
+      'deviceId': deviceId,
+    };
+
+    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
   };
 });