Request validation + user email check

Author: jrean

src/Exceptions/UserHasNoEmailException.php

@@ -0,0 +1,19 @@
+<?php
+/**
+ * This file is part of Jrean\UserVerification package.
+ *
+ * (c) Jean Ragouin <[email protected]> <www.askjong.com>
+ */
+namespace Jrean\UserVerification\Exceptions;
+
+use Exception;
+
+class UserHasNoEmailException extends Exception
+{
+    /**
+     * The exception description.
+     *
+     * @var string
+     */
+    protected $message = 'The given user instance has an empty or null email field.';
+}

src/Traits/VerifiesUsers.php

@@ -25,7 +25,9 @@ trait VerifiesUsers
      */
     public function getVerification(Request $request, $token)
     {
-        $this->validateRequest($request);
+        if (! $this->validateRequest($request)) {
+            return redirect($this->redirectIfVerificationFails());
+        }
 
         try {
             UserVerificationFacade::process($request->input('email'), $token, $this->userTable());
@@ -54,7 +56,7 @@ public function getVerificationError()
      * Validate the verification link.
      *
      * @param  string  $token
-     * @return Response
+     * @return bool
      */
     protected function validateRequest(Request $request)
     {
@@ -63,7 +65,7 @@ protected function validateRequest(Request $request)
         ]);
 
         if ($validator->fails()) {
-            return redirect($this->redirectIfVerificationFails());
+            return false;
         }
     }
 
@@ -74,7 +76,9 @@ protected function validateRequest(Request $request)
      */
     protected function verificationErrorView()
     {
-        return property_exists($this, 'verificationErrorView') ? $this->verificationErrorView : 'laravel-user-verification::user-verification';
+        return property_exists($this, 'verificationErrorView')
+            ? $this->verificationErrorView
+            : 'laravel-user-verification::user-verification';
     }
 
     /**
@@ -84,7 +88,9 @@ protected function verificationErrorView()
      */
     protected function verificationEmailView()
     {
-        return property_exists($this, 'verificationEmailView') ? $this->verificationEmailView : 'emails.user-verification';
+        return property_exists($this, 'verificationEmailView')
+            ? $this->verificationEmailView
+            : 'emails.user-verification';
     }
 
     /**

src/UserVerification.php

@@ -14,9 +14,10 @@
 use Jrean\UserVerification\Events\UserVerified;
 use Jrean\UserVerification\Events\VerificationEmailSent;
 use Jrean\UserVerification\Exceptions\ModelNotCompliantException;
-use Jrean\UserVerification\Exceptions\UserNotFoundException;
-use Jrean\UserVerification\Exceptions\UserIsVerifiedException;
 use Jrean\UserVerification\Exceptions\TokenMismatchException;
+use Jrean\UserVerification\Exceptions\UserHasNoEmailException;
+use Jrean\UserVerification\Exceptions\UserIsVerifiedException;
+use Jrean\UserVerification\Exceptions\UserNotFoundException;
 
 class UserVerification
 {
@@ -60,9 +61,15 @@ public function __construct(MailerContract $mailer, Builder $schema)
      *
      * @param  \Illuminate\Contracts\Auth\Authenticatable  $user
      * @return bool
+     *
+     * @throws \Jrean\UserVerification\Exceptions\UserHasNoEmailException
      */
     public function generate(AuthenticatableContract $user)
     {
+        if (empty($user->email)) {
+            throw new UserHasNoEmailException();
+        }
+
         return $this->saveToken($user, $this->generateToken());
     }