From 2c406ba3e9edf04e8cea79b0eff8af6e6ea697db Mon Sep 17 00:00:00 2001
From: Deon George <deon@leenooks.net>
Date: Tue, 28 Sep 2021 00:21:21 +1000
Subject: [PATCH] Add $user (authed user) to views

---
 app/Http/Kernel.php                           |  1 +
 app/Http/Middleware/AddUserToView.php         | 50 +++++++++++++++++++
 resources/views/domain/view.blade.php         |  2 +-
 .../views/layouts/partials/sidebar.blade.php  |  2 +-
 .../views/layouts/partials/topmenu.blade.php  |  4 +-
 resources/views/user/addedit.blade.php        |  6 +--
 resources/views/user/home.blade.php           |  2 +-
 7 files changed, 59 insertions(+), 8 deletions(-)
 create mode 100644 app/Http/Middleware/AddUserToView.php

diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index 1b44804..3a7f63a 100644
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -36,6 +36,7 @@ class Kernel extends HttpKernel
             \App\Http\Middleware\VerifyCsrfToken::class,
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
             \Laravel\Passport\Http\Middleware\CreateFreshApiToken::class,
+            \App\Http\Middleware\AddUserToView::class,
         ],
 
         'api' => [
diff --git a/app/Http/Middleware/AddUserToView.php b/app/Http/Middleware/AddUserToView.php
new file mode 100644
index 0000000..6df4069
--- /dev/null
+++ b/app/Http/Middleware/AddUserToView.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use Illuminate\Contracts\View\Factory;
+use Illuminate\Contracts\Auth\Authenticatable;
+
+class AddUserToView
+{
+    /**
+     * The View Factory.
+     *
+     * @var \Illuminate\Contracts\View\Factory
+     */
+    protected Factory $factory;
+
+    /**
+     * The Authenticated user, if any.
+     *
+     * @var \Illuminate\Contracts\Auth\Authenticatable|null
+     */
+    protected ?Authenticatable $user;
+
+    /**
+     * Create a new Share Authenticated User instance.
+     *
+     * @param  \Illuminate\Contracts\View\Factory  $factory
+     * @param  \Illuminate\Contracts\Auth\Authenticatable|null  $user
+     */
+    public function __construct(Factory $factory,Authenticatable $user=NULL)
+    {
+        $this->factory = $factory;
+        $this->user = $user;
+    }
+
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure  $next
+     * @return mixed
+     */
+    public function handle($request, Closure $next)
+    {
+        $this->factory->share('user',$this->user);
+
+        return $next($request);
+    }
+}
\ No newline at end of file
diff --git a/resources/views/domain/view.blade.php b/resources/views/domain/view.blade.php
index f55133f..edfe09b 100644
--- a/resources/views/domain/view.blade.php
+++ b/resources/views/domain/view.blade.php
@@ -150,7 +150,7 @@
 					@guest
 						To start an application to join this network please <a href="{{ url('login') }}">login</a>.
 					@else
-						@if(Auth::user()->isMember($o))
+						@if($user->isMember($o))
 						@else
 							This website is not ready to take applications yet, check back soon!
 						@endif
diff --git a/resources/views/layouts/partials/sidebar.blade.php b/resources/views/layouts/partials/sidebar.blade.php
index b4a83c5..c330db6 100644
--- a/resources/views/layouts/partials/sidebar.blade.php
+++ b/resources/views/layouts/partials/sidebar.blade.php
@@ -27,7 +27,7 @@
 	<dl>
 		<dt>Expore Networks</dt>
 		@foreach (\App\Models\Domain::active()
-			->when(! \Illuminate\Support\Facades\Auth::check(),function($query) { return $query->public(); })
+			->when((! $user),function($query) { return $query->public(); })
 			->orderBy('name')->get() as $o)
 			<dd><a href="{{ url('network',['id'=>$o->id]) }}" title="{{ $o->description }}">{{ $o->name }}</a></dd>
 		@endforeach
diff --git a/resources/views/layouts/partials/topmenu.blade.php b/resources/views/layouts/partials/topmenu.blade.php
index dfeb503..c381a00 100644
--- a/resources/views/layouts/partials/topmenu.blade.php
+++ b/resources/views/layouts/partials/topmenu.blade.php
@@ -15,8 +15,8 @@
 
 	<ul class="float-end">
 		@auth
-			<li class="{{ Auth::user()->switched ? 'switched' : '' }}"><a href="{{ url('settings') }}"><span>{{ Auth::user()->name }}</span></a></li>
-			@if(Auth::user()->switched)
+			<li class="{{ $user->switched ? 'switched' : '' }}"><a href="{{ url('settings') }}"><span>{{ $user->name }}</span></a></li>
+			@if($user->switched)
 				<li><a href="{{ url('admin/switch/stop') }}">
 					<span>Switch Back</span>
 				</a></li>
diff --git a/resources/views/user/addedit.blade.php b/resources/views/user/addedit.blade.php
index 934bdae..0b5ac83 100644
--- a/resources/views/user/addedit.blade.php
+++ b/resources/views/user/addedit.blade.php
@@ -62,11 +62,11 @@
 						<div class="col-4">
 							<label for="admin" class="form-label">Site Admin</label>
 							<div class="input-group">
-								<div class="btn-group" role="group" @if($o->id == Auth::user()->id)data-bs-toggle="tooltip" title="You cannot demote yourself" @endif>
+								<div class="btn-group" role="group" @if($user->id == $o->id)data-bs-toggle="tooltip" title="You cannot demote yourself" @endif>
 									<input type="radio" class="btn-check" name="admin" id="admin_yes" value="1" required @cannot('admin',$o)disabled @endcannot @if(old('admin',$o->admin))checked @endif>
 									<label class="btn btn-outline-success" for="admin_yes">Yes</label>
 
-									<input type="radio" class="btn-check btn-danger" name="admin" id="admin_no" value="0" required @if($o->id == Auth::user()->id || Auth::user()->cannot('admin',$o)) disabled  @endif @if(! old('admin',$o->admin))checked @endif>
+									<input type="radio" class="btn-check btn-danger" name="admin" id="admin_no" value="0" required @if(($user->id == $o->id) || $user->cannot('admin',$o)) disabled  @endif @if(! old('admin',$o->admin))checked @endif>
 									<label class="btn btn-outline-danger" for="admin_no">No</label>
 								</div>
 							</div>
@@ -100,7 +100,7 @@
 @endsection
 
 @section('page-scripts')
-	@if($o->id == Auth::user()->id)
+	@if($user->id == $o->id)
 	<script>
 		var tooltipTriggerList = [].slice.call(document.querySelectorAll('[data-bs-toggle="tooltip"]'))
 		var tooltipList = tooltipTriggerList.map(function (tooltipTriggerEl) {
diff --git a/resources/views/user/home.blade.php b/resources/views/user/home.blade.php
index 1a8f3c3..ecb08d0 100644
--- a/resources/views/user/home.blade.php
+++ b/resources/views/user/home.blade.php
@@ -28,7 +28,7 @@
 				<tbody>
 				@foreach (\App\Models\User::orderBy('email')->cursor() as $oo)
 					<tr class="{{ $oo->admin ? 'admin' : '' }}">
-						<td><a href="{{ url('user/addedit',[$oo->id]) }}">{{ $oo->id }}</a> @if(Auth::user()->admin && (Auth::id() !== $oo->id))<span class="float-end"><a href="{{ url('admin/switch/start',[$oo->id]) }}"><i class="bi bi-person-bounding-box"></i></a></span>@endif</td>
+						<td><a href="{{ url('user/addedit',[$oo->id]) }}">{{ $oo->id }}</a> @if($user->admin && ($user->id !== $oo->id))<span class="float-end"><a href="{{ url('admin/switch/start',[$oo->id]) }}"><i class="bi bi-person-bounding-box"></i></a></span>@endif</td>
 						<td>{{ $oo->email }}</td>
 						<td>{{ $oo->name }}</td>
 						<td>{{ $oo->active ? 'YES' : 'NO' }}</td>