From 9bf18059d26b3a225bf37613d6c361d886e9f02a Mon Sep 17 00:00:00 2001
From: Rob Winch <rwinch@users.noreply.github.com>
Date: Fri, 13 May 2022 16:59:31 -0500
Subject: [PATCH] Fix xpring-session-sample-boot-jdbc

---
 ...WebMvcConfig.java => IndexController.java} | 25 ++++++++-----
 .../java/sample/UserControllerAdvise.java     | 37 +++++++++++++++++++
 .../src/main/resources/templates/layout.html  |  7 ++--
 3 files changed, 55 insertions(+), 14 deletions(-)
 rename spring-session-samples/spring-session-sample-boot-jdbc/src/main/java/sample/{config/WebMvcConfig.java => IndexController.java} (53%)
 create mode 100644 spring-session-samples/spring-session-sample-boot-jdbc/src/main/java/sample/UserControllerAdvise.java

diff --git a/spring-session-samples/spring-session-sample-boot-jdbc/src/main/java/sample/config/WebMvcConfig.java b/spring-session-samples/spring-session-sample-boot-jdbc/src/main/java/sample/IndexController.java
similarity index 53%
rename from spring-session-samples/spring-session-sample-boot-jdbc/src/main/java/sample/config/WebMvcConfig.java
rename to spring-session-samples/spring-session-sample-boot-jdbc/src/main/java/sample/IndexController.java
index 98bc76b5..1362599b 100644
--- a/spring-session-samples/spring-session-sample-boot-jdbc/src/main/java/sample/config/WebMvcConfig.java
+++ b/spring-session-samples/spring-session-sample-boot-jdbc/src/main/java/sample/IndexController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2017 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,18 +14,23 @@
  * limitations under the License.
  */
 
-package sample.config;
+package sample;
 
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
 
-@Configuration
-public class WebMvcConfig implements WebMvcConfigurer {
+/**
+ * Controller for sending the user to the login view.
+ *
+ * @author Rob Winch
+ *
+ */
+@Controller
+public class IndexController {
 
-	@Override
-	public void addViewControllers(ViewControllerRegistry registry) {
-		registry.addViewController("/").setViewName("index");
+	@RequestMapping("/")
+	public String index() {
+		return "index";
 	}
 
 }
diff --git a/spring-session-samples/spring-session-sample-boot-jdbc/src/main/java/sample/UserControllerAdvise.java b/spring-session-samples/spring-session-sample-boot-jdbc/src/main/java/sample/UserControllerAdvise.java
new file mode 100644
index 00000000..a1d43d80
--- /dev/null
+++ b/spring-session-samples/spring-session-sample-boot-jdbc/src/main/java/sample/UserControllerAdvise.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2014-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package sample;
+
+import java.security.Principal;
+
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ModelAttribute;
+
+/**
+ * {@link ControllerAdvice} to expose security related attributes.
+ *
+ * @author Rob Winch
+ */
+@ControllerAdvice
+public class UserControllerAdvise {
+
+	@ModelAttribute("currentUserName")
+	String currentUser(Principal principal) {
+		return (principal != null) ? principal.getName() : null;
+	}
+
+}
diff --git a/spring-session-samples/spring-session-sample-boot-jdbc/src/main/resources/templates/layout.html b/spring-session-samples/spring-session-sample-boot-jdbc/src/main/resources/templates/layout.html
index 50be94b5..bb42db27 100644
--- a/spring-session-samples/spring-session-sample-boot-jdbc/src/main/resources/templates/layout.html
+++ b/spring-session-samples/spring-session-sample-boot-jdbc/src/main/resources/templates/layout.html
@@ -81,13 +81,12 @@
 					<div class="container">
 						<a class="brand" th:href="@{/}"><img th:src="@{/images/logo.png}" alt="Spring Security Sample"/></a>
 
-<div class="nav-collapse collapse"
-		th:with="currentUser=${#httpServletRequest.userPrincipal?.principal}">
-	<div th:if="${currentUser != null}">
+<div class="nav-collapse collapse">
+	<div th:if="${currentUserName != null}">
 			<form class="navbar-form pull-right" th:action="@{/logout}" method="post">
 					<input type="submit" value="Log out" />
 			</form>
-			<p id="un" class="navbar-text pull-right" th:text="${currentUser.username}">
+			<p id="un" class="navbar-text pull-right" th:text="${currentUserName}">
 				sample_user
 			</p>
 	</div>