email verified for new auth is fixed

Author: sarthaksavvy

src/Console/Commands/MakeMultiAuthCommand.php

@@ -51,16 +51,16 @@ public function handle()
             return;
         }
         $this->addGuard()
-             ->publishControllers()
-             ->publishRoutes()
-             ->registerRoutes()
-             ->loadViews()
-             ->publishFactory()
-             ->publishMigration()
-             ->publishModel()
-             ->publishMiddleware()
-             ->registerMiddleware()
-             ->publishNotification();
+            ->publishControllers()
+            ->publishRoutes()
+            ->registerRoutes()
+            ->loadViews()
+            ->publishFactory()
+            ->publishMigration()
+            ->publishModel()
+            ->publishMiddleware()
+            ->registerMiddleware()
+            ->publishNotification();
     }
 
     protected function addGuard()
@@ -210,6 +210,7 @@ protected function loadViews()
             'layouts/app.blade',
             'auth/login.blade',
             'auth/register.blade',
+            'auth/verify.blade',
             'auth/passwords/email.blade',
             'auth/passwords/reset.blade',
         ];
@@ -285,6 +286,15 @@ protected function publishMiddleware()
         $middleware = strtr($stub, $this->parseName());
 
         file_put_contents($middleware_path . '/RedirectIfNot' . $this->parseName()['{{singularClass}}'] . '.php', $middleware);
+
+        // ...
+
+        $stub = file_get_contents($this->stub_path . '/Middleware/EnsureEmailIsVerified.stub');
+
+        $middleware = strtr($stub, $this->parseName());
+
+        file_put_contents($middleware_path . '/EnsureEmailIsVerifiedOf' . $this->parseName()['{{singularClass}}'] . '.php', $middleware);
+
         $this->info("Step 9. Middlewares related to {$this->name} is added App\Http\Middleware directory \n");
 
         return $this;

src/Console/Commands/RollbackMultiAuthCommand.php

@@ -56,16 +56,16 @@ protected function rollback()
             return;
         }
         $this->unPublishGuard()
-             ->rollbackControllers()
-             ->rollbackRoutes()
-             ->unRegisterRoutes()
-             ->rollbackViews()
-             ->removeFactory()
-             ->removeMigration()
-             ->removeModel()
-             ->removeMiddleware()
-             ->unRegisterMiddleware()
-             ->removeNotification();
+            ->rollbackControllers()
+            ->rollbackRoutes()
+            ->unRegisterRoutes()
+            ->rollbackViews()
+            ->removeFactory()
+            ->removeMigration()
+            ->removeModel()
+            ->removeMiddleware()
+            ->unRegisterMiddleware()
+            ->removeNotification();
     }
 
     protected function unPublishGuard()
@@ -191,6 +191,7 @@ protected function removeMiddleware()
         $path  = app_path('Http/Middleware');
         unlink("{$path}/RedirectIf{$guard}.php");
         unlink("{$path}/RedirectIfNot{$guard}.php");
+        unlink("{$path}/EnsureEmailIsVerifiedOf{$guard}.php");
         $this->error("Step 9. Middlewares related to {$this->name} is removed from App\Http\Middleware directory \n");
 
         return $this;

src/Http/Middleware/EnsureStudentEmailIsVerified.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace Bitfumes\Multiauth\Http\Middleware;
+
+use Closure;
+use Illuminate\Contracts\Auth\MustVerifyEmail;
+use Illuminate\Support\Facades\Redirect;
+
+class EnsureStudentEmailIsVerified
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure  $next
+     * @param  string|null  $redirectToRoute
+     * @return \Illuminate\Http\Response|\Illuminate\Http\RedirectResponse
+     */
+    public function handle($request, Closure $next, $redirectToRoute = null)
+    {
+        if (
+            !$request->user('student') ||
+            ($request->user('student') instanceof MustVerifyEmail &&
+                !$request->user('student')->hasVerifiedEmail())
+        ) {
+            return $request->expectsJson()
+                ? abort(403, 'Your email address is not verified.')
+                : Redirect::route($redirectToRoute ?: 'student.verification.notice');
+        }
+
+        return $next($request);
+    }
+}

stubs/Controllers/Auth/VerificationController.stub

@@ -4,6 +4,7 @@ namespace {{namespace}}\Http\Controllers\{{singularClass}}\Auth;
 
 use {{namespace}}\Http\Controllers\Controller;
 use Illuminate\Foundation\Auth\VerifiesEmails;
+use Illuminate\Http\Request;
 
 class VerificationController extends Controller
 {
@@ -34,8 +35,16 @@ class VerificationController extends Controller
      */
     public function __construct()
     {
+        $this->middleware('{{singularSnake}}.auth');
         $this->middleware('auth:{{singularSnake}}');
         $this->middleware('signed')->only('verify');
         $this->middleware('throttle:6,1')->only('verify', 'resend');
     }
+
+    public function show(Request $request)
+    {
+        return $request->user()->hasVerifiedEmail()
+            ? redirect($this->redirectPath())
+            : view('{{singularSnake}}.auth.verify');
+    }
 }

stubs/Middleware/EnsureEmailIsVerified.stub

@@ -0,0 +1,33 @@
+<?php
+
+namespace {{namespace}}\Http\Middleware;
+
+use Closure;
+use Illuminate\Contracts\Auth\MustVerifyEmail;
+use Illuminate\Support\Facades\Redirect;
+
+class EnsureEmailIsVerifiedOf{{singularClass}}
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure  $next
+     * @param  string|null  $redirectToRoute
+     * @return \Illuminate\Http\Response|\Illuminate\Http\RedirectResponse
+     */
+    public function handle($request, Closure $next, $redirectToRoute = null)
+    {
+        if (
+            !$request->user('{{singularSlug}}') ||
+            ($request->user('{{singularSlug}}') instanceof MustVerifyEmail &&
+                !$request->user('{{singularSlug}}')->hasVerifiedEmail())
+        ) {
+            return $request->expectsJson()
+                ? abort(403, 'Your email address is not verified.')
+                : Redirect::route($redirectToRoute ?: '{{singularSlug}}.verification.notice');
+        }
+
+        return $next($request);
+    }
+}

stubs/Middleware/Kernel.stub

@@ -1,3 +1,4 @@
 
         '{{singularSnake}}.auth' => \App\Http\Middleware\RedirectIfNot{{singularClass}}::class,
-        '{{singularSnake}}.guest' => \App\Http\Middleware\RedirectIf{{singularClass}}::class,
+        '{{singularSnake}}.guest' => \App\Http\Middleware\RedirectIf{{singularClass}}::class,
+        '{{singularSnake}}.verified' => \App\Http\Middleware\EnsureEmailIsVerifiedOf{{singularClass}}::class,

stubs/Notifications/VerifyEmail.stub

@@ -37,18 +37,17 @@ class {{singularClass}}VerifyEmail extends Notification
      */
     public function toMail($notifiable)
     {
+        $verificationUrl = $this->verificationUrl($notifiable);
+
         if (static::$toMailCallback) {
-            return call_user_func(static::$toMailCallback, $notifiable);
+            return call_user_func(static::$toMailCallback, $notifiable, $verificationUrl);
         }
 
         return (new MailMessage)
-            ->subject(Lang::getFromJson('Verify Email Address'))
-            ->line(Lang::getFromJson('Please click the button below to verify your email address.'))
-            ->action(
-                Lang::getFromJson('Verify Email Address'),
-                $this->verificationUrl($notifiable)
-            )
-            ->line(Lang::getFromJson('If you did not create an account, no further action is required.'));
+            ->subject(Lang::get('Verify Email Address'))
+            ->line(Lang::get('Please click the button below to verify your email address.'))
+            ->action(Lang::get('Verify Email Address'), $verificationUrl)
+            ->line(Lang::get('If you did not create an account, no further action is required.'));
     }
 
     /**
@@ -62,7 +61,10 @@ class {{singularClass}}VerifyEmail extends Notification
         return URL::temporarySignedRoute(
             '{{singularSnake}}.verification.verify',
             Carbon::now()->addMinutes(Config::get('auth.verification.expire', 60)),
-            ['id' => $notifiable->getKey()]
+            [
+                'id' => $notifiable->getKey(),
+                'hash' => sha1($notifiable->getEmailForVerification()),
+            ]
         );
     }
 

stubs/routes/routes.stub

@@ -21,6 +21,5 @@ Route::group(['namespace' => '{{singularClass}}'], function() {
     // Must verify email
     Route::get('email/resend','Auth\VerificationController@resend')->name('{{singularSlug}}.verification.resend');
     Route::get('email/verify','Auth\VerificationController@show')->name('{{singularSlug}}.verification.notice');
-    Route::get('email/verify/{id}','Auth\VerificationController@verify')->name('{{singularSlug}}.verification.verify');
-
+    Route::get('email/verify/{id}/{hash}','Auth\VerificationController@verify')->name('{{singularSlug}}.verification.verify');
 });

stubs/views/auth/verify.blade.stub

@@ -15,7 +15,7 @@
                     @endif
 
                     {{ __('Before proceeding, please check your email for a verification link.') }}
-                    {{ __('If you did not receive the email') }}, <a href="{{ route('verification.resend') }}">{{ __('click here to request another') }}</a>.
+                    {{ __('If you did not receive the email') }}, <a href="{{ route('{{singularSlug}}.verification.resend') }}">{{ __('click here to request another') }}</a>.
                 </div>
             </div>
         </div>