refactored code

Signed-off-by: Maurice Preuß (envoyr) <hello@envoyr.com>

src/Id/Http/Middleware/CreateFreshApiToken.php

@@ -2,35 +2,62 @@
 
 namespace Anikeen\Id\Http\Middleware;
 
+use Anikeen\Id\AnikeenId;
 use Anikeen\Id\ApiTokenCookieFactory;
-use Anikeen\Id\Facades\AnikeenId;
 use Closure;
+use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 
 class CreateFreshApiToken
 {
+    /**
+     * The API token cookie factory instance.
+     *
+     * @var ApiTokenCookieFactory
+     */
+    protected $cookieFactory;
+
     /**
      * The authentication guard.
      *
      * @var string
      */
-    protected string $guard;
+    protected $guard;
 
     /**
      * Create a new middleware instance.
      *
+     * @param ApiTokenCookieFactory $cookieFactory
      * @return void
      */
-    public function __construct(protected ApiTokenCookieFactory $cookieFactory)
+    public function __construct(ApiTokenCookieFactory $cookieFactory)
     {
-        //
+        $this->cookieFactory = $cookieFactory;
+    }
+
+    /**
+     * Specify the guard for the middleware.
+     *
+     * @param string|null $guard
+     * @return string
+     */
+    public static function using($guard = null)
+    {
+        $guard = is_null($guard) ? '' : ':' . $guard;
+
+        return static::class . $guard;
     }
 
     /**
      * Handle an incoming request.
+     *
+     * @param Request $request
+     * @param Closure $next
+     * @param string|null $guard
+     * @return mixed
      */
-    public function handle(Request $request, Closure $next, string $guard = null): mixed
+    public function handle($request, Closure $next, $guard = null)
     {
         $this->guard = $guard;
 
@@ -47,8 +74,12 @@ class CreateFreshApiToken
 
     /**
      * Determine if the given request should receive a fresh token.
+     *
+     * @param Request $request
+     * @param Response $response
+     * @return bool
      */
-    protected function shouldReceiveFreshToken(Request $request, Response $response): bool
+    protected function shouldReceiveFreshToken($request, $response)
     {
         return $this->requestShouldReceiveFreshToken($request) &&
             $this->responseShouldReceiveFreshToken($response);
@@ -56,25 +87,37 @@ class CreateFreshApiToken
 
     /**
      * Determine if the request should receive a fresh token.
+     *
+     * @param Request $request
+     * @return bool
      */
-    protected function requestShouldReceiveFreshToken(Request $request): bool
+    protected function requestShouldReceiveFreshToken($request)
     {
         return $request->isMethod('GET') && $request->user($this->guard);
     }
 
     /**
      * Determine if the response should receive a fresh token.
+     *
+     * @param Response $response
+     * @return bool
      */
-    protected function responseShouldReceiveFreshToken(Response $response): bool
+    protected function responseShouldReceiveFreshToken($response)
     {
-        return !$this->alreadyContainsToken($response);
+        return ($response instanceof Response ||
+                $response instanceof JsonResponse) &&
+            !$this->alreadyContainsToken($response);
     }
 
     /**
      * Determine if the given response already contains an API token.
+     *
      * This avoids us overwriting a just "refreshed" token.
+     *
+     * @param Response $response
+     * @return bool
      */
-    protected function alreadyContainsToken(Response $response): bool
+    protected function alreadyContainsToken($response)
     {
         foreach ($response->headers->getCookies() as $cookie) {
             if ($cookie->getName() === AnikeenId::cookie()) {
@@ -84,4 +127,4 @@ class CreateFreshApiToken
 
         return false;
     }
-}
+}