From 8c45c415f20166812365ee2edb3e80b30cdcb7e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Braulio=20Vargas=20L=C3=B3pez?= <brauliovl95@gmail.com>
Date: Wed, 24 Jan 2018 10:30:32 +0100
Subject: [PATCH] Fix api register agent script (#56)

---
 CHANGELOG.md                   |  9 +++++++++
 examples/api-register-agent.sh | 30 ++++++++----------------------
 2 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index de35df9d..bfb1fefb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,15 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+<<<<<<< HEAD
+=======
+## [v3.2.0]
+### Added
+- Fixed `api-register-agent.sh` script ([#56](https://github.com/wazuh/wazuh-api/pull/56)).
+- Added support for API in cluster ([#54](https://github.com/wazuh/wazuh-api/pull/54)).
+- Added new calls for cluster nodes ([#54](https://github.com/wazuh/wazuh-api/pull/54)).
+
+>>>>>>> b91090e... Fix api register agent script (#56)
 ## [v3.1.0]
 ### Added
 
diff --git a/examples/api-register-agent.sh b/examples/api-register-agent.sh
index 6dad75cf..0cfd31ea 100644
--- a/examples/api-register-agent.sh
+++ b/examples/api-register-agent.sh
@@ -29,32 +29,18 @@ fi
 echo ""
 echo "Adding agent:"
 echo "curl -s -u $USER:**** -k -X POST -d 'name=$AGENT_NAME' $PROTOCOL://$API_IP:$API_PORT/agents"
-GET_ID=$(curl -s -u $USER:"$PASSWORD" -k -X POST -d 'name='$AGENT_NAME $PROTOCOL://$API_IP:$API_PORT/agents)
-ERROR=$(echo $GET_ID | sed -rn 's/.*"error":(.+)\,.*/\1/p')
+API_RESULT=$(curl -s -u $USER:"$PASSWORD" -k -X POST -d 'name='$AGENT_NAME $PROTOCOL://$API_IP:$API_PORT/agents)
+echo -e $API_RESULT | grep -q "\"error\":0" 2>&1
 
-if [ ! "$ERROR" = "0" ]; then
-  echo $GET_ID | sed -rn 's/.*"message":"(.+)".*/\1/p'
+if [ "$?" != "0" ]; then
+  echo -e $API_RESULT | sed -rn 's/.*"message":"(.+)".*/\1/p'
   exit 1
 fi
-
-AGENT_ID=$(echo $GET_ID | sed -rn 's/.*"data":"(.+)".*/\1/p')
+# Get agent id and agent key 
+AGENT_ID=$(echo $API_RESULT | cut -d':' -f 4 | cut -d ',' -f 1)
+AGENT_KEY=$(echo $API_RESULT | cut -d':' -f 5 | cut -d '}' -f 1)
 
 echo "Agent '$AGENT_NAME' with ID '$AGENT_ID' added."
-
-# Getting agent key from Manager
-echo ""
-echo "Getting agent key:"
-echo "curl -s -u $USER:**** -k -X GET $PROTOCOL://$API_IP:$API_PORT/agents/$AGENT_ID/key"
-GET_KEY=$(curl -s -u $USER:"$PASSWORD" -k -X GET $PROTOCOL://$API_IP:$API_PORT/agents/$AGENT_ID/key)
-ERROR=$(echo $GET_KEY | sed -rn 's/.*"error":(.+)\,.*/\1/p')
-
-if [ ! "$ERROR" = "0" ]; then
-  echo $GET_KEY | sed -rn 's/.*"message":"(.+)".*/\1/p'
-  exit 1
-fi
-
-AGENT_KEY=$(echo $GET_KEY | sed -rn 's/.*"data":"(.+)".*/\1/p')
-
 echo "Key for agent '$AGENT_ID' received."
 
 # Importing key
@@ -68,4 +54,4 @@ echo "Restarting:"
 echo ""
 /var/ossec/bin/ossec-control restart
 
-exit 0
+exit 0
\ No newline at end of file