From 5e127cd0ccee641edfb5bc8bbe3c8de597423293 Mon Sep 17 00:00:00 2001
From: Robin Chalas <robin.chalas@gmail.com>
Date: Sat, 19 Dec 2020 17:24:44 +0100
Subject: [PATCH] Fix compatibility for lcobucci/jwt v3.x

---
 Services/JWSProvider/LcobucciJWSProvider.php | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/Services/JWSProvider/LcobucciJWSProvider.php b/Services/JWSProvider/LcobucciJWSProvider.php
index 33cb1674..c9b51f0d 100644
--- a/Services/JWSProvider/LcobucciJWSProvider.php
+++ b/Services/JWSProvider/LcobucciJWSProvider.php
@@ -58,6 +58,11 @@ class LcobucciJWSProvider implements JWSProviderInterface
      */
     private $legacyJWTApi;
 
+    /**
+     * @var bool
+     */
+    private $useDateObjects;
+
     /**
      * @param KeyLoaderInterface $keyLoader
      * @param string             $cryptoEngine
@@ -85,7 +90,8 @@ public function __construct(KeyLoaderInterface $keyLoader, $cryptoEngine, $signa
         $this->signer    = $this->getSignerForAlgorithm($signatureAlgorithm);
         $this->ttl       = $ttl;
         $this->clockSkew = $clockSkew;
-        $this->legacyJWTApi = !class_exists(OpenSSL::class);
+        $this->legacyJWTApi = !class_exists(OpenSSL::class); // exists only on lcobucci/jwt 3.3+
+        $this->useDateObjects = method_exists(Token::class, 'payload') || class_exists(Plain::class);  // exists only on lcobucci/jwt 3.4+
     }
 
     /**
@@ -108,7 +114,7 @@ public function create(array $payload, array $header = [])
         if ($this->legacyJWTApi) {
             $jws->setIssuedAt($now);
         } else {
-            $jws->issuedAt(new \DateTimeImmutable("@{$now}"));
+            $jws->issuedAt($this->useDateObjects ? new \DateTimeImmutable("@{$now}") : $now);
         }
 
         if (null !== $this->ttl || isset($payload['exp'])) {
@@ -118,7 +124,7 @@ public function create(array $payload, array $header = [])
             if ($this->legacyJWTApi) {
                 $jws->setExpiration($exp);
             } else {
-                $jws->expiresAt($exp instanceof \DateTimeImmutable ? $exp : new \DateTimeImmutable("@$exp"));
+                $jws->expiresAt($exp instanceof \DateTimeImmutable ? $exp : ($this->useDateObjects ? new \DateTimeImmutable("@$exp") : $exp));
             }
         }
 
@@ -162,7 +168,7 @@ public function load($token)
 
         $payload = [];
 
-        if ($this->legacyJWTApi) {
+        if ($this->legacyJWTApi || !$this->useDateObjects) {
             foreach ($jws->getClaims() as $claim) {
                 $payload[$claim->getName()] = $claim->getValue();
             }
@@ -179,7 +185,7 @@ public function load($token)
             $payload,
             $this->verify($jws),
             null !== $this->ttl,
-            $this->legacyJWTApi ? $jws->getHeaders() : $jws->headers()->all(),
+            $this->legacyJWTApi || !$this->useDateObjects ? $jws->getHeaders() : $jws->headers()->all(),
             $this->clockSkew
         );
 
@@ -220,7 +226,7 @@ private function getSignedToken(Builder $jws)
         }
 
         if ($this->legacyJWTApi) {
-            $jws->sign($key, $this->signer);
+            $jws->sign($this->signer, $key);
 
             return $jws->getToken();
         }
@@ -236,7 +242,7 @@ private function getSignedToken(Builder $jws)
 
     private function verify(Token $jwt)
     {
-        if ($this->legacyJWTApi) {
+        if ($this->legacyJWTApi || !$this->useDateObjects) {
             if (!$jwt->validate(new ValidationData(time() + $this->clockSkew))) {
                 return false;
             }