Refactor after review

Author: Lukasss93

src/Middleware/ValidateWebAppData.php

@@ -9,16 +9,25 @@
 
 class ValidateWebAppData
 {
+    public function __construct(protected Nutgram $bot)
+    {
+    }
+
     public function handle(Request $request, Closure $next)
     {
         try {
             $initData = $request->input('initData', '');
-            $data = app(Nutgram::class)->validateWebAppData($initData);
+            $data = $this->bot->validateWebAppData($initData);
 
-            $request->attributes->add(['webapp' => $data]);
+            $request->attributes->add(['webAppData' => $data]);
             return $next($request);
         } catch (InvalidDataException) {
-            abort(403);
+            $this->handleInvalidData($request, $next);
         }
     }
+
+    protected function handleInvalidData(Request $request, Closure $next): void
+    {
+        abort(403);
+    }
 }

tests/Feature/MiddlewareTest.php

@@ -8,28 +8,27 @@
 use Symfony\Component\HttpKernel\Exception\HttpException;
 
 beforeEach(function () {
+    /** @var FakeNutgram $bot */
+    $this->bot = app(Nutgram::class);
     $this->request = new Request();
 });
 
 it('validates web app data', function () {
-    /** @var FakeNutgram $bot */
-    $bot = app(Nutgram::class);
-
     $this->request->merge([
-        'initData' => $bot->generateWebAppData([
+        'initData' => $this->bot->generateWebAppData([
             'foo' => 'bar',
             'auth_date' => time(),
         ])
     ]);
 
-    $middleware = new ValidateWebAppData();
+    $middleware = new ValidateWebAppData($this->bot);
     $middleware->handle($this->request, function ($request) {
-        expect($request->get('webapp'))->toBeInstanceOf(WebAppData::class);
+        expect($request->get('webAppData'))->toBeInstanceOf(WebAppData::class);
     });
 });
 
 it('fails to validate web app data', function () {
-    $middleware = new ValidateWebAppData();
+    $middleware = new ValidateWebAppData($this->bot);
     $middleware->handle($this->request, function ($request) {
     });
 })->throws(HttpException::class);