From dcd9351b1a1c1df7dcc1ac0683bc0975d124fbe7 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Mon, 30 Sep 2024 17:03:59 -0400
Subject: [PATCH] Fix setup

---
 .../java/org/elasticsearch/xpack/security/Security.java     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/Security.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/Security.java
index 3d7ef13fbeb36..b7f49f6208d1f 100644
--- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/Security.java
+++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/Security.java
@@ -860,6 +860,7 @@ Collection<Object> createComponents(
             scriptService,
             new ReservedRoleMappings(clusterStateRoleMapper)
         );
+        final UserRoleMapper userRoleMapper = getUserRoleMapper(nativeRoleMappingStore, clusterStateRoleMapper);
 
         final AnonymousUser anonymousUser = new AnonymousUser(settings);
         components.add(anonymousUser);
@@ -869,7 +870,7 @@ Collection<Object> createComponents(
             client,
             clusterService,
             resourceWatcherService,
-            nativeRoleMappingStore
+            userRoleMapper
         );
         Map<String, Realm.Factory> realmFactories = new HashMap<>(
             InternalRealms.getFactories(
@@ -878,7 +879,7 @@ Collection<Object> createComponents(
                 resourceWatcherService,
                 getSslService(),
                 nativeUsersStore,
-                nativeRoleMappingStore,
+                userRoleMapper,
                 systemIndices.getMainIndexManager()
             )
         );
@@ -900,7 +901,6 @@ Collection<Object> createComponents(
         );
         components.add(nativeUsersStore);
         components.add(new PluginComponentBinding<>(NativeRoleMappingStore.class, nativeRoleMappingStore));
-        final UserRoleMapper userRoleMapper = getUserRoleMapper(nativeRoleMappingStore, clusterStateRoleMapper);
         components.add(new PluginComponentBinding<>(UserRoleMapper.class, userRoleMapper));
         components.add(reservedRealm);
         components.add(realms);