remove chained formatter instance from config, use string value

stechstudio · Feb 13, 2024 · 1ec4fa0 · 1ec4fa0
1 parent b725930
commit 1ec4fa0
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 5 deletions.
diff --git a/config/jwt.php b/config/jwt.php
@@ -1,7 +1,5 @@
 <?php
 
-use Lcobucci\JWT\Encoding\ChainedFormatter;
-
 return [
     // Look for a dedicated signing key, fall back to app key
     'key' => env('JWT_SIGNING_KEY', env('APP_KEY')),
@@ -25,5 +23,5 @@
         'audience' => env('JWT_VALIDATE_AUDIENCE', true),
     ],
 
-    'chained_formatter' => ChainedFormatter::default(),
+    'chained_formatter' => env('JWT_CHAINED_FORMATTER', 'default'),
 ];
diff --git a/src/JWTServiceProvider.php b/src/JWTServiceProvider.php
@@ -5,6 +5,7 @@
 use Illuminate\Http\Request;
 use Illuminate\Support\ServiceProvider;
 use Illuminate\Support\Str;
+use Lcobucci\JWT\Encoding\ChainedFormatter;
 
 class JWTServiceProvider extends ServiceProvider
 {
@@ -37,7 +38,12 @@ public function register(): void
             }
 
             $signer = config('jwt.signer');
-            $chainedFormatter = config('jwt.chained_formatter');
+
+            $chainedFormatter = match(true) {
+                config('jwt.chained_formatter') instanceof ChainedFormatter => config('jwt.chained_formatter'),
+                config('jwt.chained_formatter') === "unix" => ChainedFormatter::withUnixTimestampDates(),
+                default => ChainedFormatter::default()
+            };
 
             return new Client(
                 $key,

diff --git a/tests/ClientTest.php b/tests/ClientTest.php
@@ -34,7 +34,7 @@ protected function getEnvironmentSetUp($app): void
             'issuer' => 'myappiss',
             'lifetime' => 900,
             'signer' => \Lcobucci\JWT\Signer\Hmac\Sha256::class,
-            'chained_formatter' => ChainedFormatter::default(),
+            'chained_formatter' => "default",
         ]]);
     }
 

diff --git a/tests/ConfigTest.php b/tests/ConfigTest.php
@@ -32,4 +32,13 @@ public function testSigningKeyWithExplicitJwtKey()
 
         $this->assertEquals('thisisjwtkey', config('jwt.key'));
     }
+
+    public function testChainedFormatter()
+    {
+        putenv('JWT_CHAINED_FORMATTER=unix');
+
+        $this->refreshApplication();
+
+        $this->assertEquals('unix', config('jwt.chained_formatter'));
+    }
 }