Skip to content

feat: using a more precise return #1146

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
wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

feat: using a more precise return #1146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
392b748
fix: if the code does not match it will redirect to the auth/a/show page
warcooft Jul 17, 2024
ca137a3
add test case
warcooft Jul 18, 2024
941b72e
update test case
warcooft Jul 18, 2024
e0d8963
update test case
warcooft Jul 18, 2024
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
4 changes: 1 addition & 3 deletions src/Authentication/Actions/EmailActivator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,9 +118,7 @@ public function verify(IncomingRequest $request)

// No match - let them try again.
if (! $authenticator->checkAction($identity, $postedToken)) {
session()->setFlashdata('error', lang('Auth.invalidActivateToken'));

return $this->view(setting('Auth.views')['action_email_activate_show']);
return redirect()->back()->with('error', lang('Auth.invalidActivateToken'));
}

$user = $authenticator->getUser();
Expand Down
29 changes: 29 additions & 0 deletions tests/Controllers/RegisterTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,35 @@ public function testRegisterActionWithBadEmailValue(): void
);
}

public function testRegisterActionRedirectsIfTokenNotMatch(): void
{
// Ensure our action is defined
$config = config('Auth');
$config->actions['register'] = EmailActivator::class;
Factories::injectMock('config', 'Auth', $config);

// Already registered but not yet activated and logged in.
$result = $this->post('/register', [
'email' => '[email protected]',
'username' => 'foo',
'password' => 'abkdhflkjsdflkjasd;lkjf',
'password_confirm' => 'abkdhflkjsdflkjasd;lkjf',
]);

// Should have been redirected to the action's page.
$result->assertRedirectTo('/auth/a/show');

// Attempted to send an invalid token.
$result = $this->withSession()->post('/auth/a/verify', [
'token' => 'invalid-token',
]);

// Should have been redirected to the previous page.
$result->assertStatus(302);
$result->assertRedirect();
$result->assertSee(lang('Auth.invalidActivateToken'));
}

protected function setupConfig(): void
{
$config = config('Validation');
Expand Down