Merge pull request #62 from marwanehcine/make_rabbitmq_optional_for_g…

…ateway

making Rabbitmq optional for gateway - deactivated by default

gateway/src/main/java/org/georchestra/gateway/autoconfigure/app/FiltersAutoConfiguration.java

@@ -25,7 +25,10 @@
 import org.geoserver.cloud.gateway.filter.RouteProfileGatewayFilterFactory;
 import org.geoserver.cloud.gateway.filter.StripBasePathGatewayFilterFactory;
 import org.geoserver.cloud.gateway.predicate.RegExpQueryRoutePredicateFactory;
+import org.springframework.boot.actuate.health.Health;
+import org.springframework.boot.actuate.health.HealthIndicator;
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.cloud.gateway.config.GatewayAutoConfiguration;
 import org.springframework.cloud.gateway.filter.GlobalFilter;
@@ -65,4 +68,8 @@ public class FiltersAutoConfiguration {
  return new StripBasePathGatewayFilterFactory();
  }
 
+ @ConditionalOnProperty(name = "enableRabbitmqEvents", havingValue = "true", matchIfMissing = false)
+ public @Bean HealthIndicator rabbitHealthIndicator() {
+ return () -> Health.up().withDetail("version", "mock").build();
+ }
 }

gateway/src/main/java/org/georchestra/gateway/events/RabbitmqEventsAutoConfiguration.java

@@ -7,14 +7,15 @@
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.amqp.core.Queue;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.cloud.gateway.config.GatewayAutoConfiguration;
 import org.springframework.context.annotation.*;
 
 @Profile("!test && !it")
 @Configuration(proxyBeanMethods = false)
 @AutoConfigureAfter(GatewayAutoConfiguration.class)
 @ImportResource({ "classpath:rabbit-listener-context.xml", "classpath:rabbit-sender-context.xml" })
-@ConditionalOnExpression("${georchestra.gateway.security.enableRabbitmqEvents:true}")
+@ConditionalOnProperty(name = "enableRabbitmqEvents", havingValue = "true", matchIfMissing = false)
 public class RabbitmqEventsAutoConfiguration {
 
  @Bean

gateway/src/main/java/org/georchestra/gateway/security/ldap/LdapConfigProperties.java

@@ -65,8 +65,6 @@ public class LdapConfigProperties implements Validator {
 
  private boolean createNonExistingUsersInLDAP = true;
 
- private boolean enableRabbitmqEvents = true;
-
  @Valid
  private Map<String, Server> ldap = Map.of();
 

gateway/src/main/java/org/georchestra/gateway/security/oauth2/OpenIdConnectUserMapper.java

@@ -40,6 +40,7 @@
 import org.georchestra.security.model.GeorchestraUser;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.core.Ordered;
 import org.springframework.security.oauth2.client.authentication.OAuth2AuthenticationToken;
@@ -145,6 +146,8 @@
 @Slf4j(topic = "org.georchestra.gateway.security.oauth2")
 public class OpenIdConnectUserMapper extends OAuth2UserMapper {
 
+ private @Value("${enableRabbitmqEvents:false}") boolean enableRabbitmq;
+
  @Autowired
  LdapConfigProperties config;
 
@@ -195,7 +198,7 @@ public class OpenIdConnectUserMapper extends OAuth2UserMapper {
  accountDao.insert(newAccount);
  roleDao.addUser(Role.USER, newAccount);
  userOpt = usersApi.findByOAuth2ProviderId(oAuth2ProviderId);
- if (config.isEnableRabbitmqEvents() && eventsSender != null) {
+ if (enableRabbitmq && eventsSender != null) {
  eventsSender.sendNewOAuthAccountMessage(
  oidcUser.getGivenName() + " " + oidcUser.getFamilyName(), oidcUser.getEmail(),
  token.getAuthorizedClientRegistrationId());