Work on email verification

Author: driesvints

app/Http/Controllers/Articles/ArticlesController.php

@@ -4,22 +4,22 @@
 
 use App\Http\Controllers\Controller;
 use App\Http\Middleware\Authenticate;
-use App\Http\Middleware\RedirectIfUnconfirmed;
 use App\Http\Requests\ArticleRequest;
 use App\Jobs\CreateArticle;
 use App\Jobs\DeleteArticle;
 use App\Jobs\UpdateArticle;
 use App\Models\Article;
 use App\Models\Tag;
 use App\Policies\ArticlePolicy;
+use Illuminate\Auth\Middleware\EnsureEmailIsVerified;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 
 class ArticlesController extends Controller
 {
     public function __construct()
     {
-        $this->middleware([Authenticate::class, RedirectIfUnconfirmed::class], ['except' => ['index', 'show']]);
+        $this->middleware([Authenticate::class, EnsureEmailIsVerified::class], ['except' => ['index', 'show']]);
     }
 
     public function index()

app/Http/Controllers/Articles/AuthoredArticles.php

@@ -4,14 +4,14 @@
 
 use App\Http\Controllers\Controller;
 use App\Http\Middleware\Authenticate;
-use App\Http\Middleware\RedirectIfUnconfirmed;
+use Illuminate\Auth\Middleware\EnsureEmailIsVerified;
 use Illuminate\Http\Request;
 
 class AuthoredArticles extends Controller
 {
     public function __construct()
     {
-        $this->middleware([Authenticate::class, RedirectIfUnconfirmed::class]);
+        $this->middleware([Authenticate::class, EnsureEmailIsVerified::class]);
     }
 
     public function __invoke(Request $request)

app/Http/Controllers/Articles/AuthoredSeries.php

@@ -4,14 +4,14 @@
 
 use App\Http\Controllers\Controller;
 use App\Http\Middleware\Authenticate;
-use App\Http\Middleware\RedirectIfUnconfirmed;
+use Illuminate\Auth\Middleware\EnsureEmailIsVerified;
 use Illuminate\Http\Request;
 
 class AuthoredSeries extends Controller
 {
     public function __construct()
     {
-        $this->middleware([Authenticate::class, RedirectIfUnconfirmed::class]);
+        $this->middleware([Authenticate::class, EnsureEmailIsVerified::class]);
     }
 
     public function __invoke(Request $request)

app/Http/Controllers/Articles/SeriesController.php

@@ -4,20 +4,20 @@
 
 use App\Http\Controllers\Controller;
 use App\Http\Middleware\Authenticate;
-use App\Http\Middleware\RedirectIfUnconfirmed;
 use App\Http\Requests\SeriesRequest;
 use App\Jobs\CreateSeries;
 use App\Jobs\DeleteSeries;
 use App\Jobs\UpdateSeries;
 use App\Models\Series;
 use App\Models\Tag;
 use App\Policies\SeriesPolicy;
+use Illuminate\Auth\Middleware\EnsureEmailIsVerified;
 
 class SeriesController extends Controller
 {
     public function __construct()
     {
-        $this->middleware([Authenticate::class, RedirectIfUnconfirmed::class], ['except' => ['index']]);
+        $this->middleware([Authenticate::class, EnsureEmailIsVerified::class], ['except' => ['index']]);
     }
 
     public function create()

app/Http/Controllers/Auth/EmailConfirmationController.php

@@ -4,6 +4,7 @@
 
 use App\Http\Controllers\Controller;
 use App\Http\Middleware\RedirectIfAuthenticated;
+use App\Providers\RouteServiceProvider;
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
 
 class LoginController extends Controller
@@ -26,7 +27,7 @@ class LoginController extends Controller
      *
      * @var string
      */
-    protected $redirectTo = '/dashboard';
+    protected $redirectTo = RouteServiceProvider::HOME;
 
     /**
      * Create a new controller instance.

app/Http/Controllers/Auth/LoginController.php

@@ -6,6 +6,7 @@
 use App\Http\Middleware\RedirectIfAuthenticated;
 use App\Http\Requests\RegisterRequest;
 use App\Jobs\RegisterUser;
+use App\Providers\RouteServiceProvider;
 use App\User;
 use Illuminate\Auth\Events\Registered;
 use Illuminate\Contracts\Validation\Validator as ValidatorContract;
@@ -32,7 +33,7 @@ class RegisterController extends Controller
      *
      * @var string
      */
-    protected $redirectTo = '/dashboard';
+    protected $redirectTo = RouteServiceProvider::HOME;
 
     /**
      * Create a new controller instance.

app/Http/Controllers/Auth/RegisterController.php

@@ -4,6 +4,7 @@
 
 use App\Http\Controllers\Controller;
 use App\Http\Middleware\RedirectIfAuthenticated;
+use App\Providers\RouteServiceProvider;
 use Illuminate\Foundation\Auth\ResetsPasswords;
 
 class ResetPasswordController extends Controller
@@ -26,7 +27,7 @@ class ResetPasswordController extends Controller
      *
      * @var string
      */
-    protected $redirectTo = '/dashboard';
+    protected $redirectTo = RouteServiceProvider::HOME;
 
     /**
      * Create a new controller instance.

app/Http/Controllers/Auth/ResetPasswordController.php

@@ -3,12 +3,9 @@
 namespace App\Http\Controllers\Auth;
 
 use App\Http\Controllers\Controller;
-use Illuminate\Auth\Access\AuthorizationException;
-use Illuminate\Auth\Events\Verified;
+use App\Providers\RouteServiceProvider;
 use Illuminate\Foundation\Auth\VerifiesEmails;
 use Illuminate\Http\Request;
-use Illuminate\Http\Response;
-use Illuminate\Support\Facades\Auth;
 
 class VerificationController extends Controller
 {
@@ -19,89 +16,59 @@ class VerificationController extends Controller
     |
     | This controller is responsible for handling email verification for any
     | user that recently registered with the application. Emails may also
-    | be resent if the user did not receive the original email message.
+    | be re-sent if the user didn't receive the original email message.
     |
     */
 
-    use VerifiesEmails;
+    use VerifiesEmails {
+        resend as traitResend;
+        verify as traitVerify;
+    }
 
     /**
      * Where to redirect users after verification.
      *
      * @var string
      */
-    protected $redirectTo = '/dashboard';
+    protected $redirectTo = RouteServiceProvider::HOME;
 
     /**
-     * Mark the authenticated user's email address as verified.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
+     * Create a new controller instance.
      *
-     * @throws \Illuminate\Auth\Access\AuthorizationException
+     * @return void
      */
-    public function verify(Request $request)
+    public function __construct()
     {
-        if (! hash_equals((string) $request->route('id'), (string) $request->user()->getKey())) {
-            throw new AuthorizationException();
-        }
-
-        if (! hash_equals((string) $request->hash, sha1($request->user()->emailAddress()))) {
-            throw new AuthorizationException();
-        }
+        $this->middleware('auth');
+        $this->middleware('signed')->only('verify');
+        $this->middleware('throttle:6,1')->only('verify', 'resend');
+    }
 
-        if ($request->user()->hasVerifiedEmail()) {
-            $this->error('auth.confirmation.no_match');
-            return $request->wantsJson()
-                ? new Response('', 204)
-                : redirect($this->redirectPath());
-        }
+    public function verify(Request $request)
+    {
+        /** @var \Illuminate\Http\RedirectResponse $response */
+        $response = $this->traitVerify($request);
 
-        if ($request->user()->markEmailAsVerified()) {
-            event(new Verified($request->user()));
+        if ($response->getSession()->has('verified')) {
+            $this->success('auth.verification.success');
+        } else {
+            $this->error('auth.verification.no_match');
         }
 
-        $this->success('auth.confirmation.success');
-
-        return $request->wantsJson()
-            ? new Response('', 204)
-            : redirect($this->redirectPath())->with('verified', true);
+        return $response;
     }
 
-    /**
-     * Resend the email verification notification.
-     *
-     * @param  \Illuminate\Http\Request $request
-     * @return \Illuminate\Http\Response
-     */
     public function resend(Request $request)
     {
-        if ($request->user()->hasVerifiedEmail()) {
-            $this->error('auth.confirmation.already_confirmed');
+        /** @var \Illuminate\Http\RedirectResponse $response */
+        $response = $this->traitResend($request);
 
-            return $request->wantsJson()
-                ? new Response('', 204)
-                : redirect($this->redirectPath());
+        if ($response->getSession()->has('resent')) {
+            $this->success('auth.verification.sent', $request->user()->emailAddress());
+        } else {
+            $this->error('auth.verification.already_verified');
         }
 
-        $request->user()->sendEmailVerificationNotification();
-
-        $this->success('auth.confirmation.sent', Auth::user()->emailAddress());
-
-        return $request->wantsJson()
-            ? new Response('', 202)
-            : redirect()->route('dashboard')->with('resent', true);
-    }
-
-    /**
-     * Create a new controller instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        $this->middleware('auth');
-        $this->middleware('signed')->only('verify');
-        $this->middleware('throttle:6,1')->only('verify', 'resend');
+        return $response;
     }
 }

app/Http/Controllers/Auth/VerificationController.php

@@ -3,7 +3,6 @@
 namespace App\Http\Controllers\Forum;
 
 use App\Http\Controllers\Controller;
-use App\Http\Middleware\RedirectIfUnconfirmed;
 use App\Http\Requests\ThreadRequest;
 use App\Jobs\CreateThread;
 use App\Jobs\DeleteThread;
@@ -18,13 +17,14 @@
 use App\Policies\ThreadPolicy;
 use App\Queries\SearchThreads;
 use Illuminate\Auth\Middleware\Authenticate;
+use Illuminate\Auth\Middleware\EnsureEmailIsVerified;
 use Illuminate\Http\Request;
 
 class ThreadsController extends Controller
 {
     public function __construct()
     {
-        $this->middleware([Authenticate::class, RedirectIfUnconfirmed::class], ['except' => ['overview', 'show']]);
+        $this->middleware([Authenticate::class, EnsureEmailIsVerified::class], ['except' => ['overview', 'show']]);
     }
 
     public function overview()