diff --git a/app/Http/Controllers/TwilioController.php b/app/Http/Controllers/TwilioController.php index 1c9760eb1a..16fa06484f 100644 --- a/app/Http/Controllers/TwilioController.php +++ b/app/Http/Controllers/TwilioController.php @@ -43,9 +43,19 @@ class TwilioController extends BaseController $twilio = new Client($sid, $token); - $verification = $twilio->verify->v2->services(config('ninja.twilio_verify_sid')) - ->verifications - ->create($request->phone, "sms"); + + try { + $verification = $twilio->verify + ->v2 + ->services(config('ninja.twilio_verify_sid')) + ->verifications + ->create($request->phone, "sms"); + } + catch(\Exception $e) { + + return response()->json(['message' => 'Phone number format is incorrect, please use international number format and try again.'], 400); + + } $account->account_sms_verification_code = $verification->sid; $account->account_sms_verification_number = $request->phone; diff --git a/app/Http/Requests/Twilio/GenerateSmsRequest.php b/app/Http/Requests/Twilio/GenerateSmsRequest.php index 7867472717..c22580dcf4 100644 --- a/app/Http/Requests/Twilio/GenerateSmsRequest.php +++ b/app/Http/Requests/Twilio/GenerateSmsRequest.php @@ -32,7 +32,7 @@ class GenerateSmsRequest extends Request { return [ - 'phone' => 'required|regex:^\+[1-9]\d{1,14}$', + 'phone' => 'required|regex:^\+[1-9]\d{1,14}$^', ]; } diff --git a/config/ninja.php b/config/ninja.php index 581eb22929..d0670923e0 100644 --- a/config/ninja.php +++ b/config/ninja.php @@ -197,4 +197,8 @@ return [ 'ninja_apple_client_id' => env('APPLE_CLIENT_ID', false), 'ninja_apple_client_secret' => env('APPLE_CLIENT_SECRET',false), 'ninja_apple_redirect_url' => env('APPLE_REDIRECT_URI',false), + 'twilio_account_sid' => env('TWILIO_ACCOUNT_SID',false), + 'twilio_auth_token' => env('TWILIO_AUTH_TOKEN',false), + 'twilio_verify_sid' => env('TWILIO_VERIFY_SID',false), + ];