Inform admins when new oauth2 account is created using spring rabbit

georchestra · Sep 13, 2023 · c4e07c5 · c4e07c5
1 parent af3ed2d
commit c4e07c5
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 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.createNonExistingUsersInLDAP:true}")
+@ConditionalOnExpression("${georchestra.gateway.security.enableRabbitmqEvents:true}")
 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,6 +65,8 @@ 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
@@ -195,8 +195,11 @@ public class OpenIdConnectUserMapper extends OAuth2UserMapper {
                     accountDao.insert(newAccount);
                     roleDao.addUser(Role.USER, newAccount);
                     userOpt = usersApi.findByOAuth2ProviderId(oAuth2ProviderId);
-                    eventsSender.sendNewOAuthAccountMessage(oidcUser.getGivenName() + " " + oidcUser.getFamilyName(),
-                            oidcUser.getEmail(), token.getAuthorizedClientRegistrationId());
+                    if (config.isEnableRabbitmqEvents()) {
+                        eventsSender.sendNewOAuthAccountMessage(
+                                oidcUser.getGivenName() + " " + oidcUser.getFamilyName(), oidcUser.getEmail(),
+                                token.getAuthorizedClientRegistrationId());
+                    }
                 } catch (DuplicatedUidException e) {
                     throw new IllegalStateException(e);
                 } catch (DuplicatedEmailException e) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -65,6 +65,8 @@ public class LdapConfigProperties implements Validator { @@
         private boolean createNonExistingUsersInLDAP = true;
+        private boolean enableRabbitmqEvents = true;
         @Valid
         private Map<String, Server> ldap = Map.of();
@@ Expand Down @@