From b3e02c8a70cf624dd77eceddf9c0b33c981e97c4 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 3 Nov 2022 17:31:46 +1100 Subject: [PATCH] Override phone number with international format --- app/Http/ValidationRules/User/HasValidPhoneNumber.php | 5 +---- app/Repositories/UserRepository.php | 3 +++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Http/ValidationRules/User/HasValidPhoneNumber.php b/app/Http/ValidationRules/User/HasValidPhoneNumber.php index dea4bd897bab..b9e16bf70621 100644 --- a/app/Http/ValidationRules/User/HasValidPhoneNumber.php +++ b/app/Http/ValidationRules/User/HasValidPhoneNumber.php @@ -63,10 +63,7 @@ class HasValidPhoneNumber implements Rule $user = auth()->user(); - request()->request->set('phone', $phone_number->phoneNumber); - request()->merge(['phone' => $phone_number->phoneNumber ]); - - nlog($phone_number->phoneNumber); + request()->merge(['validated_phone' => $phone_number->phoneNumber ]); $user->verified_phone_number = true; $user->save(); diff --git a/app/Repositories/UserRepository.php b/app/Repositories/UserRepository.php index dafabf6dcfe6..cecc25522b2f 100644 --- a/app/Repositories/UserRepository.php +++ b/app/Repositories/UserRepository.php @@ -59,6 +59,9 @@ class UserRepository extends BaseRepository if(array_key_exists('oauth_provider_id', $details)) unset($details['oauth_provider_id']); + if (request()->has('validated_phone')) + $details['phone'] = request()->input('validated_phone'); + $user->fill($details); //allow users to change only their passwords - not others!