Skip to content

[6.x] Fix CP auth error when using multiple user providers #14543

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jasonvarga merged 3 commits into from
Apr 23, 2026
+13 −1
Merged

[6.x] Fix CP auth error when using multiple user providers #14543

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6039a21
Failing test
andjsch Apr 23, 2026
253e63b
Fix
andjsch Apr 23, 2026
deebfea
rename test
jasonvarga Apr 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Preferences/Preferences.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public function all()
{
$this->resetState();

if (auth()->check()) {
if (User::current()) {
$this
->mergeDottedUserPreferences()
->mergeDottedRolePreferences();
Expand Down
12 changes: 12 additions & 0 deletions tests/CP/AuthRedirectTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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_to_login_when_authenticated_user_is_not_a_statamic_user()
{
$nonStatamicUser = EloquentUser::make();

$this
->actingAs($nonStatamicUser)
->get('/cp')
->assertRedirect(cp_route('login'));
}
}
Loading