From 5300c910580bdf054f70886b0d558acda47eb500 Mon Sep 17 00:00:00 2001
From: ro <ro@h-i.works>
Date: Sat, 17 May 2025 08:03:46 -0600
Subject: [PATCH] moved login/logout to dash; removed AuthController

Member authorization got moved to the member repo class a long time ago,
so AuthController was a leftover when that process was handled by
something else

moved dashboard login/logout to DashController and got rid of
AuthController as it's not necessary anymore
---
 app/Http/Controllers/AuthController.php | 50 -------------------
 app/Http/Controllers/DashController.php | 65 +++++++++++++------------
 resources/views/forms/login.blade.php   | 10 ++--
 routes/web.php                          | 16 +++---
 4 files changed, 46 insertions(+), 95 deletions(-)
 delete mode 100644 app/Http/Controllers/AuthController.php

diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php
deleted file mode 100644
index 94771c0..0000000
--- a/app/Http/Controllers/AuthController.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-
-use Symfony\Component\HttpFoundation\Response;
-use App\Interfaces\MemberRepositoryInterface;
-use Illuminate\Http\Request;
-
-class AuthController extends Controller
-{
-    protected $member;
-
-    public function __construct(
-        MemberRepositoryInterface $memberRepository
-    ) {
-        $this->member = $memberRepository;
-    }
-
-    public function enter(Request $request): Response
-    {
-        $token = csrf_token();
-
-        $credentials = $request->validate([
-            'handle'   => ['required'],
-            'password' => ['required'],
-        ]);
-
-        if ($credentials) {
-            $result = $this->member->auth($request);
-            if ($result['status']) {
-                //$request->session()->regenerate();
-                return redirect()->intended('dashboard/start');
-            } else {
-                return back()->withErrors([
-                    'error' => $result['message'],
-                ]);
-            }
-        } else {
-            return back()->withErrors([
-                'error' => 'Nope. Check your crendtials, champ',
-            ]);
-        }
-    }
-
-    public function exit(Request $request): Response
-    {
-        session()->flush();
-        return redirect()->intended('dashboard');
-    }
-}
diff --git a/app/Http/Controllers/DashController.php b/app/Http/Controllers/DashController.php
index 30bcea4..998dd85 100644
--- a/app/Http/Controllers/DashController.php
+++ b/app/Http/Controllers/DashController.php
@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers;
 
+use Symfony\Component\HttpFoundation\Response;
 use App\Interfaces\PageRepositoryInterface;
 use App\Interfaces\MemberRepositoryInterface;
 use App\Services\Assets\FileUploadService;
@@ -29,12 +30,9 @@ class DashController extends Controller
 
     public function start()
     {
-        $result = [];
-
         if ($this->member::status()) {
+            $result = [];
             $result = $this->pages->getGroup(1, 4);
-        }
-        if ($this->member::status()) {
             return view('back.start', [
                 "status" => $this->member::status(),
                 "result" => $result,
@@ -48,9 +46,42 @@ class DashController extends Controller
         }
     }
 
+    public function exit()
+    {
+        session()->flush();
+        return redirect()->intended('dashboard');
+    }
+
     //---
     // POST
     //---
+    public function enter(Request $request): Response
+    {
+        $token = csrf_token();
+
+        $credentials = $request->validate([
+            'handle'   => ['required'],
+            'password' => ['required'],
+        ]);
+
+        if ($credentials) {
+            $result = $this->member->auth($request);
+            if ($result['status']) {
+                //$request->session()->regenerate();
+                return redirect()->intended('dashboard');
+                //return $this->start();
+            } else {
+                return back()->withErrors([
+                    'error' => $result['message'],
+                ]);
+            }
+        } else {
+            return back()->withErrors([
+                'error' => 'Nope. Check your crendtials, champ',
+            ]);
+        }
+    }
+
     public function uploads(Request $request)
     {
         $result = $result = $this->upload->handleFile($request);
@@ -69,30 +100,4 @@ class DashController extends Controller
         }
         return $result;
     }
-
-    //---
-    // PUT
-    //---
-
-    //---
-    // AUTH
-    //---
-
-    public function login()
-    {
-        if ($this->member::status()) {
-            return redirect('dashboard/start');
-        } else {
-            return view('back.login', [
-                "status" => $this->member::status(),
-                "title"  => "Hi!"
-            ]);
-        }
-    }
-
-    public function logout()
-    {
-        session()->flush();
-        return redirect()->intended('dashboard');
-    }
 }
diff --git a/resources/views/forms/login.blade.php b/resources/views/forms/login.blade.php
index 173c7fe..c9336b7 100644
--- a/resources/views/forms/login.blade.php
+++ b/resources/views/forms/login.blade.php
@@ -1,10 +1,10 @@
 <section class="login">
     <div>
-        <img alt="fipamo logo" id="the-logo" class="logo-medium" src="/assets/images/global/fipamo-logo-secondary.svg"/>
+        <img alt="fipamo logo" id="the-logo" class="logo-medium" src="/assets/images/global/fipamo-logo-secondary.svg" />
     </div>
-    <form action="/login" method="post" enctype="multipart/form-data">
-        <label class="inline">handle</label><input class="input-light" type="text" name="handle" class="inline" placeholder="Handle" required/>
-        <label class="inline">password</label><input class="input-light" type="password" name="password" class="inline" placeholder="Password" required/>
+    <form action="/dashboard/login" method="post" enctype="multipart/form-data">
+        <label class="inline">handle</label><input class="input-light" type="text" name="handle" class="inline" placeholder="Handle" required />
+        <label class="inline">password</label><input class="input-light" type="password" name="password" class="inline" placeholder="Password" required />
         @if($errors->any())
             <input type="submit" value="{{$errors->first()}}" name="submit_button">
         @else
@@ -12,4 +12,4 @@
         @endif
         @csrf
     </form>
-</section>
+</section>
\ No newline at end of file
diff --git a/routes/web.php b/routes/web.php
index c6fa6fc..4326e4b 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -1,16 +1,15 @@
 <?php
 
 use Illuminate\Support\Facades\Route;
+use Illuminate\Http\Request;
 use App\Http\Controllers\FrontController;
 use App\Http\Controllers\PageController;
 use App\Http\Controllers\DashController;
 use App\Http\Controllers\SettingsController;
-use App\Http\Controllers\AuthController;
 use App\Http\Controllers\ThemeController;
 use App\Http\Controllers\SystemMailController;
-use App\Http\Middleware\VerifyCsrfToken;
-use Illuminate\Http\Request;
 
+//Frontend
 Route::prefix('/')
     ->controller(FrontController::class)
     ->group(function () {
@@ -18,17 +17,14 @@ Route::prefix('/')
         Route::post("/init/{task}", 'init');
     });
 
-//login stuff
-Route::post("/login", [AuthController::class, 'enter']);
-
 //Dashboard
 Route::prefix('dashboard')
     ->middleware('member.check')
     ->controller(DashController::class)
     ->group(function () {
-        Route::get("/", 'login')->withoutMiddleware('member.check');
-        Route::get("/start", 'start');
-        Route::get("/logout", 'logout');
+        Route::post("/login", 'enter')->withoutMiddleware('member.check');
+        Route::get("/", 'start')->withoutMiddleware('member.check');
+        Route::get("/logout", 'exit');
         Route::post("/uploads", 'uploads');
     })->name('dashboard');
 
@@ -64,7 +60,7 @@ Route::prefix('dashboard/mailer')
         Route::post("/", 'sendNotify');
     });
 
-//themekit
+//Themekit
 Route::prefix('dashboard/themekit')
     ->middleware('member.check')
     ->controller(ThemeController::class)