Skip to content

Commit 6fbd1c3

Browse files
authored
separate the validate function from verify function
#13
1 parent cd76f2f commit 6fbd1c3

File tree

1 file changed

+19
-6
lines changed

1 file changed

+19
-6
lines changed

src/Traits/VerifiesEmail.php

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,34 @@
1717
trait VerifiesEmail
1818
{
1919

20-
2120
/**
22-
* Verifies the given user's email.
21+
* Validate the request params
2322
*
2423
* @param \Illuminate\Http\Request|Request $request
25-
* @param EmailVerification $emailVerification
26-
* @return \Illuminate\Http\RedirectResponse
24+
* @return void
2725
*/
28-
public function verify(Request $request, EmailVerification $emailVerification)
26+
public function validateVerificationRequest(Request $request)
2927
{
3028
$this->validate($request, [
3129
'token' => 'required',
3230
'email' => 'required|email',
3331
'expiration' => 'required|date_format:U'
3432
], []);
33+
34+
);
35+
36+
37+
/**
38+
* Verifies the given user's email.
39+
*
40+
* @param \Illuminate\Http\Request|Request $request
41+
* @param EmailVerification $emailVerification
42+
* @return \Illuminate\Http\RedirectResponse
43+
*/
44+
public function verify(Request $request, EmailVerification $emailVerification)
45+
{
46+
$this->validateVerificationRequest($request);
47+
3548
// Here we will attempt to verify the user. If it is successful we
3649
// will update the verified on an actual user model and persist it to the
3750
// database. Otherwise we will parse the error and return the response.
@@ -130,4 +143,4 @@ protected function sendVerificationFailedResponse(Request $request, $response)
130143
}
131144

132145

133-
}
146+
}

0 commit comments

Comments
 (0)