v1.6.13 - Configurable throttle

Author: roncodes

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "fleetbase/core-api",
-    "version": "1.6.12",
+    "version": "1.6.13",
     "description": "Core Framework and Resources for Fleetbase API",
     "keywords": [
         "fleetbase",
@@ -21,6 +21,7 @@
         "php": "^8.0",
         "aws/aws-sdk-php-laravel": "^3.7",
         "fleetbase/laravel-mysql-spatial": "^1.0.2",
+        "fleetbase/countries": "^0.8.3",
         "fleetbase/twilio": "^5.0.1",
         "giggsey/libphonenumber-for-php": "^8.13",
         "google/apiclient": "^2.18",
@@ -44,7 +45,6 @@
         "maatwebsite/excel": "^3.1",
         "phpoffice/phpspreadsheet": "^1.28",
         "phrity/websocket": "^1.7",
-        "pragmarx/countries": "^0.8.2",
         "sentry/sentry-laravel": "*",
         "spatie/laravel-activitylog": "^4.7",
         "spatie/laravel-google-cloud-storage": "^2.2",

config/api.php

@@ -1,3 +1,8 @@
 <?php
 
-return [];
+return [
+    'throttle' => [
+        'max_attempts' => env('THROTTLE_REQUESTS_PER_MINUTE', 90),
+        'decay_minutes' => env('THROTTLE_DECAY_MINUTES', 1),
+    ],
+];

src/Http/Middleware/ThrottleRequests.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace Fleetbase\Http\Middleware;
+
+use Illuminate\Routing\Middleware\ThrottleRequests as ThrottleRequestsMiddleware;
+use Closure;
+
+class ThrottleRequests extends ThrottleRequestsMiddleware
+{
+    public function handle($request, Closure $next, $maxAttempts = null, $decayMinutes = null, $prefix = '')
+    {
+        $maxAttempts = config('api.throttle.max_attempts', 90);
+        $decayMinutes = config('api.throttle.decay_minutes', 1);
+
+        return parent::handle($request, $next, $maxAttempts, $decayMinutes, $prefix);
+    }
+}

src/Providers/CoreServiceProvider.php

@@ -57,7 +57,7 @@ class CoreServiceProvider extends ServiceProvider
             \Fleetbase\Http\Middleware\TrackPresence::class,
         ],
         'fleetbase.api' => [
-            'throttle:80,1',
+            \Fleetbase\Http\Middleware\ThrottleRequests::class,
             \Illuminate\Session\Middleware\StartSession::class,
             \Fleetbase\Http\Middleware\AuthenticateOnceWithBasicAuth::class,
             \Illuminate\Routing\Middleware\SubstituteBindings::class,