Skip to content

[6.x] Fixed php error if oauth is enabled and cp is on top level #15296

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

Open
ccharz wants to merge 1 commit into
base: 6.x
Choose a base branch
from
+26 −1
Open

[6.x] Fixed php error if oauth is enabled and cp is on top level #15296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/Http/Controllers/CP/Auth/LoginController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public function showLoginForm(Request $request)

private function oauthProviders()
{
$redirect = parse_url(cp_route('index'))['path'];
$redirect = parse_url(cp_route('index'))['path'] ?? '/';

return OAuth::providers()->map(fn (Provider $provider) => [
'name' => $provider->name(),
Expand Down
25 changes: 25 additions & 0 deletions tests/Auth/LoginTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,31 @@ public function it_cant_logout_when_unauthenticated()
$this->assertGuest();
}

#[Test]
#[DefineEnvironment('cpOnTopLevel')]
#[DefineEnvironment('addOauthProvider')]
public function it_shows_oauth_providers_even_if_cp_is_on_top_level()
{
$this
->get(cp_route('login'))
->assertInertia(fn ($page) => $page
->component('auth/Login')
->has('providers', 1)
->where('oauthEnabled', true)
);
}

protected function cpOnTopLevel($app)
{
$app['config']->set('statamic.cp.route', '');
}

protected function addOauthProvider($app)
{
$app['config']->set('statamic.oauth.enabled', true);
$app['config']->set('statamic.oauth.providers', ['github']);
}

protected function disableTwoFactor($app)
{
$app['config']->set('statamic.users.two_factor_enabled', false);
Expand Down
Loading