Fix phone input (#201)

* Fix phone input * remove extra * fix factory * Fix phone input * Validate phone number rule * Prefill support for country only * Fix phone input error * fix tests --------- Co-authored-by: Julien Nahum <[email protected]>
JhumanJ · Sep 18, 2023 · d75975b · d75975b
1 parent 08db014
commit d75975b
Show file tree

Hide file tree

Showing 10 changed files with 256 additions and 94 deletions.
diff --git a/app/Http/Requests/AnswerFormRequest.php b/app/Http/Requests/AnswerFormRequest.php
@@ -190,7 +190,7 @@ private function getPropertyRules($property): array
                 }
                 return $this->getRulesForDate($property);
             case 'phone_number':
-                return [new ValidPhoneInputRule];
+                return ['string', 'min:6', new ValidPhoneInputRule];
             default:
                 return [];
         }

diff --git a/app/Rules/ValidPhoneInputRule.php b/app/Rules/ValidPhoneInputRule.php
@@ -9,21 +9,16 @@ class ValidPhoneInputRule implements Rule
 {
     public function passes($attribute, $value)
     {
-        if (!is_string($value)) {
+        if (!is_string($value) || !Str::startsWith($value, '+')) {
             return false;
         }
-        if (!Str::startsWith($value, '+')) {
-            return false;
-        }
-        $parts = explode(' ', $value);
-        if (count($parts) < 2) {
-            return false;
-        }
-        return strlen($parts[1]) >= 5;
+
+        $phoneUtil = \libphonenumber\PhoneNumberUtil::getInstance();
+        return $phoneUtil->isValidNumber($phoneUtil->parse($value));
     }
 
     public function message()
     {
-        return 'The :attribute must be a string that starts with a "+" character and must be at least 5 digits long.';
+        return 'The :attribute is invalid.';
     }
 }
diff --git a/composer.json b/composer.json
@@ -18,11 +18,12 @@
     }
   ],
   "require": {
-    "php": "^8.0",
+    "php": "^8.2",
     "ext-json": "*",
     "aws/aws-sdk-php": "^3.183",
     "doctrine/dbal": "^3.4",
     "fruitcake/laravel-cors": "^2.0",
+    "giggsey/libphonenumber-for-php": "^8.13",
     "guzzlehttp/guzzle": "^7.0.1",
     "jhumanj/laravel-model-stats": "^0.4.0",
     "laravel/cashier": "^13.4",