Skip to content

forgot password procedure: fix strings (was using forgot username strings) #1186

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
afk11 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

forgot password procedure: fix strings (was using forgot username strings) #1186

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
20 changes: 8 additions & 12 deletions app/Http/Controllers/Auth/ForgotPasswordController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,6 @@
class ForgotPasswordController extends Controller
{

protected $redirectTo = 'auth/login';

/*
|--------------------------------------------------------------------------
| Password Reset Controller
Expand Down Expand Up @@ -99,21 +97,19 @@ public function showLinkRequestForm() : View
/**
* Send a reset link to the given user.
*
* @param Request $r
* @param Request $request
*
* @return RedirectResponse
*
* @throws
*/
public function sendResetLinkEmail( Request $r ): RedirectResponse
public function sendResetLinkEmail( Request $request ): RedirectResponse
{
$this->validate( $r, ['username' => 'required'] );
$this->validate( $request, ['username' => 'required'] );

// We will send the password reset link to this user. Once we have attempted
// to send the link, we will examine the response then see the message we
// need to show to the user. Finally, we'll send out a proper response.
$response = $this->broker()->sendResetLink(
$r->only('username')
$request->only('username')
);

return $response === Password::RESET_LINK_SENT
Expand All @@ -129,8 +125,8 @@ public function sendResetLinkEmail( Request $r ): RedirectResponse
*/
protected function sendResetLinkResponse(): RedirectResponse
{
AlertContainer::push( 'If your email matches user(s) on the system, then an email listing those users has been sent to you.', Alert::INFO );
return redirect( route( 'login@login' ) );
AlertContainer::push( 'If your username exists on the system, then a password reset link has been sent to you.', Alert::INFO );
return redirect( route( 'login@showForm' ) );
}

/**
Expand All @@ -140,8 +136,8 @@ protected function sendResetLinkResponse(): RedirectResponse
*/
protected function sendResetLinkFailedResponse(): RedirectResponse
{
AlertContainer::push( 'If your email matches user(s) on the system, then an email listing those users has been sent to you.', Alert::INFO );
return redirect( route( 'login@login' ) );
AlertContainer::push( 'If your username exists on the system, then a password reset link has been sent to you.', Alert::INFO );
return redirect( route( 'login@showForm' ) );
}

/**
Expand Down
5 changes: 0 additions & 5 deletions psalm-baseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,11 +253,6 @@
<code><![CDATA[User::AUTH_CUSTUSER]]></code>
</RedundantCondition>
</file>
<file src="app/Http/Controllers/Auth/ForgotPasswordController.php">
<MissingDocblockType>
<code><![CDATA[public function sendResetLinkEmail( Request $r ): RedirectResponse]]></code>
</MissingDocblockType>
</file>
<file src="app/Http/Controllers/Auth/LoginController.php">
<MissingDocblockType>
<code><![CDATA[public function peeringdbHandleProviderCallback( Request $r ): RedirectResponse]]></code>
Expand Down
Loading