chore: better BeforeValidException message for decode (#526)

firebase · Jul 14, 2023 · 0a53cf2 · 0a53cf2
1 parent 299105a
commit 0a53cf2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/JWT.php b/src/JWT.php
@@ -154,7 +154,7 @@ public static function decode(
         // token can actually be used. If it's not yet that time, abort.
         if (isset($payload->nbf) && floor($payload->nbf) > ($timestamp + static::$leeway)) {
             throw new BeforeValidException(
-                'Cannot handle token prior to ' . \date(DateTime::ISO8601, (int) $payload->nbf)
+                'Cannot handle token with nbf prior to ' . \date(DateTime::ISO8601, (int) $payload->nbf)
             );
         }
 
@@ -163,7 +163,7 @@ public static function decode(
         // correctly used the nbf claim).
         if (!isset($payload->nbf) && isset($payload->iat) && floor($payload->iat) > ($timestamp + static::$leeway)) {
             throw new BeforeValidException(
-                'Cannot handle token prior to ' . \date(DateTime::ISO8601, (int) $payload->iat)
+                'Cannot handle token with iat prior to ' . \date(DateTime::ISO8601, (int) $payload->iat)
             );
         }
 

diff --git a/tests/JWTTest.php b/tests/JWTTest.php
@@ -147,6 +147,7 @@ public function testInvalidTokenWithNbfLeeway()
         ];
         $encoded = JWT::encode($payload, 'my_key', 'HS256');
         $this->expectException(BeforeValidException::class);
+        $this->expectExceptionMessage('Cannot handle token with nbf prior to');
         JWT::decode($encoded, new Key('my_key', 'HS256'));
     }
 
@@ -176,6 +177,7 @@ public function testValidTokenWithNbfMicrotime()
     public function testInvalidTokenWithNbfMicrotime()
     {
         $this->expectException(BeforeValidException::class);
+        $this->expectExceptionMessage('Cannot handle token with nbf prior to');
         $payload = [
             'message' => 'abc',
             'nbf' => microtime(true) + 20, // use microtime in the future
@@ -211,6 +213,7 @@ public function testInvalidTokenWithIatLeeway()
         ];
         $encoded = JWT::encode($payload, 'my_key', 'HS256');
         $this->expectException(BeforeValidException::class);
+        $this->expectExceptionMessage('Cannot handle token with iat prior to');
         JWT::decode($encoded, new Key('my_key', 'HS256'));
     }
 
@@ -228,6 +231,7 @@ public function testValidTokenWithIatMicrotime()
     public function testInvalidTokenWithIatMicrotime()
     {
         $this->expectException(BeforeValidException::class);
+        $this->expectExceptionMessage('Cannot handle token with iat prior to');
         $payload = [
             'message' => 'abc',
             'iat' => microtime(true) + 20, // use microtime in the future