From d62e3a18e1aa25dc207387faba66688b3e788be4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Wed, 4 Aug 2021 09:33:28 +0200 Subject: [PATCH] Add throttle handle --- app/Enums/ApiError.php | 7 +++++-- app/Exceptions/Handler.php | 9 ++++++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/app/Enums/ApiError.php b/app/Enums/ApiError.php index 8a0fd98..9e84968 100644 --- a/app/Enums/ApiError.php +++ b/app/Enums/ApiError.php @@ -17,6 +17,7 @@ use Kwaadpepper\Enum\BaseEnum; * @method static self methodNotAllowed() * @method static self wrongTimeStamp() * @method static self arcardiaXmlMailFailed() + * @method static self throttleRequestsException() */ class ApiError extends BaseEnum { @@ -34,7 +35,8 @@ class ApiError extends BaseEnum 'singleOptinCustomerExists' => 120, 'methodNotAllowed' => 150, 'wrongTimeStamp' => 151, - 'arcardiaXmlMailFailed' => 204 + 'arcardiaXmlMailFailed' => 204, + 'throttleRequestsException' => 429 ]; } @@ -50,7 +52,8 @@ class ApiError extends BaseEnum 'needAuth' => trans('You need to be authenticated'), 'methodNotAllowed' => trans('This method is not allowed for this request'), 'wrongTimeStamp' => trans('Your request is malformed, please check timestamp header and parameter'), - 'arcardiaXmlMailFailed' => trans('Arcadia XML Creation failed.') + 'arcardiaXmlMailFailed' => trans('Arcadia XML Creation failed.'), + 'throttleRequestsException' => trans('Throttle: too many request have been attempted, please retry later') ]; } } diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index 27363a2..0f2d67d 100644 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -10,6 +10,7 @@ use App\Mail\ExceptionAlert; use Illuminate\Auth\AuthenticationException; use Illuminate\Database\Eloquent\ModelNotFoundException; use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler; +use Illuminate\Http\Exceptions\ThrottleRequestsException; use Illuminate\Support\Facades\Mail; use Illuminate\Validation\ValidationException; use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException; @@ -83,7 +84,7 @@ class Handler extends ExceptionHandler */ public function render($request, Throwable $e) { - if (Helper::isRequestForApiV2($request) and $request->ajax()) { + if (Helper::isRequestForApiV2($request) and $request->isJson()) { switch (get_class($e)) { case AuthenticationException::class: /** @var AuthenticationException $e */ @@ -119,6 +120,12 @@ class Handler extends ExceptionHandler 'message' => $e->getMessage(), 'code' => $e->getCode() ], $e->getStatusCode()); + case ThrottleRequestsException::class: + /** @var ThrottleRequestsException $e */ + return response()->json([ + 'message' => ApiError::throttleRequestsException()->label, + 'code' => ApiError::throttleRequestsException()->value + ], 429); case CrmException::class: default: return response()->json([