Revert "[8.x] Set intended URL before email verification" (#34817)

GrahamCampbell · taylorotwell · web-flow · commit 8e7277843550 · 2020-10-13T08:24:40.000-05:00
* Revert "Set intended URL before email verification (#34808)" This reverts commit 422b848. * Update EnsureEmailIsVerified.php * Update EnsureEmailIsVerified.php Co-authored-by: Taylor Otwell <taylor@laravel.com>
diff --git a/src/Illuminate/Auth/Middleware/EnsureEmailIsVerified.php b/src/Illuminate/Auth/Middleware/EnsureEmailIsVerified.php
@@ -5,6 +5,7 @@
 use Closure;
 use Illuminate\Contracts\Auth\MustVerifyEmail;
 use Illuminate\Support\Facades\Redirect;
+use Illuminate\Support\Facades\URL;
 
 class EnsureEmailIsVerified
 {
@@ -23,7 +24,7 @@ public function handle($request, Closure $next, $redirectToRoute = null)
             ! $request->user()->hasVerifiedEmail())) {
             return $request->expectsJson()
                     ? abort(403, 'Your email address is not verified.')
-                    : Redirect::guest(route($redirectToRoute ?: 'verification.notice'));
+                    : Redirect::guest(URL::route($redirectToRoute ?: 'verification.notice'));
         }
 
         return $next($request);

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`use Closure;`
`6`	`6`	`use Illuminate\Contracts\Auth\MustVerifyEmail;`
`7`	`7`	`use Illuminate\Support\Facades\Redirect;`
	`8`	`+use Illuminate\Support\Facades\URL;`
`8`	`9`
`9`	`10`	`class EnsureEmailIsVerified`
`10`	`11`	`{`
`@@ -23,7 +24,7 @@ public function handle($request, Closure $next, $redirectToRoute = null)`
`23`	`24`	`! $request->user()->hasVerifiedEmail())) {`
`24`	`25`	`return $request->expectsJson()`
`25`	`26`	`? abort(403, 'Your email address is not verified.')`
`26`		`- : Redirect::guest(route($redirectToRoute ?: 'verification.notice'));`
	`27`	`+ : Redirect::guest(URL::route($redirectToRoute ?: 'verification.notice'));`
`27`	`28`	`}`
`28`	`29`
`29`	`30`	`return $next($request);`