Fix auth controllers for laravel 11

app/Http/Controllers/Auth/ConfirmPasswordController.php

@@ -2,10 +2,9 @@
 
 namespace App\Http\Controllers\Auth;
 
-use App\Http\Controllers\Controller;
-use App\Providers\RouteServiceProvider;
 use Illuminate\Foundation\Auth\ConfirmsPasswords;
 
+use App\Http\Controllers\Controller;
 class ConfirmPasswordController extends Controller
 {
     /*
@@ -26,7 +25,7 @@ class ConfirmPasswordController extends Controller
      *
      * @var string
      */
-    protected $redirectTo = RouteServiceProvider::HOME;
+    protected $redirectTo = '/';
 
     /**
      * Create a new controller instance.

app/Http/Controllers/Auth/ForgotPasswordController.php

@@ -2,11 +2,12 @@
 
 namespace App\Http\Controllers\Auth;
 
-use App\Http\Controllers\Controller;
 use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Password;
 
+use App\Http\Controllers\Controller;
+
 class ForgotPasswordController extends Controller
 {
     /*

app/Http/Controllers/Auth/LoginController.php

@@ -8,7 +8,6 @@ use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 
 use App\Http\Controllers\Controller;
-use App\Providers\RouteServiceProvider;
 
 class LoginController extends Controller
 {
@@ -30,7 +29,7 @@ class LoginController extends Controller
      *
      * @var string
      */
-    protected $redirectTo = RouteServiceProvider::HOME;
+    protected $redirectTo = '/';
 
     /**
      * Create a new controller instance.
@@ -39,40 +38,41 @@ class LoginController extends Controller
      */
     public function __construct()
     {
-        $this->middleware('guest')
+        $this->middleware('guest')->except('logout');
-			->except('logout');
+        $this->middleware('auth')->only('logout');
     }
 
-	public function login(Request $request)
+    public function login(Request $request)
-	{
+    {
-		$this->validateLogin($request);
+        $this->validateLogin($request);
 
-		if (Auth::attempt(array_merge($this->credentials($request),['active'=>TRUE]),TRUE)) {
+        if (Auth::attempt(array_merge($this->credentials($request),['active'=>TRUE]),TRUE)) {
-			$request->session()->regenerate();
+            $request->session()->regenerate();
 
-			return $this->sendLoginResponse($request);
+            return $this->sendLoginResponse($request);
-		}
+        }
 
-		return $this->sendFailedLoginResponse($request);
+        return $this->sendFailedLoginResponse($request);
-	}
+    }
 
-	protected function authenticated(Request $request, $user)
+    // Record our last logged in time
-	{
+    protected function authenticated(Request $request, $user)
-		$user->last_on = Carbon::now();
+    {
-		$user->save();
+        $user->last_on = Carbon::now();
-	}
+        $user->save();
+    }
 
-	/**
+    /**
-	 * Show our themed login page
+     * Show our themed login page
-	 */
+     */
-	public function showLoginForm()
+    public function showLoginForm()
-	{
+    {
-		$login_note = '';
+        $login_note = '';
 
-		if (file_exists('login_note.txt'))
+        if (file_exists('login_note.txt'))
-			$login_note = file_get_contents('login_note.txt');
+            $login_note = file_get_contents('login_note.txt');
 
-		return view('auth.login')
+        return view('auth.login')
-			->with('login_note',$login_note);
+            ->with('login_note',$login_note);
-	}
+    }
 }

app/Http/Controllers/Auth/RegisterController.php

@@ -7,7 +7,6 @@ use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Validator;
 
 use App\Http\Controllers\Controller;
-use App\Providers\RouteServiceProvider;
 use App\Models\User;
 
 class RegisterController extends Controller
@@ -30,7 +29,7 @@ class RegisterController extends Controller
      *
      * @var string
      */
-    protected $redirectTo = RouteServiceProvider::HOME;
+    protected $redirectTo = '/';
 
     /**
      * Create a new controller instance.

app/Http/Controllers/Auth/ResetPasswordController.php

@@ -2,10 +2,10 @@
 
 namespace App\Http\Controllers\Auth;
 
-use App\Http\Controllers\Controller;
-use App\Providers\RouteServiceProvider;
 use Illuminate\Foundation\Auth\ResetsPasswords;
 
+use App\Http\Controllers\Controller;
+
 class ResetPasswordController extends Controller
 {
     /*
@@ -26,15 +26,5 @@ class ResetPasswordController extends Controller
      *
      * @var string
      */
-    protected $redirectTo = RouteServiceProvider::HOME;
+    protected $redirectTo = '/';
-
-    /**
-     * Create a new controller instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        $this->middleware('guest');
-    }
 }

app/Http/Controllers/Auth/VerificationController.php

@@ -2,10 +2,10 @@
 
 namespace App\Http\Controllers\Auth;
 
-use App\Http\Controllers\Controller;
-use App\Providers\RouteServiceProvider;
 use Illuminate\Foundation\Auth\VerifiesEmails;
 
+use App\Http\Controllers\Controller;
+
 class VerificationController extends Controller
 {
     /*
@@ -26,7 +26,7 @@ class VerificationController extends Controller
      *
      * @var string
      */
-    protected $redirectTo = RouteServiceProvider::HOME;
+    protected $redirectTo = '/';
 
     /**
      * Create a new controller instance.

app/Http/Controllers/Controller.php

@@ -2,12 +2,10 @@
 
 namespace App\Http\Controllers;
 
-use Illuminate\Foundation\Bus\DispatchesJobs;
-use Illuminate\Routing\Controller as BaseController;
-use Illuminate\Foundation\Validation\ValidatesRequests;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
+use Illuminate\Foundation\Validation\ValidatesRequests;
 
-class Controller extends BaseController
+abstract class Controller extends \Illuminate\Routing\Controller
 {
-    use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
+	use AuthorizesRequests,ValidatesRequests;
-}
+}

resources/views/auth/passwords/email.blade.php

@@ -5,7 +5,7 @@
 @endsection
 
 @section('content')
-	@includeWhen(session()->has('success'),'widgets.success-row',['msg'=>session()->get('success')])
+	@includeWhen(session()->has('status'),'widgets.success-row',['msg'=>session()->pull('status')])
 
 	<form class="needs-validation" method="post" action="{{ route('password.email') }}" novalidate>
 		@csrf

resources/views/auth/passwords/reset.blade.php

@@ -5,7 +5,7 @@
 @endsection
 
 @section('content')
-	@includeWhen(session()->has('status') || true,'widgets.success-row',['msg'=>session()->get('status')])
+	@includeWhen(session()->has('status'),'widgets.success-row',['msg'=>session()->pull('status')])
 
 	<form class="needs-validation" method="post" action="{{ route('password.update') }}" novalidate>
 		@csrf