Move out view variables until after our session has been setup. This was needed so that auth()->user() could be resolved correctly and needed to be done after we have started the session and swapped in the users cookies

app/Http/Middleware/ApplicationSession.php

@@ -7,7 +7,6 @@ use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Config;
 
 use App\Classes\LDAP\Server;
-use App\Ldap\User;
 
 /**
  * This sets up our application session with any required values, ultimately for cache optimisation reasons
@@ -25,9 +24,6 @@ class ApplicationSession
 	{
 		Config::set('server',new Server);
 
-		view()->share('server', Config::get('server'));
-		view()->share('user', auth()->user() ?: new User);
-
 		return $next($request);
 	}
 }

app/Http/Middleware/ViewVariables.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Config;
+
+use App\Ldap\User;
+
+/**
+ * This sets up our application session with any required values, ultimately for cache optimisation reasons
+ */
+class ViewVariables
+{
+	/**
+	 * Handle an incoming request.
+	 *
+	 * @param  Request  $request
+	 * @param  Closure  $next
+	 * @return mixed
+	 */
+	public function handle(Request $request,Closure $next): mixed
+	{
+		view()->share('server',Config::get('server'));
+		view()->share('user',auth()->user() ?: new User);
+
+		return $next($request);
+	}
+}

bootstrap/app.php

@@ -5,7 +5,7 @@ use Illuminate\Foundation\Application;
 use Illuminate\Foundation\Configuration\Exceptions;
 use Illuminate\Foundation\Configuration\Middleware;
 
-use App\Http\Middleware\{AllowAnonymous,ApplicationSession,CheckUpdate,SwapinAuthUser};
+use App\Http\Middleware\{AllowAnonymous,ApplicationSession,CheckUpdate,SwapinAuthUser,ViewVariables};
 
 return Application::configure(basePath: dirname(__DIR__))
 	->withRouting(
@@ -15,16 +15,19 @@ return Application::configure(basePath: dirname(__DIR__))
 		health: '/up',
 	)
 	->withMiddleware(function (Middleware $middleware) {
-		$middleware->appendToGroup('web', [
+		$middleware->appendToGroup(
-			SwapinAuthUser::class,
+			group: 'web',
+			middleware: [
 				ApplicationSession::class,
+				SwapinAuthUser::class,
+				ViewVariables::class,
 				CheckUpdate::class,
 			]);
 
 		$middleware->prependToGroup('api', [
 			EncryptCookies::class,
-			SwapinAuthUser::class,
 			ApplicationSession::class,
+			SwapinAuthUser::class,
 			AllowAnonymous::class,
 		]);