From 0e389e69eccdd4c196116f2c824d9bb754034f3a Mon Sep 17 00:00:00 2001
From: Francesco <stelk.mc@gmail.com>
Date: Wed, 8 Nov 2023 15:18:41 +0100
Subject: [PATCH] Displaying current authenticated user

---
 .../snapadmin/external/controller/GlobalController.java     | 6 ++++++
 src/main/resources/templates/fragments/resources.html       | 6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/main/java/tech/ailef/snapadmin/external/controller/GlobalController.java b/src/main/java/tech/ailef/snapadmin/external/controller/GlobalController.java
index 2166258..26422f0 100644
--- a/src/main/java/tech/ailef/snapadmin/external/controller/GlobalController.java
+++ b/src/main/java/tech/ailef/snapadmin/external/controller/GlobalController.java
@@ -19,6 +19,7 @@
 
 package tech.ailef.snapadmin.external.controller;
 
+import java.security.Principal;
 import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -131,5 +132,10 @@ public class GlobalController {
 		return snapAdmin.isAuthenticated();
 	}
 	
+	@ModelAttribute("snapadmin_authenticatedUser")
+	public String authenticatedUser(Principal principal) {
+		if (principal == null) return null;
+		return principal.getName();
+	}
 }
 
diff --git a/src/main/resources/templates/fragments/resources.html b/src/main/resources/templates/fragments/resources.html
index cd242e4..f34ef56 100644
--- a/src/main/resources/templates/fragments/resources.html
+++ b/src/main/resources/templates/fragments/resources.html
@@ -37,9 +37,9 @@
 	        <a class=" fw-bold navbar-brand" th:href="|/${snapadmin_baseUrl}|"><i class="bi bi-hexagon-fill"></i>
 	        	[[ ${snapadmin_userConf.get('brandName')} ]]
 	        </a>
-	        <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
-	            <span class="navbar-toggler-icon"></span>
-	        </button>
+	        <div th:if="${snapadmin_authenticated}" class="d-flex align-items-center p-2">
+    			<i class="bi bi-person-circle me-2"></i> [[ ${snapadmin_authenticatedUser} ]]
+	        </div>
 	    </div>
 	</nav>
     <div class="sidebar bg-lightest position-relative" th:fragment="sidebar(page)">