making rabbitmq optional for gateway - desactived bt default

georchestra · Sep 27, 2023 · d73754c · d73754c
1 parent 8180e6a
commit d73754c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/gateway/src/main/java/org/georchestra/gateway/events/RabbitmqEventsAutoConfiguration.java b/gateway/src/main/java/org/georchestra/gateway/events/RabbitmqEventsAutoConfiguration.java
@@ -14,7 +14,7 @@
 @Configuration(proxyBeanMethods = false)
 @AutoConfigureAfter(GatewayAutoConfiguration.class)
 @ImportResource({ "classpath:rabbit-listener-context.xml", "classpath:rabbit-sender-context.xml" })
-@ConditionalOnExpression("${georchestra.gateway.security.enableRabbitmqEvents:true}")
+@ConditionalOnExpression("${enableRabbitmqEvents:false}")
 public class RabbitmqEventsAutoConfiguration {
 
     @Bean

diff --git a/gateway/src/main/java/org/georchestra/gateway/security/ldap/LdapConfigProperties.java b/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();
 

diff --git a/gateway/src/main/java/org/georchestra/gateway/security/oauth2/OpenIdConnectUserMapper.java b/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());
-Original file line number
+Diff line change
@@ Expand Up / @@ -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();
@@ Expand Down @@