Updated Tymon's JWTAuth and improved the authentication process.

Signed-off-by: Jason Lewis <[email protected]>

Author: jasonlewis

changes.md

@@ -1,5 +1,9 @@
 ### v0.8.*@dev (master)
 
+##### General
+
+- Updated Tymon's JWTAuth to the latest version, `0.4.1`.
+
 ##### Added
 
 - Can now use `RateLimiter::setRateLimiter` to change the key used to rate limit requests from the clients IP.

composer.json

@@ -16,7 +16,7 @@
     },
     "require-dev": {
         "lucadegasperi/oauth2-server-laravel": "3.0.*",
-        "tymon/jwt-auth": "0.3.*",
+        "tymon/jwt-auth": "0.4.*",
         "illuminate/routing": "4.2.*",
         "illuminate/events": "4.2.*",
         "illuminate/auth": "4.2.*",

src/Auth/JWTProvider.php

@@ -43,10 +43,14 @@ public function authenticate(Request $request, Route $route)
         $token = $this->getToken($request);
 
         try {
-            return $this->auth->login($token);
-        } catch (JWTException $e) {
-            throw new UnauthorizedHttpException('JWTAuth', $e->getMessage());
+            if (! $user = $this->auth->authenticate($token)) {
+                throw new UnauthorizedHttpException('JWTAuth', 'Unable authenticate with invalid token.');
+            }
+        } catch (JWTException $exception) {
+            throw new UnauthorizedHttpException('JWTAuth', $exception->getMessage());
         }
+
+        return $user;
     }
 
     /**