From 6039a21802853deae4aa636ffbacec26903c5d51 Mon Sep 17 00:00:00 2001
From: Andreas Schantl <andreas@schantl.io>
Date: Thu, 23 Apr 2026 15:37:55 +0200
Subject: [PATCH 1/3] Failing test

---
 tests/CP/AuthRedirectTest.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/tests/CP/AuthRedirectTest.php b/tests/CP/AuthRedirectTest.php
index 3a4c40642e7..7fe4daeda60 100644
--- a/tests/CP/AuthRedirectTest.php
+++ b/tests/CP/AuthRedirectTest.php
@@ -7,6 +7,7 @@
 use Statamic\Exceptions\AuthorizationException;
 use Statamic\Facades\User;
 use Statamic\Statamic;
+use Tests\Auth\Eloquent\User as EloquentUser;
 use Tests\FakesRoles;
 use Tests\PreventSavingStacheItemsToDisk;
 use Tests\TestCase;
@@ -94,4 +95,15 @@ public function it_redirects_to_unauthorized_view_if_there_would_be_a_redirect_l
             ->assertRedirect(cp_route('unauthorized'))
             ->assertSessionHas(['error' => 'Unauthorized.']);
     }
+
+    #[Test]
+    public function it_redirects_non_logged_in_statamic_users()
+    {
+        $nonStatamicUser = EloquentUser::make();
+
+        $this
+            ->actingAs($nonStatamicUser)
+            ->get('/cp')
+            ->assertRedirect(cp_route('login'));
+    }
 }

From 253e63b2401f33acbf324ea3b9efc7fb5b3c6478 Mon Sep 17 00:00:00 2001
From: Andreas Schantl <andreas@schantl.io>
Date: Thu, 23 Apr 2026 15:37:59 +0200
Subject: [PATCH 2/3] Fix

---
 src/Preferences/Preferences.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Preferences/Preferences.php b/src/Preferences/Preferences.php
index 9037f8f24b0..6d628127d3a 100644
--- a/src/Preferences/Preferences.php
+++ b/src/Preferences/Preferences.php
@@ -45,7 +45,7 @@ public function all()
     {
         $this->resetState();
 
-        if (auth()->check()) {
+        if (User::current()) {
             $this
                 ->mergeDottedUserPreferences()
                 ->mergeDottedRolePreferences();

From deebfeaf5ed38971b90d686e7b4728b112dc2572 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Thu, 23 Apr 2026 10:57:10 -0400
Subject: [PATCH 3/3] rename test

---
 tests/CP/AuthRedirectTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/CP/AuthRedirectTest.php b/tests/CP/AuthRedirectTest.php
index 7fe4daeda60..6cccbdf455d 100644
--- a/tests/CP/AuthRedirectTest.php
+++ b/tests/CP/AuthRedirectTest.php
@@ -97,7 +97,7 @@ public function it_redirects_to_unauthorized_view_if_there_would_be_a_redirect_l
     }
 
     #[Test]
-    public function it_redirects_non_logged_in_statamic_users()
+    public function it_redirects_to_login_when_authenticated_user_is_not_a_statamic_user()
     {
         $nonStatamicUser = EloquentUser::make();