Merge pull request #14 from Yahav/patch-1

separate the validate function from verify function

Author: josiasmontag

src/Traits/VerifiesEmail.php

@@ -17,21 +17,33 @@
 trait VerifiesEmail
 {
 
-
     /**
-     * Verifies the given user's email.
+     * Validate the request params
      *
      * @param \Illuminate\Http\Request|Request $request
-     * @param EmailVerification $emailVerification
-     * @return \Illuminate\Http\RedirectResponse
+     * @return void
      */
-    public function verify(Request $request, EmailVerification $emailVerification)
+    protected function validateVerificationRequest(Request $request)
     {
         $this->validate($request, [
             'token' => 'required',
             'email' => 'required|email',
             'expiration' => 'required|date_format:U'
         ], []);
+        
+    }
+
+    /**
+     * Verifies the given user's email.
+     *
+     * @param \Illuminate\Http\Request|Request $request
+     * @param EmailVerification $emailVerification
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function verify(Request $request, EmailVerification $emailVerification)
+    {
+        $this->validateVerificationRequest($request);
+        
         // Here we will attempt to verify the user. If it is successful we
         // will update the verified on an actual user model and persist it to the
         // database. Otherwise we will parse the error and return the response.
@@ -130,4 +142,4 @@ protected function sendVerificationFailedResponse(Request $request, $response)
     }
 
 
-}
+}