Use default laravel throttle

enjin · Mar 28, 2024 · 77fbf30 · 77fbf30
1 parent a9a07b7
commit 77fbf30
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 45 deletions.
diff --git a/config/enjin-platform.php b/config/enjin-platform.php
@@ -251,6 +251,6 @@
     'rate_limit' => [
         'enabled' => env('RATE_LIMIT_ENABLED', true),
         'attempts' => env('RATE_LIMIT_ATTEMPTS', 500),
-        'time' => env('RATE_LIMIT_TIME', 60),
+        'time' => env('RATE_LIMIT_TIME', 1), // minutes
     ],
 ];
diff --git a/config/graphql.php b/config/graphql.php
@@ -15,7 +15,6 @@
         // This middleware will apply to all schemas
         'middleware' => [
             Illuminate\Session\Middleware\StartSession::class,
-            Enjin\Platform\Middlewares\RateLimit::class,
             Enjin\Platform\Middlewares\Authenticated::class,
         ],
 

diff --git a/lang/en/error.php b/lang/en/error.php
@@ -54,5 +54,4 @@
     'unable_to_process' => "Sorry, we're unable to process your request at this time. Please try again later.",
     'no_collection' => 'Unable to find a collection for token ID :tokenId.',
     'cannot_retry_transaction' => 'Cannot retry FINALIZED transaction.',
-    'too_many_requests' => 'Too many requests. Retry in :num seconds',
 ];
diff --git a/src/Http/Controllers/GraphQLController.php b/src/Http/Controllers/GraphQLController.php
@@ -16,6 +16,15 @@
 
 class GraphQLController extends GraphQLGraphQLController
 {
+    public function __construct()
+    {
+        if (config('enjin-platform.rate_limit.enabled')) {
+            $this->middleware(
+                'throttle:' . config('enjin-platform.rate_limit.attempts') . ',' . config('enjin-platform.rate_limit.time')
+            );
+        }
+    }
+
     /**
      * Handle graphql query.
      */

diff --git a/src/Middlewares/RateLimit.php b/src/Middlewares/RateLimit.php
diff --git a/tests/Feature/GraphQL/Middleware/RateLimit.php b/tests/Feature/GraphQL/Middleware/RateLimit.php
@@ -26,7 +26,7 @@ public function test_it_can_rate_limit(): void
             ['query' => static::$queries['GetCollections']],
         );
         $result = $response->getData(true);
-        $this->assertStringContainsString('Too many requests.', Arr::get($result, 'message'));
+        $this->assertStringContainsString('Too Many Attempts.', Arr::get($result, 'message'));
     }
 
     public function test_it_will_not_rate_limit(): void