fix oauth dependency and circular reference

HumanBrainProject · Mar 7, 2022 · a6ab41b · a6ab41b
1 parent 85f4f5c
commit a6ab41b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 13 deletions.
diff --git a/service/pom.xml b/service/pom.xml
@@ -69,12 +69,6 @@
             <artifactId>ehcache</artifactId>
             <version>3.7.1</version>
         </dependency>
-        <dependency>
-            <groupId>com.nimbusds</groupId>
-            <artifactId>oauth2-oidc-sdk</artifactId>
-            <version>8.19</version>
-            <scope>runtime</scope>
-        </dependency>
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>

diff --git a/service/src/main/java/eu/ebrains/kg/search/configuration/Config.java b/service/src/main/java/eu/ebrains/kg/search/configuration/Config.java
@@ -31,8 +31,7 @@
 import io.swagger.v3.oas.models.security.OAuthFlows;
 import io.swagger.v3.oas.models.security.SecurityRequirement;
 import io.swagger.v3.oas.models.security.SecurityScheme;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.keycloak.adapters.springboot.KeycloakSpringBootConfigResolver;
 import org.springdoc.core.GroupedOpenApi;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cache.annotation.EnableCaching;
@@ -78,4 +77,10 @@ public OpenAPI customOpenAPI(@Value("${eu.ebrains.kg.login.endpoint}") String lo
                 .security(Collections.singletonList(userWithoutClientReq));
     }
 
+    @Bean
+    public KeycloakSpringBootConfigResolver keycloakConfigResolver() {
+        return new KeycloakSpringBootConfigResolver();
+    }
+
+
 }
diff --git a/service/src/main/java/eu/ebrains/kg/search/configuration/Keycloak.java b/service/src/main/java/eu/ebrains/kg/search/configuration/Keycloak.java
@@ -75,9 +75,4 @@ protected SessionAuthenticationStrategy sessionAuthenticationStrategy() {
         return new RegisterSessionAuthenticationStrategy(new SessionRegistryImpl());
     }
 
-    @Bean
-    public KeycloakSpringBootConfigResolver keycloakConfigResolver() {
-        return new KeycloakSpringBootConfigResolver();
-    }
-
 }