Profile: add phone number verification

This forces us to take GB numbers and then we store them in e164 ready for nexmo fix #210
NottingHack · May 26, 2019 · ccc43c3 · ccc43c3
1 parent 41cdfb3
commit ccc43c3
Show file tree

Hide file tree

Showing 8 changed files with 277 additions and 9 deletions.
diff --git a/app/HMS/User/ProfileManager.php b/app/HMS/User/ProfileManager.php
@@ -6,9 +6,11 @@
 use HMS\Entities\User;
 use HMS\Entities\Profile;
 use Illuminate\Http\Request;
+use libphonenumber\RegionCode;
 use HMS\Repositories\MetaRepository;
 use HMS\Repositories\UserRepository;
 use HMS\Repositories\ProfileRepository;
+use Propaganistas\LaravelPhone\PhoneNumber;
 
 class ProfileManager
 {
@@ -85,7 +87,8 @@ public function create(
         $profile->setAddressCity($addressCity);
         $profile->setAddressCounty($addressCounty);
         $profile->setAddressPostcode($addressPostcode);
-        $profile->setContactNumber($contactNumber);
+        $e164 = PhoneNumber::make($contactNumber, RegionCode::GB)->formatE164();
+        $profile->setContactNumber($e164);
 
         if (! empty($dateOfBirth)) {
             $profile->setDateOfBirth(new Carbon($dateOfBirth));
@@ -142,7 +145,8 @@ public function updateUserProfileFromRequest(User $user, Request $request)
         }
 
         if ($request['contactNumber']) {
-            $profile->setContactNumber($request['contactNumber']);
+            $e164 = PhoneNumber::make($request['contactNumber'], RegionCode::GB)->formatE164();
+            $profile->setContactNumber($e164);
         }
 
         // Nullable field

diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
@@ -86,7 +86,7 @@ protected function validator(array $data)
             'addressCity' => 'required|max:100',
             'addressCounty' => 'required|max:100',
             'addressPostcode' => 'required|max:10',
-            'contactNumber' => 'required|max:50',
+            'contactNumber' => 'required|max:50|phone:GB',
             'dateOfBirth' => 'nullable|date_format:Y-m-d',
         ]);
     }

diff --git a/app/Http/Controllers/MembershipController.php b/app/Http/Controllers/MembershipController.php
@@ -237,7 +237,7 @@ public function updateDetails(User $user, Request $request)
             'addressCity' => 'required|max:100',
             'addressCounty' => 'required|max:100',
             'addressPostcode' => 'required|max:10',
-            'contactNumber' => 'required|max:50',
+            'contactNumber' => 'required|max:50|phone:GB',
             'dateOfBirth' => 'nullable|date_format:Y-m-d',
         ]);
 

diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
@@ -119,7 +119,7 @@ public function update(Request $request, User $user)
             'addressCity' => 'sometimes|required|max:100',
             'addressCounty' => 'sometimes|required|max:100',
             'addressPostcode' => 'sometimes|required|max:10',
-            'contactNumber' => 'sometimes|required|max:50',
+            'contactNumber' => 'sometimes|required|max:50|phone:GB',
             'dateOfBirth' => 'sometimes|nullable|date_format:Y-m-d',
             'unlockText' => 'sometimes|nullable|max:95',
         ]);

diff --git a/composer.json b/composer.json
@@ -31,6 +31,7 @@
         "pragmarx/google2fa-laravel": "^1.0",
         "pragmarx/recovery": "^0.1.0",
         "predis/predis": "^1.1",
+        "propaganistas/laravel-phone": "^4.2",
         "spatie/laravel-cookie-consent": "^2.0",
         "tremby/laravel-git-version": "^1.1"
     },

diff --git a/composer.lock b/composer.lock
diff --git a/database/seeds/ProfileTableSeeder.php b/database/seeds/ProfileTableSeeder.php
@@ -2,10 +2,14 @@
 
 use HMS\Entities\Role;
 use HMS\Entities\Profile;
+use libphonenumber\RegionCode;
 use Illuminate\Database\Seeder;
 use HMS\Repositories\RoleRepository;
 use HMS\Repositories\UserRepository;
+use Faker\Generator as FakerGenerator;
 use Doctrine\ORM\EntityManagerInterface;
+use libphonenumber\NumberParseException;
+use Propaganistas\LaravelPhone\PhoneNumber;
 
 class ProfileTableSeeder extends Seeder
 {
@@ -24,18 +28,29 @@ class ProfileTableSeeder extends Seeder
      */
     protected $entityManager;
 
+    /**
+     * @var FakerGenerator
+     */
+    protected $faker;
+
     /**
      * Create a new TableSeeder instance.
      *
      * @param RoleRepository $roleRepository
-     * @param UserRepository $userRepository,
+     * @param UserRepository $userRepository
      * @param EntityManagerInterface $entityManager
+     * @param FakerGenerator $faker
      */
-    public function __construct(RoleRepository $roleRepository, UserRepository $userRepository, EntityManagerInterface $entityManager)
-    {
+    public function __construct(
+        RoleRepository $roleRepository,
+        UserRepository $userRepository,
+        EntityManagerInterface $entityManager,
+        FakerGenerator $faker
+    ) {
         $this->roleRepository = $roleRepository;
         $this->userRepository = $userRepository;
         $this->entityManager = $entityManager;
+        $this->faker = $faker;
     }
 
     /**
@@ -65,6 +80,18 @@ public function run()
                     $p = entity(Profile::class)->make(['user' => $user]);
                     break;
                 }
+
+                // validate and format phoneNumbers
+                $e164 = null;
+                do {
+                    try {
+                        $e164 = PhoneNumber::make($this->faker->phoneNumber, RegionCode::GB)->formatE164();
+                    } catch (NumberParseException $e) {
+                        //
+                    }
+                } while ($e164 == null);
+                $p->setContactNumber($e164);
+
                 $this->entityManager->persist($p);
             }
         }