changes for keycloak 26

fixes adorsys#1162
bohmber · Nov 5, 2024 · bd00f35 · bd00f35
1 parent 0031aa1
commit bd00f35
Show file tree

Hide file tree

Showing 19 changed files with 51 additions and 33 deletions.
diff --git a/src/test/java/de/adorsys/keycloak/config/service/ImportClientsIT.java b/src/test/java/de/adorsys/keycloak/config/service/ImportClientsIT.java
@@ -1608,7 +1608,13 @@ void shouldAddAuthzPoliciesForRealmManagement() throws IOException {
         assertThat(client.getAuthorizationServicesEnabled(), is(true));
         assertThat(client.isFrontchannelLogout(), is(false));
         assertThat(client.getProtocol(), is("openid-connect"));
-        assertThat(client.getAttributes(), anEmptyMap());
+        if (client.getAttributes().size() == 1) {
+            // https://github.com/keycloak/keycloak/commit/24aa6e143dee0cc50eb90eaf42c72cc7cf839cee
+            // realm_client attribute
+            assertThat(client.getAttributes(), hasEntry(equalTo("realm_client"), equalTo("true")));
+        } else {
+            assertThat(client.getAttributes(), anEmptyMap());
+        }
         assertThat(client.getAuthenticationFlowBindingOverrides(), anEmptyMap());
         assertThat(client.isFullScopeAllowed(), is(false));
         assertThat(client.getNodeReRegistrationTimeout(), is(0));
@@ -1750,7 +1756,13 @@ void shouldUpdateAuthzPoliciesForRealmManagement() throws IOException {
         assertThat(client.getAuthorizationServicesEnabled(), is(true));
         assertThat(client.isFrontchannelLogout(), is(false));
         assertThat(client.getProtocol(), is("openid-connect"));
-        assertThat(client.getAttributes(), anEmptyMap());
+        if (client.getAttributes().size() == 1) {
+            // https://github.com/keycloak/keycloak/commit/24aa6e143dee0cc50eb90eaf42c72cc7cf839cee
+            // realm_client attribute
+            assertThat(client.getAttributes(), hasEntry(equalTo("realm_client"), equalTo("true")));
+        } else {
+            assertThat(client.getAttributes(), anEmptyMap());
+        }
         assertThat(client.getAuthenticationFlowBindingOverrides(), anEmptyMap());
         assertThat(client.isFullScopeAllowed(), is(false));
         assertThat(client.getNodeReRegistrationTimeout(), is(0));
@@ -1876,7 +1888,13 @@ void shouldRemoveClientAndAuthzPoliciesForRealmManagement() throws IOException {
         assertThat(client.getAuthorizationServicesEnabled(), is(true));
         assertThat(client.isFrontchannelLogout(), is(false));
         assertThat(client.getProtocol(), is("openid-connect"));
-        assertThat(client.getAttributes(), anEmptyMap());
+        if (client.getAttributes().size() == 1) {
+            // https://github.com/keycloak/keycloak/commit/24aa6e143dee0cc50eb90eaf42c72cc7cf839cee
+            // realm_client attribute
+            assertThat(client.getAttributes(), hasEntry(equalTo("realm_client"), equalTo("true")));
+        } else {
+            assertThat(client.getAttributes(), anEmptyMap());
+        }
         assertThat(client.getAuthenticationFlowBindingOverrides(), anEmptyMap());
         assertThat(client.isFullScopeAllowed(), is(false));
         assertThat(client.getNodeReRegistrationTimeout(), is(0));

diff --git a/src/test/resources/import-files/clients/14_update_realm__set_auth-flow-overrides.json b/src/test/resources/import-files/clients/14_update_realm__set_auth-flow-overrides.json
@@ -13,7 +13,7 @@
           "authenticator": "docker-http-basic-authenticator",
           "requirement": "DISABLED",
           "priority": 0,
-          "userSetupAllowed": true,
+          "userSetupAllowed": false,
           "autheticatorFlow": false,
           "authenticatorFlow": false
         }
@@ -30,7 +30,7 @@
           "authenticator": "docker-http-basic-authenticator",
           "requirement": "DISABLED",
           "priority": 0,
-          "userSetupAllowed": true,
+          "userSetupAllowed": false,
           "autheticatorFlow": false,
           "authenticatorFlow": false
         }

diff --git a/src/test/resources/import-files/clients/15_update_realm__change_auth-flow-overrides.json b/src/test/resources/import-files/clients/15_update_realm__change_auth-flow-overrides.json
@@ -13,7 +13,7 @@
           "authenticator": "docker-http-basic-authenticator",
           "requirement": "DISABLED",
           "priority": 0,
-          "userSetupAllowed": true,
+          "userSetupAllowed": false,
           "autheticatorFlow": false,
           "authenticatorFlow": false
         }
@@ -30,7 +30,7 @@
           "authenticator": "docker-http-basic-authenticator",
           "requirement": "DISABLED",
           "priority": 0,
-          "userSetupAllowed": true,
+          "userSetupAllowed": false,
           "autheticatorFlow": false,
           "authenticatorFlow": false
         }

diff --git a/src/test/resources/import-files/clients/16_update_realm__ignore_auth-flow-overrides.json b/src/test/resources/import-files/clients/16_update_realm__ignore_auth-flow-overrides.json
@@ -13,7 +13,7 @@
           "authenticator": "docker-http-basic-authenticator",
           "requirement": "DISABLED",
           "priority": 0,
-          "userSetupAllowed": true,
+          "userSetupAllowed": false,
           "autheticatorFlow": false,
           "authenticatorFlow": false
         }
@@ -30,7 +30,7 @@
           "authenticator": "docker-http-basic-authenticator",
           "requirement": "DISABLED",
           "priority": 0,
-          "userSetupAllowed": true,
+          "userSetupAllowed": false,
           "autheticatorFlow": false,
           "authenticatorFlow": false
         }

diff --git a/...mport-files/clients/17_update_realm__update_id_auth-flow-overrides_when_flow_changed.json b/...mport-files/clients/17_update_realm__update_id_auth-flow-overrides_when_flow_changed.json
@@ -13,7 +13,7 @@
           "authenticator": "docker-http-basic-authenticator",
           "requirement": "DISABLED",
           "priority": 0,
-          "userSetupAllowed": true,
+          "userSetupAllowed": false,
           "autheticatorFlow": false,
           "authenticatorFlow": false
         }
@@ -30,7 +30,7 @@
           "authenticator": "docker-http-basic-authenticator",
           "requirement": "DISABLED",
           "priority": 0,
-          "userSetupAllowed": true,
+          "userSetupAllowed": false,
           "autheticatorFlow": false,
           "authenticatorFlow": false
         }

diff --git a/...ources/import-files/clients/18_cannot_update_realm__with_invalid_auth-flow-overrides.json b/...ources/import-files/clients/18_cannot_update_realm__with_invalid_auth-flow-overrides.json
@@ -13,7 +13,7 @@
           "authenticator": "docker-http-basic-authenticator",
           "requirement": "DISABLED",
           "priority": 0,
-          "userSetupAllowed": true,
+          "userSetupAllowed": false,
           "autheticatorFlow": false,
           "authenticatorFlow": false
         }
@@ -30,7 +30,7 @@
           "authenticator": "docker-http-basic-authenticator",
           "requirement": "DISABLED",
           "priority": 0,
-          "userSetupAllowed": true,
+          "userSetupAllowed": false,
           "autheticatorFlow": false,
           "authenticatorFlow": false
         }

diff --git a/src/test/resources/import-files/clients/19_update_realm__remove_auth-flow-overrides.json b/src/test/resources/import-files/clients/19_update_realm__remove_auth-flow-overrides.json
@@ -13,7 +13,7 @@
           "authenticator": "docker-http-basic-authenticator",
           "requirement": "DISABLED",
           "priority": 0,
-          "userSetupAllowed": true,
+          "userSetupAllowed": false,
           "autheticatorFlow": false,
           "authenticatorFlow": false
         }
@@ -30,7 +30,7 @@
           "authenticator": "docker-http-basic-authenticator",
           "requirement": "DISABLED",
           "priority": 0,
-          "userSetupAllowed": true,
+          "userSetupAllowed": false,
           "autheticatorFlow": false,
           "authenticatorFlow": false
         }

diff --git a/...test/resources/import-files/clients/20_update_realm__create_client_add_default_scope.json b/...test/resources/import-files/clients/20_update_realm__create_client_add_default_scope.json
@@ -19,7 +19,7 @@
           "authenticator": "docker-http-basic-authenticator",
           "requirement": "DISABLED",
           "priority": 0,
-          "userSetupAllowed": true,
+          "userSetupAllowed": false,
           "autheticatorFlow": false,
           "authenticatorFlow": false
         }
@@ -36,7 +36,7 @@
           "authenticator": "docker-http-basic-authenticator",
           "requirement": "DISABLED",
           "priority": 0,
-          "userSetupAllowed": true,
+          "userSetupAllowed": false,
           "autheticatorFlow": false,
           "authenticatorFlow": false
         }

diff --git a/...t/resources/import-files/clients/21_update_realm__update_client_update_default_scope.json b/...t/resources/import-files/clients/21_update_realm__update_client_update_default_scope.json
@@ -19,7 +19,7 @@
           "authenticator": "docker-http-basic-authenticator",
           "requirement": "DISABLED",
           "priority": 0,
-          "userSetupAllowed": true,
+          "userSetupAllowed": false,
           "autheticatorFlow": false,
           "authenticatorFlow": false
         }
@@ -36,7 +36,7 @@
           "authenticator": "docker-http-basic-authenticator",
           "requirement": "DISABLED",
           "priority": 0,
-          "userSetupAllowed": true,
+          "userSetupAllowed": false,
           "autheticatorFlow": false,
           "authenticatorFlow": false
         }

diff --git a/...est/resources/import-files/clients/22_update_realm__update_client_skip_default_scope.json b/...est/resources/import-files/clients/22_update_realm__update_client_skip_default_scope.json
@@ -19,7 +19,7 @@
           "authenticator": "docker-http-basic-authenticator",
           "requirement": "DISABLED",
           "priority": 0,
-          "userSetupAllowed": true,
+          "userSetupAllowed": false,
           "autheticatorFlow": false,
           "authenticatorFlow": false
         }
@@ -36,7 +36,7 @@
           "authenticator": "docker-http-basic-authenticator",
           "requirement": "DISABLED",
           "priority": 0,
-          "userSetupAllowed": true,
+          "userSetupAllowed": false,
           "autheticatorFlow": false,
           "authenticatorFlow": false
         }

diff --git a/...t/resources/import-files/clients/23_update_realm__update_client_remove_default_scope.json b/...t/resources/import-files/clients/23_update_realm__update_client_remove_default_scope.json
@@ -19,7 +19,7 @@
           "authenticator": "docker-http-basic-authenticator",
           "requirement": "DISABLED",
           "priority": 0,
-          "userSetupAllowed": true,
+          "userSetupAllowed": false,
           "autheticatorFlow": false,
           "authenticatorFlow": false
         }
@@ -36,7 +36,7 @@
           "authenticator": "docker-http-basic-authenticator",
           "requirement": "DISABLED",
           "priority": 0,
-          "userSetupAllowed": true,
+          "userSetupAllowed": false,
           "autheticatorFlow": false,
           "authenticatorFlow": false
         }

diff --git a/...sources/import-files/clients/24_update_realm__update_client_add_custom_default_scope.json b/...sources/import-files/clients/24_update_realm__update_client_add_custom_default_scope.json
@@ -19,7 +19,7 @@
           "authenticator": "docker-http-basic-authenticator",
           "requirement": "DISABLED",
           "priority": 0,
-          "userSetupAllowed": true,
+          "userSetupAllowed": false,
           "autheticatorFlow": false,
           "authenticatorFlow": false
         }
@@ -36,7 +36,7 @@
           "authenticator": "docker-http-basic-authenticator",
           "requirement": "DISABLED",
           "priority": 0,
-          "userSetupAllowed": true,
+          "userSetupAllowed": false,
           "autheticatorFlow": false,
           "authenticatorFlow": false
         }

diff --git a/...rces/import-files/clients/25_update_realm__update_client_update_custom_default_scope.json b/...rces/import-files/clients/25_update_realm__update_client_update_custom_default_scope.json
@@ -19,7 +19,7 @@
           "authenticator": "docker-http-basic-authenticator",
           "requirement": "DISABLED",
           "priority": 0,
-          "userSetupAllowed": true,
+          "userSetupAllowed": false,
           "autheticatorFlow": false,
           "authenticatorFlow": false
         }
@@ -36,7 +36,7 @@
           "authenticator": "docker-http-basic-authenticator",
           "requirement": "DISABLED",
           "priority": 0,
-          "userSetupAllowed": true,
+          "userSetupAllowed": false,
           "autheticatorFlow": false,
           "authenticatorFlow": false
         }

diff --git a/...rces/import-files/clients/26_update_realm__update_client_remove_custom_default_scope.json b/...rces/import-files/clients/26_update_realm__update_client_remove_custom_default_scope.json
@@ -19,7 +19,7 @@
           "authenticator": "docker-http-basic-authenticator",
           "requirement": "DISABLED",
           "priority": 0,
-          "userSetupAllowed": true,
+          "userSetupAllowed": false,
           "autheticatorFlow": false,
           "authenticatorFlow": false
         }
@@ -36,7 +36,7 @@
           "authenticator": "docker-http-basic-authenticator",
           "requirement": "DISABLED",
           "priority": 0,
-          "userSetupAllowed": true,
+          "userSetupAllowed": false,
           "autheticatorFlow": false,
           "authenticatorFlow": false
         }

diff --git a/...resources/import-files/clients/70_create_realm__with_client_with_auth-flow-overrides.json b/...resources/import-files/clients/70_create_realm__with_client_with_auth-flow-overrides.json
@@ -13,7 +13,7 @@
           "authenticator": "docker-http-basic-authenticator",
           "requirement": "DISABLED",
           "priority": 0,
-          "userSetupAllowed": true,
+          "userSetupAllowed": false,
           "autheticatorFlow": false,
           "authenticatorFlow": false
         }

diff --git a/.../resources/import-files/clients/71_update_realm__add_client_with_auth-flow-overrides.json b/.../resources/import-files/clients/71_update_realm__add_client_with_auth-flow-overrides.json
@@ -13,7 +13,7 @@
           "authenticator": "docker-http-basic-authenticator",
           "requirement": "DISABLED",
           "priority": 0,
-          "userSetupAllowed": true,
+          "userSetupAllowed": false,
           "autheticatorFlow": false,
           "authenticatorFlow": false
         }

diff --git a/src/test/resources/import-files/clients/72_update_realm__clear_auth-flow-overrides.json b/src/test/resources/import-files/clients/72_update_realm__clear_auth-flow-overrides.json
@@ -13,7 +13,7 @@
           "authenticator": "docker-http-basic-authenticator",
           "requirement": "DISABLED",
           "priority": 0,
-          "userSetupAllowed": true,
+          "userSetupAllowed": false,
           "autheticatorFlow": false,
           "authenticatorFlow": false
         }

diff --git a/...test/resources/import-files/clients/73_update_realm__set_auth-flow-overrides-with-id.json b/...test/resources/import-files/clients/73_update_realm__set_auth-flow-overrides-with-id.json
@@ -14,7 +14,7 @@
           "authenticator": "docker-http-basic-authenticator",
           "requirement": "DISABLED",
           "priority": 0,
-          "userSetupAllowed": true,
+          "userSetupAllowed": false,
           "autheticatorFlow": false,
           "authenticatorFlow": false
         }

diff --git a/...s/exported-realm/26.0.1/master-realm.json → ...s/exported-realm/26.0.5/master-realm.json b/...s/exported-realm/26.0.1/master-realm.json → ...s/exported-realm/26.0.5/master-realm.json