Skip to content

[6.x] Fall back to default site on password-protected sites #15086

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
Aug 4, 2026
+30 −1
Merged

[6.x] Fall back to default site on password-protected sites #15086

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
bfdcd90
Fall back to default site in password scheme
daun Jul 29, 2026
f1c1e04
Merge remote-tracking branch 'origin/6.x' into fix/multisite-password…
jasonvarga Jul 30, 2026
532d02d
Add test for default site fallback on password form
jasonvarga Aug 4, 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/Auth/Protect/Protectors/Password/Controller.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class Controller extends BaseController
public function show()
{
if ($this->tokenData = session('statamic:protect:password.tokens.'.request('token'))) {
$site = Site::findByUrl($this->getUrl());
$site = Site::findByUrl($this->getUrl()) ?? Site::default();
$data = Data::find($this->tokenData['reference']);

app()->setLocale($site->lang());
Expand Down
29 changes: 29 additions & 0 deletions tests/Auth/Protect/PasswordProtectionTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,35 @@ public function default_password_form_url_is_unprotected()
->assertOk();
}

#[Test]
public function password_form_falls_back_to_default_site_when_url_doesnt_match_a_site()
{
$this->viewShouldReturnRendered('statamic::auth.protect.password', '');

$this->setSites([
'en' => ['name' => 'EN', 'locale' => 'en_US', 'lang' => 'en', 'url' => 'http://localhost/en/'],
'fr' => ['name' => 'FR', 'locale' => 'fr_FR', 'lang' => 'fr', 'url' => 'http://localhost/fr/'],
]);

config(['statamic.protect.default' => 'password-scheme']);
config(['statamic.protect.schemes.password-scheme' => [
'driver' => 'password',
'allowed' => ['test'],
]]);

Token::shouldReceive('generate')->andReturn('test-token');

$this
->get('/')
->assertRedirect('http://localhost/!/protect/password?token=test-token');

$this
->get('/!/protect/password?token=test-token')
->assertOk();

$this->assertEquals('en', app()->getLocale());
}

#[Test]
public function custom_password_form_url_is_unprotected()
{
Expand Down
Loading