From 449415487924714d71092334fec6b00265f6d7a0 Mon Sep 17 00:00:00 2001
From: Deon George <deon@dege.au>
Date: Mon, 30 Jun 2025 20:35:33 +0800
Subject: [PATCH] Fix regression introduced in 56fcd729. Server was added to
 the configuration before SwapinAuthUser::class resulting in the configured
 LDAP user being used for all queries and not the logged in user. Fixes #348

---
 app/Http/Middleware/ApplicationSession.php | 29 ----------------------
 app/Http/Middleware/SwapinAuthUser.php     |  3 +++
 bootstrap/app.php                          |  3 +--
 3 files changed, 4 insertions(+), 31 deletions(-)
 delete mode 100644 app/Http/Middleware/ApplicationSession.php

diff --git a/app/Http/Middleware/ApplicationSession.php b/app/Http/Middleware/ApplicationSession.php
deleted file mode 100644
index 4b125ddb..00000000
--- a/app/Http/Middleware/ApplicationSession.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-namespace App\Http\Middleware;
-
-use Closure;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Config;
-
-use App\Classes\LDAP\Server;
-
-/**
- * This sets up our application session with any required values, ultimately for cache optimisation reasons
- */
-class ApplicationSession
-{
-	/**
-	 * Handle an incoming request.
-	 *
-	 * @param  Request  $request
-	 * @param  Closure  $next
-	 * @return mixed
-	 */
-	public function handle(Request $request,Closure $next): mixed
-	{
-		Config::set('server',new Server);
-
-		return $next($request);
-	}
-}
\ No newline at end of file
diff --git a/app/Http/Middleware/SwapinAuthUser.php b/app/Http/Middleware/SwapinAuthUser.php
index 1e421dfe..0c4df73d 100644
--- a/app/Http/Middleware/SwapinAuthUser.php
+++ b/app/Http/Middleware/SwapinAuthUser.php
@@ -2,6 +2,7 @@
 
 namespace App\Http\Middleware;
 
+use App\Classes\LDAP\Server;
 use Closure;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Config;
@@ -43,6 +44,8 @@ class SwapinAuthUser
 		$c->setConfiguration(config('ldap.connections.'.$key));
 		$c->setGuardResolver(fn()=>new Guard($c->getLdapConnection(),$c->getConfiguration()));
 
+		Config::set('server',new Server);
+
 		return $next($request);
 	}
 }
\ No newline at end of file
diff --git a/bootstrap/app.php b/bootstrap/app.php
index b99a4c60..6251a058 100644
--- a/bootstrap/app.php
+++ b/bootstrap/app.php
@@ -4,7 +4,7 @@ use Illuminate\Foundation\Application;
 use Illuminate\Foundation\Configuration\Exceptions;
 use Illuminate\Foundation\Configuration\Middleware;
 
-use App\Http\Middleware\{AcceptLanguage,AllowAnonymous,ApplicationSession,CheckUpdate,SwapinAuthUser,ViewVariables};
+use App\Http\Middleware\{AcceptLanguage,AllowAnonymous,CheckUpdate,SwapinAuthUser,ViewVariables};
 
 return Application::configure(basePath: dirname(__DIR__))
 	->withRouting(
@@ -16,7 +16,6 @@ return Application::configure(basePath: dirname(__DIR__))
 		$middleware->appendToGroup(
 			group: 'web',
 			middleware: [
-				ApplicationSession::class,
 				AcceptLanguage::class,
 				AllowAnonymous::class,
 				SwapinAuthUser::class,