From c0c240762a4d4987235706f2a09f05ab58ab69d9 Mon Sep 17 00:00:00 2001 From: Alexander Schwartz Date: Thu, 6 Aug 2026 19:50:40 +0900 Subject: [PATCH] Allow members to be added to organizations Closes #51331 Signed-off-by: Alexander Schwartz (cherry picked from commit 29556d30714eaad864950d36a1bbd1481833c963) --- .github/actions/conditional/conditions | 1 + .../organization/InfinispanOrganizationProvider.java | 4 +++- .../java/org/keycloak/tests/suites/StatelessTestSuite.java | 4 +++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/actions/conditional/conditions b/.github/actions/conditional/conditions index 407f077ef79d..e6c46f1ed147 100644 --- a/.github/actions/conditional/conditions +++ b/.github/actions/conditional/conditions @@ -32,6 +32,7 @@ quarkus/ ci-quarkus guides model/ ci-store testsuite/model/ ci-store +tests/base/src/test/java/org/keycloak/tests/suites/StatelessTestSuite.java ci-store operator/ operator testsuite/integration-arquillian/tests/other/sssd/ ci-sssd diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/organization/InfinispanOrganizationProvider.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/organization/InfinispanOrganizationProvider.java index 4ea6dacc94de..57461d5642f3 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/organization/InfinispanOrganizationProvider.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/organization/InfinispanOrganizationProvider.java @@ -520,7 +520,9 @@ void registerMemberInvalidation(OrganizationModel organization, UserModel member } void registerOrgGroupsMembershipInvalidation(OrganizationModel organization, UserModel member) { - userCache.registerInvalidation(cacheKeyOrgGroupsByMember(organization, member)); + if (userCache != null) { + userCache.registerInvalidation(cacheKeyOrgGroupsByMember(organization, member)); + } } private boolean isRealmCacheKeyInvalid(String cacheKey) { diff --git a/tests/base/src/test/java/org/keycloak/tests/suites/StatelessTestSuite.java b/tests/base/src/test/java/org/keycloak/tests/suites/StatelessTestSuite.java index 697b471bb32e..c54be8d8019e 100644 --- a/tests/base/src/test/java/org/keycloak/tests/suites/StatelessTestSuite.java +++ b/tests/base/src/test/java/org/keycloak/tests/suites/StatelessTestSuite.java @@ -10,6 +10,7 @@ import org.keycloak.tests.model.UserSessionProviderOfflineTest; import org.keycloak.tests.model.UserSessionProviderTest; import org.keycloak.tests.oauth.RefreshTokenTimeoutsTest; +import org.keycloak.tests.organization.admin.OrganizationMemberTest; import org.keycloak.tests.session.SessionTimeoutValidationTest; import org.keycloak.tests.sessionlimits.UserSessionLimitsTest; @@ -27,7 +28,8 @@ UserSessionProviderOfflineTest.class, UserSessionLimitsTest.class, SessionTimeoutValidationTest.class, - LoginFailureExpirationTest.class + LoginFailureExpirationTest.class, + OrganizationMemberTest.class }) public class StatelessTestSuite {