refactor: remove JWTAuth::getTokenFromHeader() and use JWT::getTokenFromHeader()

Author: kenjis

src/Authentication/Authenticators/JWT.php

@@ -207,17 +207,14 @@ public function loggedIn(): bool
         /** @var IncomingRequest $request */
         $request = service('request');
 
-        /** @var AuthJWT $config */
-        $config = config('AuthJWT');
-
         $token = $this->getTokenFromHeader($request);
 
         return $this->attempt([
             'token' => $token,
         ])->isOK();
     }
 
-    private function getTokenFromHeader(RequestInterface $request): string
+    public function getTokenFromHeader(RequestInterface $request): string
     {
         assert($request instanceof IncomingRequest);
 

src/Filters/JWTAuth.php

@@ -19,7 +19,6 @@
 use CodeIgniter\HTTP\Response;
 use CodeIgniter\HTTP\ResponseInterface;
 use CodeIgniter\Shield\Authentication\Authenticators\JWT;
-use CodeIgniter\Shield\Config\AuthJWT;
 use Config\Services;
 
 /**
@@ -45,7 +44,7 @@ public function before(RequestInterface $request, $arguments = null)
         /** @var JWT $authenticator */
         $authenticator = auth('jwt')->getAuthenticator();
 
-        $token = $this->getTokenFromHeader($request);
+        $token = $authenticator->getTokenFromHeader($request);
 
         $result = $authenticator->attempt(['token' => $token]);
 
@@ -62,24 +61,6 @@ public function before(RequestInterface $request, $arguments = null)
         }
     }
 
-    private function getTokenFromHeader(RequestInterface $request): string
-    {
-        assert($request instanceof IncomingRequest);
-
-        /** @var AuthJWT $config */
-        $config = config('AuthJWT');
-
-        $tokenHeader = $request->getHeaderLine(
-            $config->authenticatorHeader ?? 'Authorization'
-        );
-
-        if (strpos($tokenHeader, 'Bearer') === 0) {
-            return trim(substr($tokenHeader, 6));
-        }
-
-        return $tokenHeader;
-    }
-
     /**
      * We don't have anything to do here.
      *