diff --git a/app/Http/Requests/User/UpdateUserRequest.php b/app/Http/Requests/User/UpdateUserRequest.php index b08824ac6a42..e09f86d3fff6 100644 --- a/app/Http/Requests/User/UpdateUserRequest.php +++ b/app/Http/Requests/User/UpdateUserRequest.php @@ -44,7 +44,7 @@ class UpdateUserRequest extends Request } if(Ninja::isHosted() && $this->phone_has_changed) - $rules['phone'] = ['sometimes', new HasValidPhoneNumber()]; + $rules['phone'] = ['sometimes', 'bail', 'string', new HasValidPhoneNumber()]; return $rules; } diff --git a/app/Http/ValidationRules/User/HasValidPhoneNumber.php b/app/Http/ValidationRules/User/HasValidPhoneNumber.php index b9e16bf70621..38539d72c38f 100644 --- a/app/Http/ValidationRules/User/HasValidPhoneNumber.php +++ b/app/Http/ValidationRules/User/HasValidPhoneNumber.php @@ -47,6 +47,9 @@ class HasValidPhoneNumber implements Rule if(!$sid) return true; + if(is_null($value)) + return false; + $twilio = new \Twilio\Rest\Client($sid, $token); $country = auth()->user()->account?->companies()?->first()?->country(); diff --git a/app/Jobs/User/VerifyPhone.php b/app/Jobs/User/VerifyPhone.php index a1fb8b1687df..4b2a33dc0903 100644 --- a/app/Jobs/User/VerifyPhone.php +++ b/app/Jobs/User/VerifyPhone.php @@ -70,6 +70,7 @@ class VerifyPhone implements ShouldQueue catch(\Exception $e) { $this->user->verified_phone_number = false; $this->user->save(); + return; } if($phone_number && strlen($phone_number->phoneNumber) > 1)