feat: remove Bearer in token at the first time

Author: kenjis

src/Authentication/Authenticators/JWT.php

@@ -108,10 +108,6 @@ public function check(array $credentials): Result
             ]);
         }
 
-        if (strpos($credentials['token'], 'Bearer') === 0) {
-            $credentials['token'] = trim(substr($credentials['token'], 6));
-        }
-
         // Check JWT
         try {
             $this->payload = $this->decodeJWT($credentials['token']);

src/Filters/JWTAuth.php

@@ -37,11 +37,9 @@ public function before(RequestInterface $request, $arguments = null)
         /** @var JWT $authenticator */
         $authenticator = auth('jwt')->getAuthenticator();
 
-        $result = $authenticator->attempt([
-            'token' => $request->getHeaderLine(
-                setting('Auth.authenticatorHeader')['jwt'] ?? 'Authorization'
-            ),
-        ]);
+        $token = $this->getTokenFromHeader($request);
+
+        $result = $authenticator->attempt(['token' => $token]);
 
         if (! $result->isOK()) {
             return Services::response()
@@ -56,6 +54,19 @@ public function before(RequestInterface $request, $arguments = null)
         }
     }
 
+    private function getTokenFromHeader(RequestInterface $request): string
+    {
+        $tokenHeader = $request->getHeaderLine(
+            setting('Auth.authenticatorHeader')['jwt'] ?? 'Authorization'
+        );
+
+        if (strpos($tokenHeader, 'Bearer') === 0) {
+            return trim(substr($tokenHeader, 6));
+        }
+
+        return $tokenHeader;
+    }
+
     /**
      * We don't have anything to do here.
      *