Allow setting the "exp" claim from event listeners

lexik · Oct 5, 2018 · f0e476d · f0e476d
1 parent 8cbf97e
commit f0e476d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Services/JWSProvider/DefaultJWSProvider.php b/Services/JWSProvider/DefaultJWSProvider.php
@@ -89,8 +89,8 @@ public function create(array $payload, array $header = [])
         $jws           = new JWS($header, $this->cryptoEngine);
         $claims        = ['iat' => time()];
 
-        if (null !== $this->ttl) {
-            $claims['exp'] = time() + $this->ttl;
+        if (null !== $this->ttl && !isset($payload['exp'])) {
+            $payload['exp'] = time() + $this->ttl;
         }
 
         $jws->setPayload($payload + $claims);

diff --git a/Services/JWSProvider/LcobucciJWSProvider.php b/Services/JWSProvider/LcobucciJWSProvider.php
@@ -80,7 +80,7 @@ public function create(array $payload, array $header = [])
         }
         $jws->setIssuedAt(time());
 
-        if (null !== $this->ttl) {
+        if (null !== $this->ttl && !isset($payload['exp'])) {
             $jws->setExpiration(time() + $this->ttl);
         }