From 192c10738d96fd3ef662684f3fb736b328ad2b34 Mon Sep 17 00:00:00 2001
From: Federico Rodriguez <federico.rodriguez@wazuh.com>
Date: Wed, 13 Dec 2023 20:41:51 +0100
Subject: [PATCH] Fix the register agent selected cluster/manager config
 endpoint  (#6213)

* Fix the cluster conditional to choose the endpoints

* Add changelog
---
 CHANGELOG.md                                  |  4 ++--
 .../services/register-agent-services.tsx      | 24 +++++++++++++------
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dbb1b0707e..127e4c8580 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,14 +6,14 @@ All notable changes to the Wazuh app project will be documented in this file.
 
 ### Added
 
-- Added contextual information in the register agent commands [#6208](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6208)
 - Support for Wazuh 4.7.2
+- Added contextual information in the register agent commands [#6208](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6208)
 - Added host name and board serial information to Agents > Inventory data [#6191](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6191)
 
 ### Fixed
 
 - Fixed Agents preview page load when there are no registered agents [#6185](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6185)
-- Fixed the endpoint to get Wazuh server auth configuration [#6206](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6206)
+- Fixed the endpoint to get Wazuh server auth configuration [#6206](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6206) [#6213](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6213)
 
 ## Wazuh v4.7.1 - OpenSearch Dashboards 2.8.0 - Revision 01
 
diff --git a/plugins/main/public/controllers/register-agent/services/register-agent-services.tsx b/plugins/main/public/controllers/register-agent/services/register-agent-services.tsx
index 71c3b1dc15..82377255e8 100644
--- a/plugins/main/public/controllers/register-agent/services/register-agent-services.tsx
+++ b/plugins/main/public/controllers/register-agent/services/register-agent-services.tsx
@@ -42,7 +42,10 @@ export const clusterStatusResponse = async (): Promise<boolean> => {
 /**
  * Get the remote configuration from api
  */
-async function getRemoteConfiguration(nodeName: string): Promise<RemoteConfig> {
+async function getRemoteConfiguration(
+  nodeName: string,
+  clusterStatus: boolean,
+): Promise<RemoteConfig> {
   let config: RemoteConfig = {
     name: nodeName,
     isUdp: false,
@@ -50,7 +53,6 @@ async function getRemoteConfiguration(nodeName: string): Promise<RemoteConfig> {
   };
 
   try {
-    const clusterStatus = await clusterStatusResponse();
     let result;
     if (clusterStatus) {
       result = await WzRequest.apiReq(
@@ -97,8 +99,8 @@ async function getRemoteConfiguration(nodeName: string): Promise<RemoteConfig> {
  * @param node
  * @returns
  */
-async function getAuthConfiguration(node?: string) {
-  const authConfigUrl = node
+async function getAuthConfiguration(node: string, clusterStatus: boolean) {
+  const authConfigUrl = clusterStatus
     ? `/cluster/${node}/configuration/auth/auth`
     : '/manager/configuration/auth/auth';
   const result = await WzRequest.apiReq('GET', authConfigUrl, {});
@@ -131,7 +133,11 @@ async function getConnectionConfig(
   const nodeIp = nodeSelected?.value;
   if (!defaultServerAddress) {
     if (nodeSelected.nodetype !== 'custom') {
-      const remoteConfig = await getRemoteConfiguration(nodeName);
+      const clusterStatus = await clusterStatusResponse();
+      const remoteConfig = await getRemoteConfiguration(
+        nodeName,
+        clusterStatus,
+      );
       return {
         serverAddress: nodeIp,
         udpProtocol: remoteConfig.isUdp,
@@ -232,8 +238,12 @@ export const getMasterNode = (nodeIps: any[]): any[] => {
 export const getMasterConfiguration = async () => {
   const nodes = await fetchClusterNodesOptions();
   const masterNode = getMasterNode(nodes);
-  const remote = await getRemoteConfiguration(masterNode[0].label);
-  const auth = await getAuthConfiguration(masterNode[0].label);
+  const clusterStatus = await clusterStatusResponse();
+  const remote = await getRemoteConfiguration(
+    masterNode[0].label,
+    clusterStatus,
+  );
+  const auth = await getAuthConfiguration(masterNode[0].label, clusterStatus);
   return {
     remote,
     auth,