Remove credentials passing API version 1

chrome/browser/resources/gaia_auth/main.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.
 
 /**
  * Authenticator class wraps the communications between Gaia and its host.
  */
 function Authenticator() {
 }
 
 /**
  * Gaia auth extension url origin.
  * @type {string}
  */
 Authenticator.THIS_EXTENSION_ORIGIN =
     'chrome-extension://mfffpogegjflfpflabcdkioaeobkgjik';
 
 /**
  * The lowest version of the credentials passing API supported.
  * @type {number}
  */
 Authenticator.MIN_API_VERSION_VERSION = 1;
 
 /**
  * The highest version of the credentials passing API supported.
  * @type {number}
  */
-Authenticator.MAX_API_VERSION_VERSION = 2;
+Authenticator.MAX_API_VERSION_VERSION = 1;
 
 /**
- * The key types supported for credentials passing API 2 and higher.
+ * The key types supported by the credentials passing API.
  * @type {Array} Array of strings.
  */
 Authenticator.API_KEY_TYPES = [
   'KEY_TYPE_PASSWORD_PLAIN',
 ];
 
 /**
  * Singleton getter of Authenticator.
  * @return {Object} The singleton instance of Authenticator.
  */
@@ skipping 243 matching lines @@
   },
 
   /**
    * Invoked when one of the credential passing API methods is called by a SAML
    * provider.
    * @param {!Object} msg Details of the API call.
    */
   onAPICall_: function(msg) {
     var call = msg.call;
     if (call.method == 'initialize') {
-      // TODO(bartfab): There was no |requestedVersion| parameter in version 1
-      // of the API. Remove this code once all consumers have switched to
-      // version 2 or higher.
-      if (!call.hasOwnProperty('requestedVersion')) {
-        if (Authenticator.MIN_API_VERSION_VERSION == 1) {
-          this.apiVersion_ = 1;
-          this.initialized_ = true;
-          this.sendInitializationSuccess_();
-        }
-        // The glue code for API version 1 interprets all responses as success.
-        // Instead of reporting failure, do not send any response at all.
-        return;
-      }
-
       if (!Number.isInteger(call.requestedVersion) ||
           call.requestedVersion < Authenticator.MIN_API_VERSION_VERSION) {
         this.sendInitializationFailure_();
         return;
       }
 
       this.apiVersion_ = Math.min(call.requestedVersion,
                                   Authenticator.MAX_API_VERSION_VERSION);
       this.initialized_ = true;
       this.sendInitializationSuccess_();
       return;
     }
 
     if (call.method == 'add') {
-      if (this.apiVersion_ > 1 &&
-          Authenticator.API_KEY_TYPES.indexOf(call.keyType) == -1) {
+      if (Authenticator.API_KEY_TYPES.indexOf(call.keyType) == -1) {
         console.error('Authenticator.onAPICall_: unsupported key type');
         return;
       }
       this.apiToken_ = call.token;
       this.email_ = call.user;
-      if (this.apiVersion_ == 1)
-        this.passwordBytes_ = call.password;
-      else
-        this.passwordBytes_ = call.passwordBytes;
+      this.passwordBytes_ = call.passwordBytes;
     } else if (call.method == 'confirm') {
       if (call.token != this.apiToken_)
         console.error('Authenticator.onAPICall_: token mismatch');
     } else {
       console.error('Authenticator.onAPICall_: unknown message');
     }
   },
 
   sendInitializationSuccess_: function() {
-    var response = {
+    this.supportChannel_.send({name: 'apiResponse', response: {
       result: 'initialized',
-      version: this.apiVersion_
-    };
-    if (this.apiVersion_ >= 2)
-      response['keyTypes'] = Authenticator.API_KEY_TYPES;
-
-    this.supportChannel_.send({name: 'apiResponse', response: response});
+      version: this.apiVersion_,
+      keyTypes: Authenticator.API_KEY_TYPES
+    }});
   },
 
   sendInitializationFailure_: function() {
     this.supportChannel_.send({
       name: 'apiResponse',
       response: {result: 'initialization_failed'}
     });
   },
 
   onConfirmLogin_: function() {
@@ skipping 87 matching lines @@
     } else if (msg.method == 'redirectToSignin' &&
                this.isParentMessage_(e)) {
       $('gaia-frame').src = this.constructInitialFrameUrl_();
     } else {
        console.error('Authenticator.onMessage: unknown message + origin!?');
     }
   }
 };
 
 Authenticator.getInstance().initialize();