Improvements/subsequent requests (#117)

* Subsequent request handling improvements --------- Co-authored-by: Willem Poortman <[email protected]>
magewirephp · Jul 5, 2023 · 5740e9f · 5740e9f
1 parent 0299dfe
commit 5740e9f
Showing 1 changed file with 13 additions and 10 deletions.
diff --git a/src/Model/Request/MagewireValidator.php b/src/Model/Request/MagewireValidator.php
@@ -39,19 +39,22 @@ public function validate(RequestInterface $request, ActionInterface $action): vo
         $handle = $input['fingerprint']['handle'] ?? null;
 
         if (! $handle || preg_match('/^[a-zA-Z0-9][a-zA-Z\d\-_\.]*$/', $handle) !== 1) {
-            $message = 'Bad Request';
+            $this->throwException();
+        }
 
-            $result = $this->resultJsonFactory->create();
-            $result->setStatusHeader(400);
+        $request->setParams($input);
+    }
 
-            $result->setData([
-                'message'=> $message,
-                'code' => 400
-            ]);
+    private function throwException($message = 'Bad Request')
+    {
+        $result = $this->resultJsonFactory->create();
+        $result->setStatusHeader(400);
 
-            throw new InvalidRequestException($result, [new Phrase($message)]);
-        }
+        $result->setData([
+            'message'=> $message,
+            'code' => 400
+        ]);
 
-        $request->setParams($input);
+        throw new InvalidRequestException($result, [new Phrase($message)]);
     }
 }