Hotfix: Fix Authentication

eurofurence · Sep 8, 2024 · ff8a775 · ff8a775
1 parent 11fbb84
commit ff8a775
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 7 deletions.
diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php
@@ -77,7 +77,7 @@ public function loginCallback()
         );
 
         Auth::login($user);
-        return redirect()->route('pos.dashboard');
+        return redirect()->route('dashboard');
     }
 
     public function logout()

diff --git a/app/Http/Controllers/POS/Auth/MachineLoginController.php b/app/Http/Controllers/POS/Auth/MachineLoginController.php
@@ -19,6 +19,6 @@ public function __invoke(Request $request)
         $machine = Machine::findOrFail($data['machine_id']);
         Auth::guard('machine')->login($machine, true);
 
-        return Redirect::route('pos.auth.user.login');
+        return Redirect::route('pos.auth.user.select');
     }
 }
diff --git a/app/Http/Controllers/POS/DashboardController.php b/app/Http/Controllers/POS/DashboardController.php
@@ -11,8 +11,6 @@ class DashboardController extends Controller
 {
     public function __invoke()
     {
-        print_r(Auth::guard('machine-user')->user()); // returns App\Models\User
-
         return Inertia::render('POS/Dashboard');
     }
 }
diff --git a/bootstrap/app.php b/bootstrap/app.php
@@ -16,10 +16,9 @@
                 ->name('fcea.')
                 ->middleware('web')
                 ->group(base_path('routes/fcea.php'));
-            \Illuminate\Support\Facades\Route::middleware(['auth:machine','auth:machine-user'])
+            \Illuminate\Support\Facades\Route::middleware(['auth:machine','auth:machine-user','web'])
                 ->prefix('pos/')
                 ->name('pos.')
-                ->middleware('web')
                 ->group(base_path('routes/pos.php'));
             \Illuminate\Support\Facades\Route::prefix('pos/auth/')
                 ->name('pos.auth.')

diff --git a/routes/pos.php b/routes/pos.php
@@ -11,5 +11,4 @@
     Route::get('/lookup', [\App\Http\Controllers\POS\AttendeeController::class, 'lookupForm'])->name('lookup');
     Route::post('/lookup', [\App\Http\Controllers\POS\AttendeeController::class, 'lookupSubmit'])->name('lookup.submit');
     Route::get('/show/{attendeeId}', [\App\Http\Controllers\POS\AttendeeController::class, 'attendeeShow'])->name('show');
-
 });