From 35596ec86746d68f7d44102e34e557d58d69bd8e Mon Sep 17 00:00:00 2001
From: Deon George <deon@dege.au>
Date: Thu, 2 Mar 2023 12:15:08 +1100
Subject: [PATCH] Rename GuestUser to ApplicationSession as middleware to hold
 any site wide variables

---
 app/Http/Controllers/APIController.php     |  2 +-
 app/Http/Controllers/HomeController.php    |  6 ++---
 app/Http/Kernel.php                        |  7 +++---
 app/Http/Middleware/ApplicationSession.php | 29 ++++++++++++++++++++++
 app/Http/Middleware/GuestUser.php          | 27 --------------------
 5 files changed, 36 insertions(+), 35 deletions(-)
 create mode 100644 app/Http/Middleware/ApplicationSession.php
 delete mode 100644 app/Http/Middleware/GuestUser.php

diff --git a/app/Http/Controllers/APIController.php b/app/Http/Controllers/APIController.php
index 260bd25..1ce3271 100644
--- a/app/Http/Controllers/APIController.php
+++ b/app/Http/Controllers/APIController.php
@@ -22,7 +22,7 @@ class APIController extends Controller
 		$dn = Crypt::decryptString($request->query('key'));
 		Log::debug(sprintf('%s: Query [%s] - Levels [%d]',__METHOD__,$dn,$levels));
 
-		return (new Server())
+		return (config('server'))
 			->children($dn)
 			->transform(function($item) {
 				return [
diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index d1086e5..4ecc8a7 100644
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -54,7 +54,7 @@ class HomeController extends Controller
 	public function info()
 	{
 		// Load our attributes
-		$s = new Server;
+		$s = config('server');
 		$s->schema('objectclasses');
 		$s->schema('attributetypes');
 
@@ -73,7 +73,7 @@ class HomeController extends Controller
 		$dn = Crypt::decryptString($request->post('key'));
 
 		return view('frames.dn')
-			->with('o',(new Server)->fetch($dn))
+			->with('o',config('server')->fetch($dn))
 			->with('dn',$dn);
 	}
 
@@ -87,7 +87,7 @@ class HomeController extends Controller
 	 */
 	public function schema_frame(Request $request)
 	{
-		$s = new Server;
+		$s = config('server');
 
 		// If an invalid key, we'll 404
 		if ($request->type && $request->key && ($s->schema($request->type)->has($request->key) === FALSE))
diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index 6d1d538..ac66e94 100644
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -4,9 +4,7 @@ namespace App\Http;
 
 use Illuminate\Foundation\Http\Kernel as HttpKernel;
 
-use App\Http\Middleware\GuestUser;
-use App\Http\Middleware\SwapinAuthUser;
-use App\Http\Middleware\CheckUpdate;
+use App\Http\Middleware\{ApplicationSession,CheckUpdate,SwapinAuthUser};
 
 class Kernel extends HttpKernel
 {
@@ -43,7 +41,7 @@ class Kernel extends HttpKernel
             \App\Http\Middleware\VerifyCsrfToken::class,
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
             \Laravel\Passport\Http\Middleware\CreateFreshApiToken::class,
-            GuestUser::class,
+            ApplicationSession::class,
             CheckUpdate::class,
         ],
 
@@ -51,6 +49,7 @@ class Kernel extends HttpKernel
             'throttle:60,1',
             \App\Http\Middleware\EncryptCookies::class,
             SwapinAuthUser::class,
+            ApplicationSession::class,
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
         ],
     ];
diff --git a/app/Http/Middleware/ApplicationSession.php b/app/Http/Middleware/ApplicationSession.php
new file mode 100644
index 0000000..dd6f028
--- /dev/null
+++ b/app/Http/Middleware/ApplicationSession.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use App\Classes\LDAP\Server;
+use App\Ldap\User;
+use Closure;
+
+/**
+ * This sets up our application session with any required values, ultimately for cache optimisation reasons
+ */
+class ApplicationSession
+{
+	/**
+	 * Handle an incoming request.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @param  \Closure  $next
+	 * @return mixed
+	 */
+	public function handle($request,Closure $next)
+	{
+		view()->share('user', auth()->user() ?: new User);
+
+		\Config::set('server',new Server);
+
+		return $next($request);
+	}
+}
\ No newline at end of file
diff --git a/app/Http/Middleware/GuestUser.php b/app/Http/Middleware/GuestUser.php
deleted file mode 100644
index afacd6d..0000000
--- a/app/Http/Middleware/GuestUser.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-namespace App\Http\Middleware;
-
-use App\Ldap\User;
-use Closure;
-
-/**
- * Class GuestUser
- * @package Leenooks\Laravel\Http\Middleware
- */
-class GuestUser
-{
-    /**
-     * Handle an incoming request.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Closure  $next
-     * @return mixed
-     */
-    public function handle($request,Closure $next)
-    {
-        view()->share('user', auth()->user() ?: new User);
-
-        return $next($request);
-    }
-}
\ No newline at end of file