Merge pull request #1163 from adorsys/1018-enabling-a-realm-clears-th…

…e-value-of-eventsexpiration

Fix enabling a realm clears the value of eventsExpiration

CHANGELOG.md

@@ -8,10 +8,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ### Fixed
 
+- Fix enabling a realm clears the value of eventsExpiration
+
+## [6.1.11] - 2024-10-14
+
 - Fix env.JAVA_HOME test failures by ensuring env is set before build
 
 ## [6.1.10] - 2024-10-04
 
+
 - Fixed securityContext entries in job template
 
 

src/main/java/de/adorsys/keycloak/config/service/RealmImportService.java

@@ -187,8 +187,11 @@ private void updateRealm(RealmImport realmImport) {
 
         RealmRepresentation realm = CloneUtil.deepClone(realmImport, RealmRepresentation.class, ignoredPropertiesForRealmImport);
 
-        // The state must be loaded before we update realm to prevent
-        // the state erasure by custom attributes from configuration
+        RealmRepresentation existingRealm = realmRepository.get(realmImport.getRealm());
+
+        if (existingRealm.getEventsExpiration() != null) {
+            realm.setEventsExpiration(existingRealm.getEventsExpiration());
+        }
         stateService.loadState(realm);
 
         realmRepository.update(realm);

src/test/java/de/adorsys/keycloak/config/service/ImportSimpleRealmIT.java

@@ -302,4 +302,17 @@ void shouldNotUpdateSimpleRealmWithInvalidSyntax() {
 
         assertThat(thrown.getMessage(), matchesPattern("(?s)^Unable to parse file 'file:.+/import-files/simple-realm/81_invalid_json.json': while parsing a flow mapping.+"));
     }
+    @Test
+    @Order(83)
+    void shouldPreserveEventsExpirationWhenUpdatingRealm() throws Exception {
+        doImport("08.3_update_simple-realm_with_events-expiration.json");
+
+        RealmRepresentation realm = keycloakProvider.getInstance().realm(REALM_NAME).toRepresentation();
+        assertThat(realm.getEventsExpiration(), is(3600L));
+
+        doImport("08.4_update_simple-realm_without_events-expiration.json");
+
+        realm = keycloakProvider.getInstance().realm(REALM_NAME).toRepresentation();
+        assertThat(realm.getEventsExpiration(), is(3600L));
+    }
 }

src/test/resources/import-files/simple-realm/08.3_update_simple-realm_with_events-expiration.json

@@ -0,0 +1,5 @@
+{
+  "realm": "simple",
+  "eventsEnabled": true,
+  "eventsExpiration": 3600
+}

src/test/resources/import-files/simple-realm/08.4_update_simple-realm_without_events-expiration.json

@@ -0,0 +1,4 @@
+{
+  "realm": "simple",
+  "eventsEnabled": true
+}