Skip to content
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

Jump to bottom

[5.7] Fix verify of current user id on email verification #26528

Merged
merged 6 commits into from Nov 16, 2018
Merged

[5.7] Fix verify of current user id on email verification #26528

Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8f42b81
Add verify of current user id on email verification
Nov 15, 2018
920d6b3
Style fix
Nov 15, 2018
d96d6bd
Style fix
Nov 15, 2018
1fcb3e5
Style fix
Nov 15, 2018
315c291
Fix StyleCI failures
driesvints Nov 16, 2018
a71a3bd
Styling fix
Nov 16, 2018
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
11 changes: 8 additions & 3 deletions src/Illuminate/Foundation/Auth/VerifiesEmails.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

use Illuminate\Http\Request;
use Illuminate\Auth\Events\Verified;
use Illuminate\Auth\Access\AuthorizationException;

trait VerifiesEmails
{
Expand All @@ -25,13 +26,17 @@ public function show(Request $request)
/**
* Mark the authenticated user's email address as verified.
*
* @param \Illuminate\Http\Request $request
* @param \Illuminate\Http\Request $request
This conversation was marked as resolved.
Show resolved Hide resolved
* @return \Illuminate\Http\Response
* @throws AuthorizationException
This conversation was marked as resolved.
Show resolved Hide resolved
*/
public function verify(Request $request)
{
if ($request->route('id') == $request->user()->getKey() &&
$request->user()->markEmailAsVerified()) {
if ($request->route('id') != $request->user()->getKey()) {
throw new AuthorizationException();
}

if ($request->user()->markEmailAsVerified()) {
event(new Verified($request->user()));
}

Expand Down