Merge pull request #65 from City-of-Helsinki/fix/LINK-1530-phone-vali…

…dation LINK-1530 | Improve phone number validation
City-of-Helsinki · Sep 8, 2023 · f87ebc2 · f87ebc2
2 parents 24d1815 + 015f687
commit f87ebc2
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 2 deletions.
diff --git a/src/utils/__tests__/validationUtils.test.ts b/src/utils/__tests__/validationUtils.test.ts
@@ -1,4 +1,4 @@
-import { getErrorText } from '../validationUtils';
+import { getErrorText, isValidPhoneNumber } from '../validationUtils';
 
 describe('getErrorText', () => {
   it('should return error text', () => {
@@ -13,3 +13,41 @@ describe('getErrorText', () => {
     expect(t).toBeCalledWith(error.key, error);
   });
 });
+
+describe('isValidPhoneNumber function', () => {
+  const validCases: string[][] = [
+    ['0441234567'],
+    ['044 1234 567'],
+    ['044 123 4567'],
+    ['044 1234567'],
+    ['+358441234567'],
+    ['+358 44 123 4567'],
+    ['+358 44 1234 567'],
+    ['+358 441234567'],
+  ];
+  test.each(validCases)(
+    'should return true value if phone number is valid, %p',
+    async (phoneNumber) => {
+      expect(isValidPhoneNumber(phoneNumber)).toBe(true);
+    }
+  );
+
+  const invalidCases: string[][] = [
+    ['044  1234 56x'],
+    ['044  123x 567'],
+    ['04x  1234 567'],
+    ['044  1234 567'],
+    ['044 123  4567'],
+    ['044  1234567'],
+    ['+358  44 123 4567'],
+    ['+358 44  123 4567'],
+    ['+358 44 1234  567'],
+    ['+358  441234567'],
+  ];
+  test.each(invalidCases)(
+    'should return false value if phone number is invalid, %p',
+    async (phoneNumber) => {
+      expect(isValidPhoneNumber(phoneNumber)).toBe(false);
+    }
+  );
+});
diff --git a/src/utils/validationUtils.ts b/src/utils/validationUtils.ts
@@ -13,7 +13,7 @@ export const createMinErrorMessage = (
 };
 
 export const isValidPhoneNumber = (phone: string): boolean =>
-  /^\+?\(?\d{1,3}\)? ?-?\d{1,3} ?-?\d{3,5} ?-?\d{4}( ?-?\d{3})?/.test(phone);
+  /^\+?\(?\d{1,3}\)? ?-?\d{1,3} ?-?\d{3,5} ?-?\d{3,4}( ?-?\d{3})?/.test(phone);
 
 export const isValidZip = (zip: string): boolean => /^\d{5}$/.test(zip);