JavaScript version 0_1_17

ArnoudAdyen · ArnoudAdyen · commit 886841b56f27 · 2016-04-15T09:21:33.000+02:00
Add the fourDigitCvcForBins option to validate 4 digit are used for the
CVC field on selected bins. The default value is '34,37' for the amex
bins.
diff --git a/Options.md b/Options.md
@@ -43,9 +43,15 @@ The `createEncryption ( key , `*`options`*` )` and `createEncryptedForm ( form,
   A comma separated string of bins for which the CVC code validation should be ignored.
   
   For example `cvcIgnoreBins = '6703'`) to ignore CVC validation for BCMC.
+  
+* **string `[fourDigitCvcForBins = '34,37']`** - *since version: 0_1_17*
+
+  A comma separated string of bins for which a four digit CVC is required.
+
+  For example `fourDigitCvcForBins = '34,37'`) to require four digit CVC for Amex cards.
 
 ## Option in createEncryptedForm()
-Supported fields: `enabledValidations`, `numberIgnoreNonNumeric`, `cvcIgnoreBins`, `submitButtonsAlwaysEnabled`, `fieldNameAttribute`, `onsubmit`
+Supported fields: `enabledValidations`, `numberIgnoreNonNumeric`, `cvcIgnoreBins`, `fourDigitCvcForBins`, `submitButtonsAlwaysEnabled`, `fieldNameAttribute`, `onsubmit`
 
 *Example:*
 ```Javascript
@@ -55,19 +61,21 @@ var cseForm = createEncryptedForm ( form, key , {
     "submitButonAlwaysEnabled": false,
     "numberIgnoreNonNumeric" : true,
     "fieldNameAttribute" : "data-encrypted-name",
-    "cvcIgnoreBins" = "6703"
+    "cvcIgnoreBins" : "6703",
+    "fourDigitCvcForBins" : "34,37"
 } );
 ```
 
 When the card type detection addon is being enabled, the `cardTypeElement` option is also supported.
 
 ## Option in createEncryption()
-Currently  `enabledValidations`, `numberIgnoreNonNumeric` and `cvcIgnoreBins` are supported.
+Currently  `enabledValidations`, `numberIgnoreNonNumeric`, `fourDigitCvcForBins` and `cvcIgnoreBins` are supported.
 
 ```Javascript
 var cse = createEncryption ( key , {
     "enableValidations" : true,
     "numberIgnoreNonNumeric" : true,
-    "cvcIgnoreBins" = "6703"
+    "cvcIgnoreBins" = "6703",
+    "fourDigitCvcForBins" : "34,37"
 } );
 ```
diff --git a/README.md b/README.md
@@ -129,6 +129,11 @@ In case the HTML integration is troublesome in your setup, the library has been
 
 # Version History
 
+JavaScript version 0_1_17
+-------
+
+* Add the fourDigitCvcForBins option to validate 4 digit are used for the CVC field on selected bins. The default value is '34,37' for the amex bins.
+
 JavaScript version 0_1_16
 -------
 
diff --git a/adyen.encrypt.nodom.html b/adyen.encrypt.nodom.html
@@ -16,7 +16,7 @@
         <!-- How to use the Adyen encryption client-side JS library -->
         <!-- N.B. Make sure the library is *NOT* loaded in the "head" of the HTML document -->
         
-        <script type="text/javascript" src="js/adyen.encrypt.nodom.min.js?0_1_16"></script>
+        <script type="text/javascript" src="js/adyen.encrypt.nodom.min.js?0_1_17"></script>
         <script type="text/javascript">
             
             // the public key
@@ -51,6 +51,9 @@
             // list.
             // options.cvcIgnoreBins = '6703'; // Ignore CVC for BCMC
             
+            // Use 4digit cvc for certain bins. Supply a comma separated list.
+            // options.fourDigitCvcForBins = '34,37'; // Set 4 digit CVC for Amex
+            
             
             var cseInstance = adyen.encrypt.createEncryption(key, options);
             
diff --git a/adyen.encrypt.simple.html b/adyen.encrypt.simple.html
@@ -49,7 +49,7 @@
 
         <!-- How to use the Adyen encryption client-side JS library -->
         <!-- N.B. Make sure the library is *NOT* loaded in the "head" of the HTML document -->
-        <script type="text/javascript" src="js/adyen.encrypt.min.js?0_1_16"></script>
+        <script type="text/javascript" src="js/adyen.encrypt.min.js?0_1_17"></script>
         
         <script type="text/javascript">
             
@@ -98,6 +98,9 @@
             // list.
             // options.cvcIgnoreBins = '6703'; // Ignore CVC for BCMC
             
+            // Use 4digit cvc for certain bins. Supply a comma separated list.
+            // options.fourDigitCvcForBins = '34,37'; // Set 4 digit CVC for Amex
+            
             
             // Use a different attribute to identify adyen fields
             // Note that the attributes needs to start with data-.
diff --git a/js/adyen.encrypt.js b/js/adyen.encrypt.js
diff --git a/js/adyen.encrypt.min.js b/js/adyen.encrypt.min.js
diff --git a/js/adyen.encrypt.nodom.js b/js/adyen.encrypt.nodom.js
@@ -7,7 +7,7 @@
  * * Stanford Javascript Crypto Library | http://crypto.stanford.edu/sjcl/
  * * JSON in JavaScript | http://www.JSON.org/
  * 
- * Version: 0_1_16
+ * Version: 0_1_17
  * Author:  ADYEN (c) 2014
 
 <!DOCTYPE html>
@@ -28,7 +28,7 @@
         <!-- How to use the Adyen encryption client-side JS library -->
         <!-- N.B. Make sure the library is *NOT* loaded in the "head" of the HTML document -->
         
-        <script type="text/javascript" src="js/adyen.encrypt.nodom.min.js?0_1_16"></script>
+        <script type="text/javascript" src="js/adyen.encrypt.nodom.min.js?0_1_17"></script>
         <script type="text/javascript">
             
             // the public key
@@ -63,6 +63,9 @@
             // list.
             // options.cvcIgnoreBins = '6703'; // Ignore CVC for BCMC
             
+            // Use 4digit cvc for certain bins. Supply a comma separated list.
+            // options.fourDigitCvcForBins = '34,37'; // Set 4 digit CVC for Amex
+            
             
             var cseInstance = adyen.encrypt.createEncryption(key, options);
             
@@ -172,7 +175,7 @@
     encrypt.errors = encrypt.errors || {};
     
 
-    encrypt.version = '0_1_16';
+    encrypt.version = '0_1_17';
 
     
 
@@ -288,6 +291,14 @@
             delete this.options.cvcIgnoreFornumber;
         }
         
+        if ( typeof this.options.fourDigitCvcForBins === "undefined" ) {
+            this.options.fourDigitCvcForBins = "34,37"; // Amex by default
+        }
+        
+        if ( typeof this.options.cvcLengthFornumber !== "undefined" ) {
+            delete this.options.cvcLengthFornumber;
+        }
+        
         if ( typeof this.options.cvcIgnoreBins === "string" ) {
             var binsToIgnore = [];
             this.options.cvcIgnoreBins.replace(/\d+/g, function(m) {
@@ -305,6 +316,28 @@
             delete this.options.cvcIgnoreBins;
         }
         
+        if (typeof this.options.fourDigitCvcForBins === "string") {
+            
+            var cvcGroups = [];
+            
+            this.options.fourDigitCvcForBins.replace(/\d+/g, function(m) {
+                if (m.length > 0 && !isNaN(parseInt(m, 10))) {
+                    cvcGroups.push(m);
+                }
+                return m;
+            });
+            
+            if (cvcGroups.length > 0) {
+                this.options.cvcLengthFornumber = {
+                    matcher : new RegExp("^\\s*(" + cvcGroups.join("|") + ")"),
+                    requiredLength : 4
+                }
+            }
+            
+        }
+        
+        delete this.options.fourDigitCvcForBins;
+        
         evLog("initializeCount");
     };
 
@@ -411,25 +444,32 @@
                         val = val.replace( /\D/g, '' );
                     }
                     
-                    var shouldIgnore = false;
-                    
                     for ( var relatedField in data ) {
                         if ( data.hasOwnProperty(relatedField) ) {
                             
                             var possibleOption = this.options[field + 'IgnoreFor' + relatedField] ;
+                            var lengthOption = this.options[field + 'LengthFor' + relatedField];
                             
                             if ( possibleOption && data[relatedField].match(possibleOption)) {
-                                shouldIgnore = true;
+                                result[field] = true;
+                                continue;
+                            } else if (lengthOption && lengthOption.matcher && lengthOption.requiredLength && data[relatedField].match(lengthOption.matcher)) {
+                                if (val.length !== lengthOption.requiredLength ) {
+                                    result[field] = false;
+                                    continue;
+                                }
                             }
+                            
                         }
                     }
-                    
-                    if (shouldIgnore) {
-                        result[field] = true;
+
+                    // above checks are used as filters. If they set a result
+                    // other checks are irrelevant
+                    if (result.hasOwnProperty(field)) {
                         result.valid = result.valid && result[field];
                         continue;
                     }
-
+                    
                     switch ( field ) {
                     case 'number':
                         result.number = validations.numberCheck( val );
diff --git a/js/adyen.encrypt.nodom.min.js b/js/adyen.encrypt.nodom.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "adyen-cse-js",
-  "version": "0.1.16",
+  "version": "0.1.17",
   "description": "Adyen javascript client-side encryption library",
   "main": "js/adyen.encrypt.nodom.js",
   "repository": {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "adyen-cse-js",`
`3`		`- "version": "0.1.16",`
	`3`	`+ "version": "0.1.17",`
`4`	`4`	`"description": "Adyen javascript client-side encryption library",`
`5`	`5`	`"main": "js/adyen.encrypt.nodom.js",`
`6`	`6`	`"repository": {`