fix(cc): Handle invalid country codes

fix #26
grantila · Feb 14, 2019 · c323fe6 · c323fe6
1 parent dff9f44
commit c323fe6
Show file tree

Hide file tree

Showing 3 changed files with 75 additions and 16 deletions.
diff --git a/lib/index.js b/lib/index.js
diff --git a/src/index.js b/src/index.js
@@ -52,16 +52,20 @@ function toNumberType( exportedName )
 
 function getValidationResult( number )
 {
-	switch( phoneUtil.isPossibleNumberWithReason( number ) )
+	try
 	{
-		case ValidationResult.IS_POSSIBLE:          return 'is-possible';
-		case ValidationResult.INVALID_COUNTRY_CODE: return 'invalid-country-code';
-		case ValidationResult.TOO_LONG:             return 'too-long';
-		case ValidationResult.TOO_SHORT:            return 'too-short';
-	}
+		switch( phoneUtil.isPossibleNumberWithReason( number ) )
+		{
+			case ValidationResult.IS_POSSIBLE:          return 'is-possible';
+			case ValidationResult.INVALID_COUNTRY_CODE: return 'invalid-country-code';
+			case ValidationResult.TOO_LONG:             return 'too-long';
+			case ValidationResult.TOO_SHORT:            return 'too-short';
+		}
+
+		if ( phoneUtil.isPossibleNumber( number ) )
+			return 'is-possible';
+	} catch ( err ) { }
 
-	if ( phoneUtil.isPossibleNumber( number ) )
-		return 'is-possible';
 	return 'unknown';
 }
 
@@ -87,6 +91,8 @@ function extractRegionCode( phoneNumber )
 	regionCode = PhoneNumber.getRegionCodeForCountryCode( firstThree );
 	if ( regionCode !== 'ZZ' )
 		return regionCode;
+
+	return null;
 }
 
 /**
@@ -148,12 +154,28 @@ function PhoneNumber( phoneNumber, regionCode )
 		this._number = null;
 		this._json[ 'number' ][ 'input' ] = phoneNumber;
 
+		if ( !regionCode )
+		{
+			this._json[ 'possibility' ] = 'invalid-country-code';
+			return;
+		}
+		else
+		{
+			var cc = PhoneNumber.getCountryCodeForRegionCode( regionCode );
+			if ( cc === 0 )
+			{
+				this._json[ 'possibility' ] = 'invalid-country-code';
+				return;
+			}
+		}
+
 		try
 		{
 			this._number = phoneUtil.parse( phoneNumber, regionCode );
 		}
 		catch ( e )
 		{
+			this._json[ 'possibility' ] = getValidationResult( phoneNumber );
 			return;
 		}
 	}

diff --git a/test.in/awesome-phonenumber/should-compile.ts b/test.in/awesome-phonenumber/should-compile.ts
@@ -81,3 +81,40 @@ describe( 'general', function( ) {
 		expect( pn.getRegionCode( ) ).to.equal( 'CA' );
 	} );
 } );
+
+describe( 'errors', function( ) {
+	it( 'should handle invalid country code', function( ) {
+		var pn = new PhoneNumber( '+0123' );
+		expect( pn.isValid( ) ).to.be.false;
+		expect( pn.isPossible( ) ).to.be.false;
+		expect( pn.toJSON( ).possibility ).to.equal( 'invalid-country-code' );
+	} );
+
+	it( 'should handle invalid country code (and valid region code)', function( ) {
+		var pn = new PhoneNumber( '+0123', 'SE' );
+		expect( pn.isValid( ) ).to.be.false;
+		expect( pn.isPossible( ) ).to.be.false;
+		expect( pn.toJSON( ).possibility ).to.equal( 'invalid-country-code' );
+	} );
+
+	it( 'should handle invalid country code and region code', function( ) {
+		var pn = new PhoneNumber( '0123', 'XX' );
+		expect( pn.isValid( ) ).to.be.false;
+		expect( pn.isPossible( ) ).to.be.false;
+		expect( pn.toJSON( ).possibility ).to.equal( 'invalid-country-code' );
+	} );
+
+	it( 'should handle missing country code', function( ) {
+		var pn = new PhoneNumber( '0123' );
+		expect( pn.isValid( ) ).to.be.false;
+		expect( pn.isPossible( ) ).to.be.false;
+		expect( pn.toJSON( ).possibility ).to.equal( 'invalid-country-code' );
+	} );
+
+	it( 'should handle TOO_SHORT', function( ) {
+		var pn = new PhoneNumber( '0123', 'SE' );
+		expect( pn.isValid( ) ).to.be.false;
+		expect( pn.isPossible( ) ).to.be.false;
+		expect( pn.toJSON( ).possibility ).to.equal( 'too-short' );
+	} );
+} );