Fix issue when country spec can not be found

Fixes #83
Simplify · Dec 14, 2021 · 8d5389c · 8d5389c
1 parent 3ef5198
commit 8d5389c
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 18 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,6 @@
+2021-12-14  Saša Jovanić <sasa@simplify.ba>
+	* Fix issue #83 - Fix problem when country can not be found when calling `validateIBAN`
+
 2021-12-05  Saša Jovanić <sasa@simplify.ba>
 	* Version 4.1.1
 	* Added Hungarian (HU) BBAN validation

diff --git a/src/IBANTools.ts b/src/IBANTools.ts
@@ -81,6 +81,7 @@ export function validateIBAN(iban?: string): ValidateIBANResult {
     if (!spec || !(spec.bban_regexp || spec.chars)) {
       result.valid = false;
       result.errorCodes.push(ValidationErrorsIBAN.NoIBANCountry);
+      return result;
     }
     if (spec && spec.chars && spec.chars !== iban.length) {
       result.valid = false;

diff --git a/test/ibantools_test.js b/test/ibantools_test.js
@@ -281,6 +281,9 @@ describe('IBANTools', function() {
     it('with valid HU IBAN should return true', function() {
       expect(iban.isValidIBAN('HU90100320000160120200000000')).to.be.true;
     });
+    it('with two dots should return false', function() {
+      expect(iban.isValidIBAN('..')).to.be.false;
+    });
   });
 
   describe('When calling validateIBAN()', function() {
@@ -298,6 +301,13 @@ describe('IBANTools', function() {
       });
     });
 
+    it('with two dots instead of IBAN should return false', function() {
+      expect(iban.validateIBAN('..')).to.deep.equal({
+        valid: false,
+        errorCodes: [iban.ValidationErrorsIBAN.NoIBANCountry],
+      });
+    });
+
     it('with undefined IBAN should return false', function() {
       expect(iban.validateIBAN(undefined)).to.deep.equal({
         valid: false,
@@ -315,31 +325,23 @@ describe('IBANTools', function() {
       });
     });
 
-    it('with invalid IBAN country and correct checksum should return false with correct code', function() {
-      expect(iban.validateIBAN('XX09ABNA0517164300')).to.deep.equal({
-        valid: false,
-        errorCodes: [iban.ValidationErrorsIBAN.NoIBANCountry],
-      });
-    });
-
-    it('with invalid IBAN country and wrong checksum should return false with wrong code', function() {
+    it('with invalid IBAN country should return false with error codes', function() {
       expect(iban.validateIBAN('XX91ABNA0517164300')).to.deep.equal({
-        valid: false,
-        errorCodes: [iban.ValidationErrorsIBAN.NoIBANCountry, iban.ValidationErrorsIBAN.WrongIBANChecksum],
-      });
-    });
-
-    it('with country with no IBAN support should return false with correct code', function() {
-      expect(iban.validateIBAN('US64SVBKUS6S3300958879')).to.deep.equal({
         valid: false,
         errorCodes: [iban.ValidationErrorsIBAN.NoIBANCountry],
       });
     });
 
-    it('with country with no IBAN support and wrong checksum should return false with wrong code', function() {
-      expect(iban.validateIBAN('US46SVBKUS6S3300958879')).to.deep.equal({
+    it('with country code only should return false with wrong code', function() {
+      expect(iban.validateIBAN('NL')).to.deep.equal({
         valid: false,
-        errorCodes: [iban.ValidationErrorsIBAN.NoIBANCountry, iban.ValidationErrorsIBAN.WrongIBANChecksum],
+        errorCodes: [
+          iban.ValidationErrorsIBAN.WrongBBANLength,
+          iban.ValidationErrorsIBAN.WrongBBANFormat,
+          iban.ValidationErrorsIBAN.WrongAccountBankBranchChecksum,
+          iban.ValidationErrorsIBAN.ChecksumNotNumber,
+          iban.ValidationErrorsIBAN.WrongIBANChecksum,
+        ],
       });
     });