Merge branch 'RED-10106' into 'main'

Updated to latest tenant-commons

See merge request fforesight/keycloak-commons!14

.gitignore

@@ -39,3 +39,4 @@ gradle/
 
 **/.gradle
 **/build
+.DS_Store

build.gradle.kts

@@ -1,7 +1,6 @@
 plugins {
     `java-library`
     `maven-publish`
-    `kotlin-dsl`
     pmd
     checkstyle
     jacoco
@@ -12,12 +11,11 @@ plugins {
 val springVersion = "3.2.2";
 
 dependencies {
-    api("com.knecon.fforesight:tenant-commons:0.21.0")
+    api("com.knecon.fforesight:tenant-commons:0.31.0")
     api("org.springframework.boot:spring-boot-starter-oauth2-resource-server:${springVersion}")
     api("org.springframework.boot:spring-boot-starter-security:${springVersion}")
     api("org.springframework.boot:spring-boot-starter-web:${springVersion}")
     api("org.springframework.boot:spring-boot-configuration-processor:${springVersion}")
-    api("org.projectlombok:lombok:1.18.30")
     testImplementation("org.springframework.boot:spring-boot-starter-test:${springVersion}")
 }
 
@@ -81,7 +79,7 @@ tasks.named<Test>("test") {
 
 sonarqube {
     properties {
-        property("sonar.login", providers.gradleProperty("sonarToken").getOrNull())
+        providers.gradleProperty("sonarToken").getOrNull()?.let { property("sonar.login", it) }
         property("sonar.host.url", "https://sonarqube.knecon.com")
     }
 }
@@ -101,4 +99,4 @@ tasks.jacocoTestReport {
 
 java {
     withJavadocJar()
-}
+}

src/main/java/com/knecon/fforesight/keycloakcommons/security/TenantAuthenticationManagerResolver.java

@@ -1,6 +1,5 @@
 package com.knecon.fforesight.keycloakcommons.security;
 
-import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
@@ -8,7 +7,6 @@ import java.util.concurrent.ConcurrentHashMap;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.authentication.AuthenticationManagerResolver;
 import org.springframework.security.oauth2.jwt.JwtDecoder;
-import org.springframework.security.oauth2.jwt.JwtDecoders;
 import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationConverter;
 import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationProvider;
 import org.springframework.security.oauth2.server.resource.web.BearerTokenResolver;
@@ -37,6 +35,18 @@ public class TenantAuthenticationManagerResolver implements AuthenticationManage
     }
 
 
+    public AuthenticationManager resolve(String token) {
+
+        return this.authenticationManagers.computeIfAbsent(toTenant(token), this::fromTenant);
+    }
+
+
+    private String toTenant(String token) {
+
+        return TokenUtils.toTenant(token);
+    }
+
+
     private String toTenant(HttpServletRequest request) {
 
         return TokenUtils.toTenant(this.resolver.resolve(request));