From da3f8ad4a06720592457b730a040be401d9e3933 Mon Sep 17 00:00:00 2001
From: sharifi <h_sharifi@modernisc.com>
Date: Tue, 3 May 2022 17:54:14 +0430
Subject: [PATCH 1/3] bael-5249: add application-properties

---
 .../src/main/resources/application-embedded.properties   | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 spring-boot-modules/spring-boot-keycloak/src/main/resources/application-embedded.properties

diff --git a/spring-boot-modules/spring-boot-keycloak/src/main/resources/application-embedded.properties b/spring-boot-modules/spring-boot-keycloak/src/main/resources/application-embedded.properties
new file mode 100644
index 0000000000..7e1985f0ad
--- /dev/null
+++ b/spring-boot-modules/spring-boot-keycloak/src/main/resources/application-embedded.properties
@@ -0,0 +1,9 @@
+### server port
+server.port=8080
+
+#Keycloak Configuration
+keycloak.auth-server-url=http://localhost:8083/auth
+keycloak.realm=baeldung
+keycloak.resource=customerClient
+keycloak.public-client=true
+keycloak.principal-attribute=preferred_username
\ No newline at end of file

From b9da120df02930c2d5a1ba0ff8ffc35faf7aa284 Mon Sep 17 00:00:00 2001
From: sharifi <h_sharifi@modernisc.com>
Date: Tue, 3 May 2022 17:55:30 +0430
Subject: [PATCH 2/3] bael-5249: add User ID

---
 .../com/baeldung/keycloak/CustomUserAttrController.java    | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/spring-boot-modules/spring-boot-keycloak/src/main/java/com/baeldung/keycloak/CustomUserAttrController.java b/spring-boot-modules/spring-boot-keycloak/src/main/java/com/baeldung/keycloak/CustomUserAttrController.java
index 1959590e5a..5b267ae19e 100644
--- a/spring-boot-modules/spring-boot-keycloak/src/main/java/com/baeldung/keycloak/CustomUserAttrController.java
+++ b/spring-boot-modules/spring-boot-keycloak/src/main/java/com/baeldung/keycloak/CustomUserAttrController.java
@@ -24,6 +24,8 @@ public class CustomUserAttrController {
         final Principal principal = (Principal) authentication.getPrincipal();
 
         String dob = "";
+        String userIdByToken = "";
+        String userIdByMapper = "";
 
         if (principal instanceof KeycloakPrincipal) {
 
@@ -31,6 +33,9 @@ public class CustomUserAttrController {
             IDToken token = kPrincipal.getKeycloakSecurityContext()
                 .getIdToken();
 
+            userIdByToken = token.getSubject();
+            userIdByMapper = token.getOtherClaims().get("user_id").toString();
+
             Map<String, Object> customClaims = token.getOtherClaims();
 
             if (customClaims.containsKey("DOB")) {
@@ -39,6 +44,8 @@ public class CustomUserAttrController {
         }
 
         model.addAttribute("username", principal.getName());
+        model.addAttribute("userIDByToken", userIdByToken);
+        model.addAttribute("userIDByMapper", userIdByMapper);
         model.addAttribute("dob", dob);
         return "userInfo";
     }

From 23e2df0c99aaed57d8eb602ba4e0b129f9823983 Mon Sep 17 00:00:00 2001
From: sharifi <h_sharifi@modernisc.com>
Date: Tue, 3 May 2022 17:55:48 +0430
Subject: [PATCH 3/3] bael-5249: add User ID to view

---
 .../src/main/resources/templates/userInfo.html              | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/spring-boot-modules/spring-boot-keycloak/src/main/resources/templates/userInfo.html b/spring-boot-modules/spring-boot-keycloak/src/main/resources/templates/userInfo.html
index 1446fe2124..7f772398c1 100644
--- a/spring-boot-modules/spring-boot-keycloak/src/main/resources/templates/userInfo.html
+++ b/spring-boot-modules/spring-boot-keycloak/src/main/resources/templates/userInfo.html
@@ -7,6 +7,12 @@
 		<h1>
 			Hello, <span th:text="${username}">--name--</span>.
 		</h1>
+		<h1>
+			User ID By Token: <span th:text="${userIDByToken}">--userID--</span>.
+		</h1>
+		<h1>
+			User ID By Mapper: <span th:text="${userIDByMapper}">--userID--</span>.
+		</h1>
 		<h3>
 			Your Date of Birth as per our records is <span th:text="${dob}" />.
 		</h3>