[Autofill] Update credit card type detection logic.

components/autofill/browser/credit_card.cc

 // 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.
 
 #include "components/autofill/browser/credit_card.h"
 
 #include <stddef.h>
 
 #include <ostream>
 #include <string>
@@ skipping 132 matching lines @@
   if (type == kAmericanExpressCard)
     return l10n_util::GetStringUTF16(IDS_AUTOFILL_CC_AMEX);
   if (type == kDinersCard)
     return l10n_util::GetStringUTF16(IDS_AUTOFILL_CC_DINERS);
   if (type == kDiscoverCard)
     return l10n_util::GetStringUTF16(IDS_AUTOFILL_CC_DISCOVER);
   if (type == kJCBCard)
     return l10n_util::GetStringUTF16(IDS_AUTOFILL_CC_JCB);
   if (type == kMasterCard)
     return l10n_util::GetStringUTF16(IDS_AUTOFILL_CC_MASTERCARD);
-  if (type == kSoloCard)
-    return l10n_util::GetStringUTF16(IDS_AUTOFILL_CC_SOLO);
   if (type == kVisaCard)
     return l10n_util::GetStringUTF16(IDS_AUTOFILL_CC_VISA);
 
   // If you hit this DCHECK, the above list of cases needs to be updated to
   // include a new card.
   DCHECK_EQ(kGenericCard, type);
   return base::string16();
 }
 
 // static
 std::string CreditCard::GetCreditCardType(const base::string16& number) {
   // Don't check for a specific type if this is not a credit card number.
   if (!autofill::IsValidCreditCardNumber(number))
     return kGenericCard;

[benquan, 2013/06/08 07:27:57]

There are tons of card types, I think kGenericCard means all other types that we
do not really need to care about or know about. But they are valid types.

[Ilya Sherman, 2013/06/18 03:37:38]

Done.

 
   // Credit card number specifications taken from:
-  // http://en.wikipedia.org/wiki/Credit_card_numbers and
+  // http://en.wikipedia.org/wiki/Credit_card_numbers,
+  // http://www.discovernetwork.com/merchants/images/Merchant_Marketing_PDF.pdf,
+  // http://www.regular-expressions.info/creditcard.html, and
   // http://www.beachnet.com/~hstiles/cardtype.html

[benquan, 2013/06/08 07:27:57]

this link is dead, remove it?

[Ilya Sherman, 2013/06/18 03:37:38]

I've kept the link, because it seems to be where the length checks were derived
from.  I've also added a link to an archived version of the page, so that the
dead link isn't so disappointing.

+  //
   // Card Type              Prefix(es)                      Length
   // ---------------------------------------------------------------
   // Visa                   4                               13,16
   // American Express       34,37                           15
-  // Diners Club            300-305,2014,2149,36,           14,15
+  // Diners Club            300-305,3095,36,38-39           14
   // Discover Card          6011,65                         16
-  // JCB                    3                               16
-  // JCB                    2131,1800                       15
+  // JCB                    3528-3589                       16
   // MasterCard             51-55                           16
-  // Solo (debit card)      6334,6767                       16,18,19
 
   // We need at least 4 digits to work with.
   if (number.length() < 4)
     return kGenericCard;
 
   int first_four_digits = 0;
   if (!base::StringToInt(number.substr(0, 4), &first_four_digits))
     return kGenericCard;
 
   int first_three_digits = first_four_digits / 10;
   int first_two_digits = first_three_digits / 10;
   int first_digit = first_two_digits / 10;
 
   switch (number.length()) {
     case 13:
       if (first_digit == 4)
         return kVisaCard;
 
       break;
+
     case 14:
       if (first_three_digits >= 300 && first_three_digits <= 305)
         return kDinersCard;
 
-      if (first_digit == 36)
+      if (first_two_digits == 36)
+        return kDinersCard;
+
+      if (first_two_digits >= 38 && first_two_digits <= 39)
+        return kDinersCard;
+
+      if (first_four_digits == 3095)
         return kDinersCard;
 
       break;
+
     case 15:
       if (first_two_digits == 34 || first_two_digits == 37)
         return kAmericanExpressCard;
 
-      if (first_four_digits == 2131 || first_four_digits == 1800)
-        return kJCBCard;
+      break;
 
-      if (first_four_digits == 2014 || first_four_digits == 2149)
-        return kDinersCard;
-
-      break;
     case 16:
       if (first_four_digits == 6011 || first_two_digits == 65)
         return kDiscoverCard;
 
-      if (first_four_digits == 6334 || first_four_digits == 6767)
-        return kSoloCard;
+      if (first_three_digits >= 644 && first_three_digits <= 649)
+        return kDiscoverCard;
 
       if (first_two_digits >= 51 && first_two_digits <= 55)
         return kMasterCard;
 
-      if (first_digit == 3)
+      if (first_four_digits >= 3528 && first_four_digits <= 3589)
         return kJCBCard;
 
       if (first_digit == 4)
         return kVisaCard;
 
       break;
-    case 18:
-    case 19:
-      if (first_four_digits == 6334 || first_four_digits == 6767)
-        return kSoloCard;
-
-      break;
   }
 
   return kGenericCard;

[benquan, 2013/06/08 07:27:57]

Card type should be determined by BIN (the first 6 digits of a card), not
necessary  the length of the card. It's a common practice in payment industry.
Number of digits should be used to validate the card.

For example: 

CreditCard c;
c.SetNumber("34123");

now, "c" should be considered as an Invalid kAmericanExpressCard, not an Invalid
kGenericCard;

[Ilya Sherman, 2013/06/18 03:37:38]

Done.

 }
 
 base::string16 CreditCard::GetRawInfo(AutofillFieldType type) const {
   switch (type) {
     case CREDIT_CARD_NAME:
       return name_on_card_;
 
     case CREDIT_CARD_EXP_MONTH:
       return ExpirationMonthAsString();
 
@@ skipping 425 matching lines @@
 const char* const kAmericanExpressCard = "americanExpressCC";
 const char* const kDinersCard = "dinersCC";
 const char* const kDiscoverCard = "discoverCC";
 const char* const kGenericCard = "genericCC";
 const char* const kJCBCard = "jcbCC";
 const char* const kMasterCard = "masterCardCC";
 const char* const kSoloCard = "soloCC";
 const char* const kVisaCard = "visaCC";
 
 }  // namespace autofill