patch from issue 473153002

chrome/browser/resources/gaia_auth/background.js

 // Copyright 2013 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
  * A background script of the auth extension that bridges the communication
  * between the main and injected scripts.
  *
  * Here is an overview of the communication flow when SAML is being used:
@@ skipping 101 matching lines @@
   isDesktopFlow_: false,
 
   // Whether the extension is loaded in a constrained window.
   // Set from main auth script.
   isConstrainedWindow_: null,
 
   // Email of the newly authenticated user based on the gaia response header
   // 'google-accounts-signin'.
   email_: null,
 
+  // Gaia Id of the newly authenticated user based on the gaia response
+  // header 'google-accounts-signin'.
+  gaiaId_: null,
+
   // Session index of the newly authenticated user based on the gaia response
   // header 'google-accounts-signin'.
   sessionIndex_: null,
 
   // Gaia URL base that is set from main auth script.
   gaiaUrl_: null,
 
   // Whether to abort the authentication flow and show an error messagen when
   // content served over an unencrypted connection is detected.
   blockInsecureContent_: false,
@@ skipping 65 matching lines @@
 
   /**
    * Handler for webRequest.onCompleted. It 1) detects loading of continue URL
    * and notifies the main script of signin completion; 2) detects if the
    * current page could be loaded in a constrained window and signals the main
    * script of switching to full tab if necessary.
    */
   onCompleted: function(details) {
     // Only monitors requests in the gaia frame whose parent frame ID must be
     // positive.
-    if (!this.isDesktopFlow_ || details.parentFrameId <= 0)
+    if (details.parentFrameId <= 0)
       return;
 
     if (details.url.lastIndexOf(backgroundBridgeManager.CONTINUE_URL_BASE, 0) ==
         0) {
       var skipForNow = false;
       if (details.url.indexOf('ntp=1') >= 0)
         skipForNow = true;
 
       // TOOD(guohui): Show password confirmation UI.
       var passwords = this.onGetScrapedPasswords_();
       var msg = {
         'name': 'completeLogin',
         'email': this.email_,
+        'gaiaId': this.gaiaId_,
         'password': passwords[0],
         'sessionIndex': this.sessionIndex_,
         'skipForNow': skipForNow
       };
       this.channelMain_.send(msg);
     } else if (this.isConstrainedWindow_) {
       // The header google-accounts-embedded is only set on gaia domain.
       if (this.gaiaUrl_ && details.url.lastIndexOf(this.gaiaUrl_) == 0) {
         var headers = details.responseHeaders;
         for (var i = 0; headers && i < headers.length; ++i) {
@@ skipping 24 matching lines @@
   },
 
   /**
    * Handler or webRequest.onHeadersReceived. It reads the authenticated user
    * email from google-accounts-signin-header.
    * @return {!Object} Modified request headers.
    */
   onHeadersReceived: function(details) {
     var headers = details.responseHeaders;
 
-    if (this.isDesktopFlow_ &&
-        this.gaiaUrl_ &&
-        details.url.lastIndexOf(this.gaiaUrl_) == 0) {
-      // TODO(xiyuan, guohui): CrOS should reuse the logic below for reading the
-      // email for SAML users and cut off the /ListAccount call.
+    if (!this.isDesktopFlow_ ||
+        (this.gaiaUrl_ && details.url.lastIndexOf(this.gaiaUrl_) == 0)) {
       for (var i = 0; headers && i < headers.length; ++i) {
         if (headers[i].name.toLowerCase() == 'google-accounts-signin') {
           var headerValues = headers[i].value.toLowerCase().split(',');
           var signinDetails = {};
           headerValues.forEach(function(e) {
             var pair = e.split('=');
             signinDetails[pair[0].trim()] = pair[1].trim();
           });
           // Remove "" around.
           this.email_ = signinDetails['email'].slice(1, -1);
+          this.gaiaId_ = signinDetails['obfuscatedid'].slice(1, -1);
           this.sessionIndex_ = signinDetails['sessionindex'];
           break;
         }
       }
     }
 
     if (!this.isDesktopFlow_) {
       // Check whether GAIA headers indicating the start or end of a SAML
       // redirect are present. If so, synthesize cookies to mark these points.
       for (var i = 0; headers && i < headers.length; ++i) {
@@ skipping 126 matching lines @@
   },
 
   onPageLoaded_: function(msg) {
     if (this.channelMain_)
       this.channelMain_.send({name: 'onAuthPageLoaded', url: msg.url});
   }
 };
 
 var backgroundBridgeManager = new BackgroundBridgeManager();
 backgroundBridgeManager.run();