From 8db6764c94b2212c340b64bef4c32177f3a440ac Mon Sep 17 00:00:00 2001
From: Spitfire <itza305@gmail.com>
Date: Fri, 26 Apr 2024 16:57:40 -0600
Subject: [PATCH 1/2] Login form optional password

---
 app/Http/Controllers/Auth/LoginController.php | 13 +++
 resources/views/auth/login.blade.php          | 81 ++++++++++---------
 routes/auth.php                               |  1 +
 3 files changed, 58 insertions(+), 37 deletions(-)

diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index 35e2e9da16..c64551346a 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -50,6 +50,19 @@ public function loginAsUser(Request $request, User $user)
         return redirect()->route('login');
     }
 
+    /**
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function loginAs(Request $request)
+    {
+        if (config('auth.user_list')) {
+            $user = User::where('id', $request->get('user'))->first();
+            Auth::login($user, true);
+            return $this->sendLoginResponse($request);
+        }
+        return redirect()->route('login');
+    }
+
     protected function authenticated(Request $request, $user)
     {
         $response = $this->userAuthService->authenticated($user);
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index afb1ab1b76..1d40f80848 100644
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -21,51 +21,58 @@
                 </li>
             @endforeach
         </ul>
-    @endif
 
 
-    <form method="POST" action="{{ route('login') }}" class="w-full">
-        {{ csrf_field() }}
-        <div class="mb-3 {{ $errors->has('email') ? ' has-error' : '' }}">
-            @if(config('auth.user_list'))
-                <select id="email" name="email" class="rounded border p-2 w-full dark:bg-slate-800 dark:border-slate-500">
-                    @foreach (\App\User::limit(30)->get() as $user)
-                        <option value="{{ $user->email}}">{!! $user->name !!} @if ($user->pledge) ({!! $user->pledge !!}) @endif</option>
-                    @endforeach
-                </select>
-            @else
-                <input id="email" type="email" class="rounded border p-2 w-full dark:bg-slate-800 dark:border-slate-500" name="email" value="{{ old('email') }}" placeholder="{{ __('auth.login.fields.email') }}" required autofocus>
-            @endif
+        <form method="GET" action="{{ route('login-as') }}" class="w-full">
+            {{ csrf_field() }}
+                @if(config('auth.user_list'))
+                    <select id="user" name="user" class="rounded border p-2 w-full dark:bg-slate-800 dark:border-slate-500">
+                        @foreach (\App\User::limit(30)->get() as $user)
+                            <option value="{{ $user->id }}">{!! $user->name !!} @if ($user->pledge) ({!! $user->pledge !!}) @endif</option>
+                        @endforeach
+                    </select>
+                @endif
 
-            @if ($errors->has('email'))
-                <span class="text-red-500">
-                   {{ $errors->first('email') }}
-                </span>
-            @endif
-        </div>
+            <button type="submit" class="w-full rounded border border-blue-500 text-blue-500 uppercase px-6 py-2 transition-all bg-white hover:shadow-xs hover:bg-blue-500 hover:text-white dark:bg-slate-800">
+                {{ __('auth.login.submit') }}
+            </button>
+        </form>
+    @else
+        <form method="POST" action="{{ route('login') }}" class="w-full">
+            {{ csrf_field() }}
+            <div class="mb-3 {{ $errors->has('email') ? ' has-error' : '' }}">
+                <input id="email" type="email" class="rounded border p-2 w-full dark:bg-slate-800 dark:border-slate-500" name="email" value="{{ old('email') }}" placeholder="{{ __('auth.login.fields.email') }}" required autofocus>
 
-        <div class="mb-3 {{ $errors->has('password') ? ' has-error' : '' }}">
-            <div class="flex items-stretch w-full">
-                <input id="password" type="password" class="border rounded w-full p-2 dark:bg-slate-800 dark:border-slate-500" name="password" required placeholder="{{ __('auth.login.fields.password') }}">
-                <a href="#" id="toggle-password" class="input-group-addon p-2" title="{{ __('auth.helpers.password') }}">
-                    <i id="toggle-password-icon" class="fa-solid fa-eye" aria-hidden="true"></i>
-                    <span class="sr-only">{{ __('auth.helpers.password') }}</span>
-                </a>
+                @if ($errors->has('email'))
+                    <span class="text-red-500">
+                    {{ $errors->first('email') }}
+                    </span>
+                @endif
             </div>
 
-            @if ($errors->has('password'))
-                <span class="text-red-500">
-                    {{ $errors->first('password') }}
-                </span>
-            @endif
-        </div>
+            <div class="mb-3 {{ $errors->has('password') ? ' has-error' : '' }}">
+                <div class="flex items-stretch w-full">
+                    <input id="password" type="password" class="border rounded w-full p-2 dark:bg-slate-800 dark:border-slate-500" name="password" required placeholder="{{ __('auth.login.fields.password') }}">
+                    <a href="#" id="toggle-password" class="input-group-addon p-2" title="{{ __('auth.helpers.password') }}">
+                        <i id="toggle-password-icon" class="fa-solid fa-eye" aria-hidden="true"></i>
+                        <span class="sr-only">{{ __('auth.helpers.password') }}</span>
+                    </a>
+                </div>
 
-        <input type="hidden" name="remember" value="1" />
+                @if ($errors->has('password'))
+                    <span class="text-red-500">
+                        {{ $errors->first('password') }}
+                    </span>
+                @endif
+            </div>
+
+            <input type="hidden" name="remember" value="1" />
 
-        <button type="submit" class="w-full rounded border border-blue-500 text-blue-500 uppercase px-6 py-2 transition-all bg-white hover:shadow-xs hover:bg-blue-500 hover:text-white dark:bg-slate-800">
-            {{ __('auth.login.submit') }}
-        </button>
-    </form>
+            <button type="submit" class="w-full rounded border border-blue-500 text-blue-500 uppercase px-6 py-2 transition-all bg-white hover:shadow-xs hover:bg-blue-500 hover:text-white dark:bg-slate-800">
+                {{ __('auth.login.submit') }}
+            </button>
+        </form>
+    @endif
 
 @if(config('auth.register_enabled'))
     <div class="social-auth-links text-center mb-3">
diff --git a/routes/auth.php b/routes/auth.php
index 21507b0792..6d22040c0a 100644
--- a/routes/auth.php
+++ b/routes/auth.php
@@ -9,6 +9,7 @@
 
 Route::post('/logout', [AuthController::class, 'logout'])->name('logout');
 Route::get('/login-as-user/{user}', [LoginController::class, 'loginAsUser'])->name('login-as-user');
+Route::get('/login-as', [LoginController::class, 'loginAs'])->name('login-as');
 
 // OAuth Routes
 Route::get('auth/{provider}', [AuthController::class, 'redirectToProvider'])->name('auth.provider');

From 988704234b44b8d1653467efe8aca2ddc8cfad3a Mon Sep 17 00:00:00 2001
From: Spitfire <itza305@gmail.com>
Date: Mon, 29 Apr 2024 08:32:14 -0600
Subject: [PATCH 2/2] Implemented requested changes

---
 app/Http/Controllers/Auth/LoginController.php | 21 ++++++++++---------
 resources/views/auth/login.blade.php          | 13 +++++-------
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index c64551346a..38fd84ee6d 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -42,12 +42,12 @@ public function __construct(UserAuthenticatedService $userAuthService)
      */
     public function loginAsUser(Request $request, User $user)
     {
-        if (config('auth.user_list')) {
-            Auth::login($user, true);
-
-            return $this->sendLoginResponse($request);
+        if (!config('auth.user_list')) {
+            return redirect()->route('login');
         }
-        return redirect()->route('login');
+
+        Auth::login($user, true);
+        return $this->sendLoginResponse($request);
     }
 
     /**
@@ -55,12 +55,13 @@ public function loginAsUser(Request $request, User $user)
      */
     public function loginAs(Request $request)
     {
-        if (config('auth.user_list')) {
-            $user = User::where('id', $request->get('user'))->first();
-            Auth::login($user, true);
-            return $this->sendLoginResponse($request);
+        if (!config('auth.user_list')) {
+            return redirect()->route('login');
         }
-        return redirect()->route('login');
+
+        $user = User::where('id', $request->get('user'))->first();
+        Auth::login($user, true);
+        return $this->sendLoginResponse($request);
     }
 
     protected function authenticated(Request $request, $user)
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index 1d40f80848..9d66b33ef9 100644
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -22,16 +22,13 @@
             @endforeach
         </ul>
 
-
         <form method="GET" action="{{ route('login-as') }}" class="w-full">
             {{ csrf_field() }}
-                @if(config('auth.user_list'))
-                    <select id="user" name="user" class="rounded border p-2 w-full dark:bg-slate-800 dark:border-slate-500">
-                        @foreach (\App\User::limit(30)->get() as $user)
-                            <option value="{{ $user->id }}">{!! $user->name !!} @if ($user->pledge) ({!! $user->pledge !!}) @endif</option>
-                        @endforeach
-                    </select>
-                @endif
+            <select id="user" name="user" class="rounded border p-2 w-full dark:bg-slate-800 dark:border-slate-500">
+                @foreach (\App\User::limit(30)->get() as $user)
+                    <option value="{{ $user->id }}">{!! $user->name !!} @if ($user->pledge) ({!! $user->pledge !!}) @endif</option>
+                @endforeach
+            </select>
 
             <button type="submit" class="w-full rounded border border-blue-500 text-blue-500 uppercase px-6 py-2 transition-all bg-white hover:shadow-xs hover:bg-blue-500 hover:text-white dark:bg-slate-800">
                 {{ __('auth.login.submit') }}