Merge branch '3.x'

CHANGELOG.md

@@ -1,6 +1,11 @@
 # Release Notes
 
-## [Unreleased](https://github.com/laravel/sanctum/compare/v3.3.2...3.x)
+## [Unreleased](https://github.com/laravel/sanctum/compare/v3.3.3...3.x)
+
+## [v3.3.3](https://github.com/laravel/sanctum/compare/v3.3.2...v3.3.3) - 2023-12-19
+
+* Updated `CsrfCookieController` to use named arguments by [@OussamaMater](https://github.com/OussamaMater) in https://github.com/laravel/sanctum/pull/487
+* Extract generate token method by [@mowangjuanzi](https://github.com/mowangjuanzi) in https://github.com/laravel/sanctum/pull/488
 
 ## [v3.3.2](https://github.com/laravel/sanctum/compare/v3.3.1...v3.3.2) - 2023-11-03
 

src/HasApiTokens.php

@@ -45,12 +45,7 @@ public function tokenCan(string $ability)
      */
     public function createToken(string $name, array $abilities = ['*'], DateTimeInterface $expiresAt = null)
     {
-        $plainTextToken = sprintf(
-            '%s%s%s',
-            config('sanctum.token_prefix', ''),
-            $tokenEntropy = Str::random(40),
-            hash('crc32b', $tokenEntropy)
-        );
+        $plainTextToken = $this->generateTokenString();
 
         $token = $this->tokens()->create([
             'name' => $name,
@@ -62,6 +57,21 @@ public function createToken(string $name, array $abilities = ['*'], DateTimeInte
         return new NewAccessToken($token, $token->getKey().'|'.$plainTextToken);
     }
 
+    /**
+     * Generate the token string.
+     *
+     * @return string
+     */
+    public function generateTokenString()
+    {
+        return sprintf(
+            '%s%s%s',
+            config('sanctum.token_prefix', ''),
+            $tokenEntropy = Str::random(40),
+            hash('crc32b', $tokenEntropy)
+        );
+    }
+
     /**
      * Get the access token currently associated with the user.
      *

src/Http/Controllers/CsrfCookieController.php

@@ -17,9 +17,9 @@ class CsrfCookieController
     public function show(Request $request)
     {
         if ($request->expectsJson()) {
-            return new JsonResponse(null, 204);
+            return new JsonResponse(status: 204);
         }
 
-        return new Response('', 204);
+        return new Response(status: 204);
     }
 }