Allow users to resend the verification mail

Author: josiasmontag

README.md

@@ -14,8 +14,8 @@ The Laravel Email Verification package is built for Laravel 5.4 to easily handle
 - [x] Event based: No need to override your `register()` method.
 - [x] Using the Laravel 5.3 notification system.
 - [x] Allow certain routes for verified users only using the `IsEmailVerified` middleware.
-- [x] Resend the verification email anytime.
-
+- [x] Let the users resend the verification email at anytime.
+- [x] Ready for Localization.
 
 
 ## Configuration
@@ -53,7 +53,7 @@ If this key is not found, the default `App\User` will be used to get the table n
 To customize the migration, publish it with the following command:
 
 ```
-php artisan vendor:publish --provider="Lunaweb\EmailVerification\EmailVerificationServiceProvider" --tag="migrations"
+php artisan vendor:publish --provider="Lunaweb\EmailVerification\Providers\EmailVerificationServiceProvider" --tag="migrations"
 ```
 
 ### User Model
@@ -91,7 +91,8 @@ class RegisterController extends Controller
 
     public function __construct()
     {
-        $this->middleware('guest', ['except' => ['verify']]);
+          $this->middleware('guest', ['except' => ['verify', 'showResendVerificationEmailForm', 'resendVerificationEmail']]);
+          $this->middleware('auth', ['only' => ['showResendVerificationEmailForm', 'resendVerificationEmail']]);
     }
 
     // ...
@@ -102,10 +103,15 @@ class RegisterController extends Controller
 
 There is no need to override `register()`. As default, the package listens for the `Illuminate\Auth\Events\Registered` event and sends the verification mail. You can disable this behavior using the `listen_registered_event` setting.
 
-The package adds one route vor the email verification link. 
+### Routes
+
+The package adds the following routes.
 
 ```php
-Route::get('register/verify', 'App\Http\Controllers\Auth\RegisterController@verify');
+Route::get('register/verify', 'App\Http\Controllers\Auth\RegisterController@verify')->name('verifyEmailLink');
+Route::get('register/verify/resend', 'App\Http\Controllers\Auth\RegisterController@showResendVerificationEmailForm')->name('showResendVerificationEmailForm');
+Route::post('register/verify/resend', 'App\Http\Controllers\Auth\RegisterController@resendVerificationEmail')->name('resendVerificationEmail');
+
 ```
 
 ### Middleware
@@ -133,6 +139,22 @@ The package emits 2 events:
 * ``Lunaweb\EmailVerification\Events\EmailVerificationSent``
 * ``Lunaweb\EmailVerification\Events\UserVerified``
 
+
+
+### Resend the verification mail
+
+Using the `isEmailVerified` Middleware, the following form is shown to the user. It allows the user to correct his email address and resend the verification mail.
+
+![Screenshot](https://user-images.githubusercontent.com/1945577/27735164-7b316630-5d9e-11e7-86f6-8922a2488cfb.png)
+
+You can manually point the user to this form using the `showResendVerificationEmailForm` route (Default: `register/verify/resend`).
+
+To programmatically resend the verification mail:
+```php
+$this->app->make('Lunaweb\EmailVerification\EmailVerification')->sendVerifyLink($user);
+```
+
+
 ### Customize the verification mail
 
 Therefore, override `sendEmailVerificationNotification()` of your User model. Example:
@@ -157,8 +179,14 @@ class User implements CanVerifyEmailContract
 }
 ```
 
-### Resend the verification mail
+### Customize the resend form
+```
+php artisan vendor:publish --provider="Lunaweb\EmailVerification\Providers\EmailVerificationServiceProvider" --tag="views"
+```
+The template can be found in `resources/views/vendor/emailverification/resend.blade.php`
 
-```php
-$this->app->make('Lunaweb\EmailVerification\EmailVerification')->sendVerifyLink($user);
-```
+### Customize the messages / localization
+```
+php artisan vendor:publish --provider="Lunaweb\EmailVerification\Providers\EmailVerificationServiceProvider" --tag="translations"
+```
+The localization files can be found in `resources/lang/vendor/emailverification`

resources/lang/en/messages.php

@@ -10,5 +10,12 @@
     'sent' => 'We have e-mailed your account activation link!',
     'token' => 'This email verification token is invalid.',
     'user' => "We can't find a user with that e-mail address.",
+    'resend' => [
+        'title' => 'Email Verification',
+        'warning' => 'We have sent a verification mail to <strong>:email</strong>. Please activate your account with the link in this mail. If you cannot find the mail, please also check the Junk/Spam folder!',
+        'instructions' => 'If you have not received a verification email or if you have mistyped your email address, you can resend the verification mail.',
+        'email' => 'Email',
+        'submit' => 'Resend'
+    ]
 
 ];

resources/views/resend.blade.php

@@ -0,0 +1,67 @@
+@extends('layouts.app')
+
+@section('content')
+    <div class="container">
+        <div class="row">
+            <div class="col-md-8 col-md-offset-2">
+                <div class="panel panel-default">
+                    <div class="panel-heading">@lang('emailverification::messages.resend.title')</div>
+                    <div class="panel-body">
+
+                        @if($verified)
+                            <div class="alert alert-success">
+                                @lang('emailverification::messages.done')
+                            </div>
+                        @else
+
+                            <form class="form-horizontal" role="form" method="POST"
+                                  action="{{ route('resendVerificationEmail') }}">
+                                {!! csrf_field() !!}
+
+
+                                <div class="alert alert-warning dark">
+                                    @lang('emailverification::messages.resend.warning', ['email' => $email])
+                                </div>
+
+                                <p>
+                                    @lang('emailverification::messages.resend.instructions')
+                                </p>
+
+                                <div class="form-group{{ $errors->has('email') ? ' has-error' : '' }}">
+                                    <label class="col-md-4 control-label">@lang('emailverification::messages.resend.email')</label>
+
+                                    <div class="col-md-6">
+
+                                        <input type="text" class="form-control" name="email"
+                                               value="{{ old('email', $email) }}">
+
+                                        @if ($errors->has('email'))
+                                            <span class="help-block">
+                                        <strong>{{ $errors->first('email') }}</strong>
+                                    </span>
+                                        @endif
+                                    </div>
+                                </div>
+
+
+                                <div class="form-group">
+
+
+                                    <div class="col-md-6 col-md-offset-4">
+                                        <button type="submit" class="btn btn-primary">
+                                            @lang('emailverification::messages.resend.submit')
+                                        </button>
+                                    </div>
+                                </div>
+
+
+                            </form>
+
+
+                        @endif
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+@endsection

src/Http/routes.php

@@ -3,6 +3,8 @@
 
 // Verification
 Route::get('register/verify', 'App\Http\Controllers\Auth\RegisterController@verify')->name('verifyEmailLink');
+Route::get('register/verify/resend', 'App\Http\Controllers\Auth\RegisterController@showResendVerificationEmailForm')->name('showResendVerificationEmailForm');
+Route::post('register/verify/resend', 'App\Http\Controllers\Auth\RegisterController@resendVerificationEmail')->name('resendVerificationEmail');
 
 
 

src/Middleware/IsEmailVerified.php

@@ -26,7 +26,7 @@ class IsEmailVerified
     public function handle($request, Closure $next)
     {
         if( !is_null($request->user()) && !$request->user()->verified){
-            throw new UserNotVerifiedException;
+            return redirect(route('showResendVerificationEmailForm'));
         }
 
         return $next($request);

src/Providers/EmailVerificationServiceProvider.php

@@ -26,6 +26,16 @@ public function boot()
          */
         $this->loadRoutesFrom(__DIR__ . '/../Http/routes.php');
 
+
+        /*
+         * Views
+         */
+        $this->loadViewsFrom(__DIR__ . '/../../resources/views', 'emailverification');
+        $this->publishes([
+            __DIR__ . '/../../resources/views' => resource_path('views/vendor/emailverification'),
+        ], 'views');
+
+
         /*
          * Migrations
          */

src/Traits/VerifiesEmail.php

@@ -8,6 +8,7 @@
 namespace Lunaweb\EmailVerification\Traits;
 
 use Illuminate\Foundation\Auth\RedirectsUsers;
+use Illuminate\Support\Facades\Session;
 use Illuminate\Support\Str;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
@@ -17,8 +18,6 @@ trait VerifiesEmail
 {
 
 
-
-
     /**
      * Verifies the given user's email.
      *
@@ -28,62 +27,68 @@ trait VerifiesEmail
      */
     public function verify(Request $request, EmailVerification $emailVerification)
     {
-        $this->validate($request, $this->rules(), $this->validationErrorMessages());
-        // Here we will attempt to reset the user's password. If it is successful we
-        // will update the password on an actual user model and persist it to the
+        $this->validate($request, [
+            'token' => 'required',
+            'email' => 'required|email',
+            'expiration' => 'required|date_format:U'
+        ], []);
+        // 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.
         $response = $emailVerification->verify(
-            $this->credentials($request), function ($user) {
+            $request->only(
+                'email', 'expiration', 'token'
+            ), function ($user) {
             $this->verifiedEmail($user);
         }
         );
 
 
-        // If the password was successfully reset, we will redirect the user back to
+        // If the user was successfully verified, we will redirect the user back to
         // the application's home authenticated view. If there is an error we can
         // redirect them back to where they came from with their error message.
         return $response == EmailVerification::VERIFIED
             ? $this->sendVerificationResponse($response)
             : $this->sendVerificationFailedResponse($request, $response);
     }
+
+
     /**
-     * Get the password reset validation rules.
-     *
-     * @return array
-     */
-    protected function rules()
-    {
-        return [
-            'token' => 'required',
-            'email' => 'required|email',
-            'expiration' => 'required|date_format:U'
-        ];
-    }
-    /**
-     * Get the password reset validation error messages.
+     * Show form to the user which allows resending the verification mail
      *
-     * @return array
+     * @return \Illuminate\Http\RedirectResponse
      */
-    protected function validationErrorMessages()
+    public function showResendVerificationEmailForm()
     {
-        return [];
+        $user = Auth::user();
+        return view('emailverification::resend', ['verified' => $user->verified, 'email' => $user->email]);
     }
+
     /**
-     * Get the email verification credentials from the request.
+     * Resend the verification mail
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @return array
+     * @param Request $request
+     * @return \Illuminate\Http\RedirectResponse
      */
-    protected function credentials(Request $request)
+    public function resendVerificationEmail(Request $request)
     {
-        return $request->only(
-            'email', 'expiration', 'token'
-        );
+        $this->validate($request, [
+            'email' => 'required|email|max:255'
+        ]);
+        $user = Auth::user();
+        $user->email = $request->email;
+        $user->save();
+
+        $sent = resolve('Lunaweb\EmailVerification\EmailVerification')->sendVerifyLink($user);
+        Session::flash($sent == EmailVerification::VERIFY_LINK_SENT ? 'success' : 'error', trans($sent));
+
+        return redirect($this->redirectPath());
     }
+
     /**
      * Store the user's verification
      *
-     * @param  \Illuminate\Contracts\Auth\CanResetPassword  $user
+     * @param  \Illuminate\Contracts\Auth\CanResetPassword $user
      * @return void
      */
     protected function verifiedEmail($user)
@@ -93,21 +98,23 @@ protected function verifiedEmail($user)
         ])->save();
         $this->guard()->login($user);
     }
+
     /**
-     * Get the response for a successful password reset.
+     * Get the response for a successful user verification.
      *
-     * @param  string  $response
+     * @param  string $response
      * @return \Illuminate\Http\RedirectResponse
      */
     protected function sendVerificationResponse($response)
     {
         return redirect($this->redirectPath())->with('success', trans($response));
     }
+
     /**
-     * Get the response for a failed password reset.
+     * Get the response for a failed user verification.
      *
      * @param  \Illuminate\Http\Request
-     * @param  string  $response
+     * @param  string $response
      * @return \Illuminate\Http\RedirectResponse
      */
     protected function sendVerificationFailedResponse(Request $request, $response)
@@ -116,5 +123,4 @@ protected function sendVerificationFailedResponse(Request $request, $response)
     }
 
 
-
 }