From 2ea2ae0f3ffe43a24fd856ab576a0f4db3a70e03 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Sat, 5 Dec 2015 21:56:17 -0600 Subject: [PATCH] allow guard to be specified on middleaware --- app/Http/Middleware/Authenticate.php | 5 +++-- app/Http/Middleware/RedirectIfAuthenticated.php | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php index ba84ac4c..d670fbfe 100644 --- a/app/Http/Middleware/Authenticate.php +++ b/app/Http/Middleware/Authenticate.php @@ -12,11 +12,12 @@ class Authenticate * * @param \Illuminate\Http\Request $request * @param \Closure $next + * @param string|null $guard * @return mixed */ - public function handle($request, Closure $next) + public function handle($request, Closure $next, $guard = null) { - if (Auth::guest()) { + if (Auth::guard($guard)->guest()) { if ($request->ajax()) { return response('Unauthorized.', 401); } else { diff --git a/app/Http/Middleware/RedirectIfAuthenticated.php b/app/Http/Middleware/RedirectIfAuthenticated.php index 82647d42..e27860e2 100644 --- a/app/Http/Middleware/RedirectIfAuthenticated.php +++ b/app/Http/Middleware/RedirectIfAuthenticated.php @@ -12,11 +12,12 @@ class RedirectIfAuthenticated * * @param \Illuminate\Http\Request $request * @param \Closure $next + * @param string|null $guard * @return mixed */ - public function handle($request, Closure $next) + public function handle($request, Closure $next, $guard = null) { - if (Auth::check()) { + if (Auth::guard($guard)->check()) { return redirect('/'); }