fixing issue

tymondesigns · Nov 30, 2014 · 52fe4c1 · 52fe4c1
1 parent fe4a615
commit 52fe4c1
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/Tymon/JWTAuth/Providers/FirebaseProvider.php b/src/Tymon/JWTAuth/Providers/FirebaseProvider.php
@@ -45,10 +45,12 @@ public function decode($token)
         try {
             $payload = (array) Firebase::decode($this->token, $this->secret);
         } catch (Exception $e) {
-        	// ignore firebase's expired exception because we will throw our own later
-            if ($e->getMessage() !== 'Expired Token') {
-                throw new JWTException('Could not decode token: ' . $e->getMessage());
-            }
+        	// firebase implementation doesn't return the payload if it has expired :(
+        	if ($e->getMessage() === 'Expired Token') {
+        		throw new TokenExpiredException('JWT has expired');
+        	} else {
+        		throw new JWTException('Could not decode token: ' . $e->getMessage());
+        	}
         }
 
         return $this->createPayload($payload);