From 1196741643ba56f1055cc1115fca77067ceb5797 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Thu, 18 May 2023 12:42:59 +0300 Subject: [PATCH] Delete Health controller and add method in configuration to expose properties as map. --- .../AuthenticationConfiguration.java | 30 ++++++++++- .../controllers/HealthController.java | 51 ------------------- 2 files changed, 29 insertions(+), 52 deletions(-) delete mode 100644 src/main/java/eu/dnetlib/authentication/controllers/HealthController.java diff --git a/src/main/java/eu/dnetlib/authentication/configuration/AuthenticationConfiguration.java b/src/main/java/eu/dnetlib/authentication/configuration/AuthenticationConfiguration.java index b34713b..af0d3ce 100644 --- a/src/main/java/eu/dnetlib/authentication/configuration/AuthenticationConfiguration.java +++ b/src/main/java/eu/dnetlib/authentication/configuration/AuthenticationConfiguration.java @@ -1,14 +1,42 @@ package eu.dnetlib.authentication.configuration; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; +import java.util.HashMap; +import java.util.Map; + @Configuration @EnableConfigurationProperties({Properties.class, APIProperties.class}) @ComponentScan(basePackages = {"eu.dnetlib.authentication"}) public class AuthenticationConfiguration { - public AuthenticationConfiguration() { + private final Properties properties; + + @Autowired + public AuthenticationConfiguration(Properties properties) { + this.properties = properties; + } + + public Map getProperties() { + Map map = new HashMap<>(); + map.put("authentication.domain", properties.getDomain()); + map.put("authentication.keycloak", properties.getKeycloak().toString()); + map.put("authentication.redis.host", properties.getRedis().getHost()); + map.put("authentication.oidc.issuer", properties.getOidc().getIssuer()); + map.put("authentication.oidc.logout", properties.getOidc().getLogout()); + map.put("authentication.oidc.home", properties.getOidc().getHome()); + map.put("authentication.oidc.redirect", properties.getOidc().getRedirect()); + map.put("authentication.oidc.scope", properties.getOidc().getScope()); + map.put("authentication.oidc.id", properties.getOidc().getId()); + map.put("authentication.oidc.secret", properties.getOidc().getSecret()); + map.put("authentication.session", properties.getSession()); + map.put("authentication.accessToken", properties.getAccessToken()); + map.put("authentication.redirect", properties.getRedirect()); + map.put("authentication.authorities-mapper", properties.getAuthoritiesMapper()); + return map; } } diff --git a/src/main/java/eu/dnetlib/authentication/controllers/HealthController.java b/src/main/java/eu/dnetlib/authentication/controllers/HealthController.java deleted file mode 100644 index 98c1ef1..0000000 --- a/src/main/java/eu/dnetlib/authentication/controllers/HealthController.java +++ /dev/null @@ -1,51 +0,0 @@ -package eu.dnetlib.authentication.controllers; - -import eu.dnetlib.authentication.configuration.Properties; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RestController; - -import java.util.HashMap; -import java.util.Map; - -@RestController -public class HealthController { - private final Logger log = LogManager.getLogger(this.getClass()); - private final Properties properties; - - @Autowired - public HealthController(Properties properties) { - this.properties = properties; - } - - @RequestMapping(value = {"", "/health_check"}, method = RequestMethod.GET) - public String hello() { - log.debug("Hello from Login service!"); - return "Hello from Login service!"; - } - - @PreAuthorize("hasAnyAuthority('PORTAL_ADMINISTRATOR')") - @RequestMapping(value = "/health_check/advanced", method = RequestMethod.GET) - public Map checkEverything() { - Map response = new HashMap<>(); - response.put("authentication.domain", properties.getDomain()); - response.put("authentication.keycloak", properties.getKeycloak().toString()); - response.put("authentication.redis.host", properties.getRedis().getHost()); - response.put("authentication.oidc.issuer", properties.getOidc().getIssuer()); - response.put("authentication.oidc.logout", properties.getOidc().getLogout()); - response.put("authentication.oidc.home", properties.getOidc().getHome()); - response.put("authentication.oidc.redirect", properties.getOidc().getRedirect()); - response.put("authentication.oidc.scope", properties.getOidc().getScope()); - response.put("authentication.oidc.id", properties.getOidc().getId()); - response.put("authentication.oidc.secret", properties.getOidc().getSecret()); - response.put("authentication.session", properties.getSession()); - response.put("authentication.accessToken", properties.getAccessToken()); - response.put("authentication.redirect", properties.getRedirect()); - response.put("authentication.authorities-mapper", properties.getAuthoritiesMapper()); - return response; - } -}