diff --git a/app/Http/Controllers/Admin/Login.php b/app/Http/Controllers/Admin/Login.php index e2e945e2..f989fa90 100644 --- a/app/Http/Controllers/Admin/Login.php +++ b/app/Http/Controllers/Admin/Login.php @@ -3,13 +3,10 @@ namespace App\Http\Controllers\Admin; use App\Http\Controllers\Controller; -use App\Http\Requests; use App\Http\Requests\LoginRequest; use App\Models\User; -use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Hash; -use Illuminate\Support\Facades\Session; /** * Class Login @@ -45,7 +42,9 @@ class Login extends Controller if (Hash::check($request->password, $user->password)) { Auth::login($user); - return redirect()->intended(route('admin.dashboard')); + $redirect = $request->redirectTo ? $request->redirectTo : route('admin.dashboard'); + + return redirect()->intended($redirect); } // login invalid, redirect and inform the user diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php index 45b3d3d7..7cfbf72b 100644 --- a/app/Http/Middleware/Authenticate.php +++ b/app/Http/Middleware/Authenticate.php @@ -23,7 +23,9 @@ class Authenticate return response('Unauthorized.', 401); } - return redirect()->route('login'); + return redirect() + ->route('login') + ->with('redirectTo', $request->fullUrl()); } return $next($request); diff --git a/resources/views/admin/loginForm.blade.php b/resources/views/admin/loginForm.blade.php index ff38ec8e..f6522331 100644 --- a/resources/views/admin/loginForm.blade.php +++ b/resources/views/admin/loginForm.blade.php @@ -21,6 +21,8 @@
@lang('admin/loginForm.loginToContinue')