signin: Abort previous 'channelConnected' handling on retry

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 10 matching lines @@
  *    c) The injected script scrapes passwords. They are sent to this background
  *       script in |updatePassword| messages. The main script can request a list
  *       of the scraped passwords by sending the |getScrapedPasswords| message.
  */
 
 /**
  * BackgroundBridgeManager maintains an array of BackgroundBridge, indexed by
  * the associated tab id.
  */
 function BackgroundBridgeManager() {
+  // Maps a tab id to its associated BackgroundBridge.
+  this.bridges_ = {};
 }
 
 BackgroundBridgeManager.prototype = {
   CONTINUE_URL_BASE: 'chrome-extension://mfffpogegjflfpflabcdkioaeobkgjik' +
                      '/success.html',
-  // Maps a tab id to its associated BackgroundBridge.
-  bridges_: {},

[dzhioev (left Google), 2015/06/10 20:04:18]

Can you replace this with 'bridges_: null' instead of removing?

[xiyuan, 2015/06/10 20:21:12]

It is not deleted. It is moved to BackgroundBridgeManager constructor so that we
have a per-instance copy of it.

[dzhioev (left Google), 2015/06/10 21:20:46]

I understand this. That's a matter of opinion, but I find it handy when all
properties that are used by "class" are "declared" in the beginning of
prototype. Some of them could be initialized in a constructor. Something like
that:

function FooBar() {
  this.foo_ = new Foo();
}

FooBar.prototype = {
  /**
   * Comment about |foo_|.
   */
  foo_: null,

  /**
   * Comment about |bar_|.
  bar_: 1
};

[xiyuan, 2015/06/10 21:32:45]

I see what you mean now. Done here and other places.

-
   run: function() {
     chrome.runtime.onConnect.addListener(this.onConnect_.bind(this));
 
     chrome.webRequest.onBeforeRequest.addListener(
         function(details) {
           if (this.bridges_[details.tabId])
             return this.bridges_[details.tabId].onInsecureRequest(details.url);
         }.bind(this),
         {urls: ['http://*/*', 'file://*/*', 'ftp://*/*']},
         ['blocking']);
@@ skipping 47 matching lines @@
 };
 
 /**
  * BackgroundBridge allows the main script and the injected script to
  * collaborate. It forwards credentials API calls to the main script and
  * maintains a list of scraped passwords.
  * @param {string} tabId The associated tab ID.
  */
 function BackgroundBridge(tabId) {
   this.tabId_ = tabId;
+  this.passwordStore_ = {};
 }
 
 BackgroundBridge.prototype = {
   // The associated tab ID. Only used for debugging now.
   tabId: null,
 
   // The initial URL loaded in the gaia iframe.  We only want to handle
   // onCompleted() for the frame that loaded this URL.
   initialFrameUrlWithoutParams: null,
 
@@ skipping 25 matching lines @@
   // content served over an unencrypted connection is detected.
   blockInsecureContent_: false,
 
   // Whether auth flow has started. It is used as a signal of whether the
   // injected script should scrape passwords.
   authStarted_: false,
 
   // Whether SAML flow is going.
   isSAML_: false,
 
-  passwordStore_: {},

[dzhioev (left Google), 2015/06/10 20:04:18]

ditto

[xiyuan, 2015/06/10 20:21:12]

Same here. It is moved to BackgroundBridge constructor.

-
   channelMain_: null,
   channelInjected_: null,
 
   /**
    * Sets up the communication channel with the main script.
    */
   setupForAuthMain: function(port) {
     this.channelMain_ = new Channel();
     this.channelMain_.init(port);
 
@@ skipping 289 matching lines @@
                               isSAMLPage: this.isSAML_});
   },
 
   onGetSAMLFlag_: function(msg) {
     return this.isSAML_;
   }
 };
 
 var backgroundBridgeManager = new BackgroundBridgeManager();
 backgroundBridgeManager.run();