Skip to content

fix: unauthorized users for groups and permissions are not redirected to the previous url #799

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
merged 3 commits into from
Sep 7, 2023
Merged

fix: unauthorized users for groups and permissions are not redirected to the previous url #799

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
53e46d2
Store beforeLoginUrl to session before redirecting to login page.
sammyskills Aug 24, 2023
22edd91
Added tests
sammyskills Aug 24, 2023
6c747dd
Fixed PHPCPD
sammyskills Aug 24, 2023
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
6 changes: 6 additions & 0 deletions src/Filters/AbstractAuthFilter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,12 @@ public function before(RequestInterface $request, $arguments = null)
}

if (! auth()->loggedIn()) {
// Set the entrance url to redirect a user after successful login
if (! url_is('login')) {
$session = session();
$session->setTempdata('beforeLoginUrl', current_url(), 300);
Comment on lines +35 to +36
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just came up with this code, but it is a copy and paste.
Since it is the same knowledge (save the URL for 300 seconds in the session), it might be better to put it together in a method if possible.

But there doesn't seem to be an appropriate class to put it in now.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I'm currently merge this. Maybe we can refactor later.

}

return redirect()->route('login');
}

Expand Down
10 changes: 10 additions & 0 deletions tests/Authentication/Filters/GroupFilterTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,16 @@ public function testFilterNotAuthorized(): void
$result->assertSee('Open');
}

public function testFilterNotAuthorizedStoresRedirectToEntranceUrlIntoSession(): void
{
$result = $this->call('get', 'protected-route');

$result->assertRedirectTo('/login');

$this->assertNotEmpty(session()->getTempdata('beforeLoginUrl'));
$this->assertSame(site_url('protected-route'), session()->getTempdata('beforeLoginUrl'));
}

public function testFilterSuccess(): void
{
/** @var User $user */
Expand Down
10 changes: 10 additions & 0 deletions tests/Authentication/Filters/PermissionFilterTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,16 @@ public function testFilterNotAuthorized(): void
$result->assertSee('Open');
}

public function testFilterNotAuthorizedStoresRedirectToEntranceUrlIntoSession(): void
{
$result = $this->call('get', 'protected-route');

$result->assertRedirectTo('/login');

$this->assertNotEmpty(session()->getTempdata('beforeLoginUrl'));
$this->assertSame(site_url('protected-route'), session()->getTempdata('beforeLoginUrl'));
}

public function testFilterSuccess(): void
{
/** @var User $user */
Expand Down