refactor: move JWT authenticatorHeader setting to Config\AuthJWT

Author: kenjis

src/Authentication/Authenticators/JWT.php

@@ -169,8 +169,11 @@ public function loggedIn(): bool
         /** @var IncomingRequest $request */
         $request = service('request');
 
+        /** @var AuthJWT $config */
+        $config = config('AuthJWT');
+
         return $this->attempt([
-            'token' => $request->getHeaderLine(config('Auth')->authenticatorHeader['jwt']),
+            'token' => $request->getHeaderLine($config->authenticatorHeader),
         ])->isOK();
     }
 

src/Config/Auth.php

@@ -99,7 +99,6 @@ class Auth extends BaseConfig
      */
     public array $authenticatorHeader = [
         'tokens' => 'Authorization',
-        'jwt'    => 'Authorization',
     ];
 
     /**

src/Config/AuthJWT.php

@@ -11,6 +11,16 @@
  */
 class AuthJWT extends BaseConfig
 {
+    /**
+     * --------------------------------------------------------------------
+     * Name of Authenticator Header
+     * --------------------------------------------------------------------
+     * The name of Header that the Authorization token should be found.
+     * According to the specs, this should be `Authorization`, but rare
+     * circumstances might need a different header.
+     */
+    public string $authenticatorHeader = 'Authorization';
+
     /**
      * The payload items that all JWT have.
      *

src/Filters/JWTAuth.php

@@ -10,6 +10,7 @@
 use CodeIgniter\HTTP\Response;
 use CodeIgniter\HTTP\ResponseInterface;
 use CodeIgniter\Shield\Authentication\Authenticators\JWT;
+use CodeIgniter\Shield\Config\AuthJWT;
 use Config\Services;
 
 /**
@@ -65,8 +66,11 @@ private function getTokenFromHeader(RequestInterface $request): string
     {
         assert($request instanceof IncomingRequest);
 
+        /** @var AuthJWT $config */
+        $config = config('AuthJWT');
+
         $tokenHeader = $request->getHeaderLine(
-            setting('Auth.authenticatorHeader')['jwt'] ?? 'Authorization'
+            $config->authenticatorHeader ?? 'Authorization'
         );
 
         if (strpos($tokenHeader, 'Bearer') === 0) {