From e15769b010e26da4891f549675374f7eb5a867e2 Mon Sep 17 00:00:00 2001
From: Timo Bejan <timo.bejan.ext@knecon.com>
Date: Tue, 30 May 2023 13:41:08 +0300
Subject: [PATCH] Extracted get-realm to service since statics cannot be
 overwritten

---
 .../security/KeycloakSecurity.java            |  5 -----
 .../security/TokenRealmService.java           | 20 +++++++++++++++++++
 2 files changed, 20 insertions(+), 5 deletions(-)
 create mode 100644 src/main/java/com/knecon/fforesight/keycloakcommons/security/TokenRealmService.java

diff --git a/src/main/java/com/knecon/fforesight/keycloakcommons/security/KeycloakSecurity.java b/src/main/java/com/knecon/fforesight/keycloakcommons/security/KeycloakSecurity.java
index 53147ed..f949945 100644
--- a/src/main/java/com/knecon/fforesight/keycloakcommons/security/KeycloakSecurity.java
+++ b/src/main/java/com/knecon/fforesight/keycloakcommons/security/KeycloakSecurity.java
@@ -31,10 +31,5 @@ public class KeycloakSecurity {
     }
 
 
-    public Optional<String> getRealm() {
-
-        var authentication = (JwtAuthenticationToken) SecurityContextHolder.getContext().getAuthentication();
-        return Optional.of(TokenUtils.toTenant(authentication.getToken().getTokenValue()));
-    }
 
 }
diff --git a/src/main/java/com/knecon/fforesight/keycloakcommons/security/TokenRealmService.java b/src/main/java/com/knecon/fforesight/keycloakcommons/security/TokenRealmService.java
new file mode 100644
index 0000000..127d7f0
--- /dev/null
+++ b/src/main/java/com/knecon/fforesight/keycloakcommons/security/TokenRealmService.java
@@ -0,0 +1,20 @@
+package com.knecon.fforesight.keycloakcommons.security;
+
+import java.util.Optional;
+
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationToken;
+import org.springframework.stereotype.Service;
+
+import com.knecon.fforesight.keycloakcommons.security.TokenUtils;
+
+@Service
+public class TokenRealmService {
+
+    public Optional<String> getRealm() {
+
+        var authentication = (JwtAuthenticationToken) SecurityContextHolder.getContext().getAuthentication();
+        return Optional.of(TokenUtils.toTenant(authentication.getToken().getTokenValue()));
+    }
+
+}