Fixed style and updated unit tests

sfelix-martins · Jul 31, 2018 · 99dfe3b · 99dfe3b
1 parent 790ac58
commit 99dfe3b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/Http/Middleware/MultiAuthenticate.php b/src/Http/Middleware/MultiAuthenticate.php
@@ -59,9 +59,10 @@ public function __construct(
     public function handle($request, Closure $next, ...$guards)
     {
         // If don't has any guard follow the flow
-        // stop laravel from checking for a token if session is not set
         if (empty($guards)) {
             $this->authenticate($guards);
+
+            // Stop laravel from checking for a token if session is not set
             return $next($request);
         }
 
@@ -114,7 +115,7 @@ public function canBeAuthenticated(Authenticatable $user, $guards)
      *
      * @param \SMartins\PassportMultiauth\Provider $token
      * @param  array $guards
-     * @return mixed
+     * @return void
      *
      * @throws \Illuminate\Auth\AuthenticationException
      */
@@ -125,6 +126,6 @@ public function authenticateTokenGuard(Token $token, $guards)
         // use only guard associated to access token provider
         $authGuards = $providers->has($token->provider) ? [$providers->get($token->provider)] : [];
 
-        return $this->authenticate($authGuards);
+        $this->authenticate($authGuards);
     }
 }
diff --git a/tests/Unit/MultiAuthenticateMiddlewareTest.php b/tests/Unit/MultiAuthenticateMiddlewareTest.php
@@ -48,9 +48,10 @@ public function testTryAuthWithoutGuards()
         $request = $this->createRequest();
 
         $middleware = new MultiAuthenticate($resourceServer, $repository, $this->auth);
-        $middleware->handle($request, function () {
+        $response = $middleware->handle($request, function () {
             return 'response';
         });
+        $this->assertEquals('response', $response);
     }
 
     public function testTryAuthWithoutAccessTokenId()