From ea44025e884d91a796e865b117ff8edf88e6f613 Mon Sep 17 00:00:00 2001
From: freek <freek@spatie.be>
Date: Mon, 26 Nov 2018 09:03:04 +0100
Subject: [PATCH] nitpicks

---
 src/Http/Controllers/ShowDashboard.php        |  2 +-
 .../Http/Controllers/EchoController.php       | 19 +++++++++++--------
 .../Http/Controllers/TriggerEvent.php         |  9 +++++++--
 3 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/Http/Controllers/ShowDashboard.php b/src/Http/Controllers/ShowDashboard.php
index cbc1d8d..f182708 100644
--- a/src/Http/Controllers/ShowDashboard.php
+++ b/src/Http/Controllers/ShowDashboard.php
@@ -10,7 +10,7 @@ class ShowDashboard
     public function __invoke(Request $request, ClientProvider $clients)
     {
         return view('websockets::dashboard', [
-            'clients' => $clients->all()
+            'clients' => $clients->all(),
         ]);
     }
 }
\ No newline at end of file
diff --git a/src/LaravelEcho/Http/Controllers/EchoController.php b/src/LaravelEcho/Http/Controllers/EchoController.php
index 4e5095b..f2606d5 100644
--- a/src/LaravelEcho/Http/Controllers/EchoController.php
+++ b/src/LaravelEcho/Http/Controllers/EchoController.php
@@ -40,8 +40,9 @@ abstract class EchoController implements HttpServerInterface
 
         $laravelRequest = Request::createFromBase((new HttpFoundationFactory)->createRequest($serverRequest));
 
-        $this->verifyAppId($laravelRequest->appId);
-        $this->verifySignature($laravelRequest);
+        $this
+            ->ensureValidAppId($laravelRequest->appId)
+            ->ensureValidSignature($laravelRequest);
 
         $response = $this($laravelRequest);
 
@@ -66,21 +67,21 @@ abstract class EchoController implements HttpServerInterface
                 'error' => $exception->getMessage()
             ]));
 
-            $connection->send(gPsr\str($response));
+            $connection->send(Psr\str($response));
             $connection->close();
         }
     }
 
-    public function verifyAppId(string $appId)
+    public function ensureValidAppId(string $appId)
     {
-        if ($client = Client::findByAppId($appId)) {
-             return;
+        if (! $client = Client::findByAppId($appId)) {
+            throw new HttpException(401, "Unknown app id `{$appId}` provided.");
         }
 
-        throw new HttpException(401, "Unknown app id `{$appId}` provided.");
+        return true;
     }
 
-    protected function verifySignature(Request $request)
+    protected function ensureValidSignature(Request $request)
     {
         $bodyMd5 = md5($request->getContent());
 
@@ -96,6 +97,8 @@ abstract class EchoController implements HttpServerInterface
         if ($authSignature !== $request->get('auth_signature')) {
             throw new HttpException(401, 'Invalid auth signature provided.');
         }
+
+        return $this;
     }
 
     abstract public function __invoke(Request $request);
diff --git a/src/LaravelEcho/Http/Controllers/TriggerEvent.php b/src/LaravelEcho/Http/Controllers/TriggerEvent.php
index de0a016..7630ee1 100644
--- a/src/LaravelEcho/Http/Controllers/TriggerEvent.php
+++ b/src/LaravelEcho/Http/Controllers/TriggerEvent.php
@@ -9,10 +9,15 @@ class TriggerEvent extends EchoController
 {
     public function __invoke(Request $request)
     {
-        $this->verifySignature($request);
+        $this->ensureValidSignature($request);
 
         foreach ($request->json()->get('channels', []) as $channelId) {
-            Dashboard::apiMessage($request->appId, $channelId, $request->json()->get('name'), $request->json()->get('data'));
+            Dashboard::apiMessage(
+                $request->appId,
+                $channelId,
+                $request->json()->get('name'),
+                $request->json()->get('data')
+            );
 
             $channel = $this->channelManager->find($request->appId, $channelId);