Refactor + simpler token verification process

Author: jrean

README.md

@@ -117,14 +117,14 @@ resources/views/emails/user-verification.blade.php. The view will receive the
 token. Here is an sample e-mail view to get you started:
 
 ```
-Click here to verify your account {{ url('auth/verification/' . $user->verification_token) }}
+Click here to verify your account: <a href="{{ $link = url('verification', $user->verification_token) . '?email=' . urlencode($user->email) }}"> {{ $link }}</a>
 ```
 
 ## Usage
 
 ### API
 
-The package public API offers four (4) methods.
+The package public API offers three (3) methods.
 
 * `generate(AuthenticatableContract $user)`
 
@@ -138,14 +138,10 @@ Send by email a link containing the verification token.
 
 Process the token verification for the given user.
 
-* `isVerified(AuthenticatableContract $user)`
-
-Check if the given user is verified.
-
 ### Facade
 
 The package offers a facade callable with `UserVerification::`. You can use it
-over the four (4) previous listed public methods.
+over the three (3) previous listed public methods.
 
 ### Trait
 
@@ -156,7 +152,7 @@ The package also offers a trait for a quick implementation.
 The two following methods are endpoints you can join by defining the proper
 route(s) of your choice.
 
-* `getVerification($token)`
+* `getVerification(Request $request, $token)`
 
 Handle the user verification. It requires a string parameter representing the
 verification token to verify.
@@ -281,14 +277,10 @@ Edit the `app\Http\Controller\Auth\AuthController.php` file.
 
 Edit the `app\Http\routes.php` file.
 
-- Define two new routes
+- Define two new routes. Routes are customizable.
+Don't forget to update the previous listed redirect attributes.
 
 ```
-    Route::get('auth/verification/error', 'Auth\AuthController@getVerificationError');
-    Route::get('auth/verification/{token}', 'Auth\AuthController@getVerification');
-
-    or
-
     Route::get('verification/error', 'Auth\AuthController@getVerificationError');
     Route::get('verification/{token}', 'Auth\AuthController@getVerification');
 ```

src/Exceptions/TokenMismatchException.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace Jrean\UserVerification\Exceptions;
+
+use Exception;
+
+class TokenMismatchException extends Exception
+{
+    /**
+     * The exception description.
+     *
+     * @var string
+     */
+    protected $message = 'Wrong verification token.';
+}

src/Exceptions/UserIsVerifiedException.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace Jrean\UserVerification\Exceptions;
+
+use Exception;
+
+class UserIsVerifiedException extends Exception
+{
+    /**
+     * The exception description.
+     *
+     * @var string
+     */
+    protected $message = 'This user is already verified.';
+}

src/Traits/RedirectsUsers.php

@@ -41,6 +41,6 @@ public function redirectAfterVerification()
      */
     public function redirectIfVerificationFails()
     {
-        return property_exists($this, 'redirectIfVerificationFails') ? $this->redirectIfVerificationFails : '/auth/verification/error';
+        return property_exists($this, 'redirectIfVerificationFails') ? $this->redirectIfVerificationFails : '/verification/error';
     }
 }

src/Traits/VerifiesUsers.php

@@ -2,7 +2,11 @@
 
 namespace Jrean\UserVerification\Traits;
 
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Validator;
 use Jrean\UserVerification\Facades\UserVerification;
+use Jrean\UserVerification\Exceptions\UserNotFoundException;
+use Jrean\UserVerification\Exceptions\UserIsVerifiedException;
 
 trait VerifiesUsers
 {
@@ -14,16 +18,16 @@ trait VerifiesUsers
      * @param  string  $token
      * @return Response
      */
-    public function getVerification($token)
+    public function getVerification(Request $request, $token)
     {
-        $user = UserVerification::getUser($token, $this->userTable());
+        $this->validateRequest($request);
 
-        if (UserVerification::isVerified($user)) {
-            return redirect($this->redirectIfVerified());
-        }
-
-        if (! UserVerification::process($user, $token)) {
+        try {
+            UserVerification::process($request->input('email'), $token, $this->userTable());
+        } catch (UserNotFoundException $e) {
             return redirect($this->redirectIfVerificationFails());
+        } catch (UserIsVerifiedException $e) {
+            return redirect($this->redirectIfVerified());
         }
 
         return redirect($this->redirectAfterVerification());
@@ -39,12 +43,29 @@ public function getVerificationError()
         return view($this->verificationErrorView());
     }
 
+    /**
+     * Validate the verification link.
+     *
+     * @param  string  $token
+     * @return Response
+     */
+    protected function validateRequest(Request $request)
+    {
+        $validator = Validator::make($request->all(), [
+            'email' => 'required|email'
+        ]);
+
+        if ($validator->fails()) {
+            return redirect($this->redirectIfVerificationFails());
+        }
+    }
+
     /**
      * Get the verification error view name.
      *
      * @return string
      */
-    public function verificationErrorView()
+    protected function verificationErrorView()
     {
         return property_exists($this, 'verificationErrorView') ? $this->verificationErrorView : 'errors.user-verification';
     }
@@ -54,7 +75,7 @@ public function verificationErrorView()
      *
      * @return string
      */
-    public function userTable()
+    protected function userTable()
     {
         return property_exists($this, 'userTable') ? $this->userTable : 'users';
     }