From 341c94ee6c1fcf337938046c3d9e882731d440e1 Mon Sep 17 00:00:00 2001
From: Gioacchino Mazzurco <gio@eigenlab.org>
Date: Fri, 15 Sep 2017 09:03:50 +0200
Subject: [PATCH] PeersHandler::handleRemoveNode only remove location

Move documentation in header
---
 libresapi/src/api/PeersHandler.cpp | 29 ++++-------------------------
 libresapi/src/api/PeersHandler.h   | 13 +++++++++++--
 2 files changed, 15 insertions(+), 27 deletions(-)

diff --git a/libresapi/src/api/PeersHandler.cpp b/libresapi/src/api/PeersHandler.cpp
index 8990a24ce..7e92a46dc 100644
--- a/libresapi/src/api/PeersHandler.cpp
+++ b/libresapi/src/api/PeersHandler.cpp
@@ -764,40 +764,19 @@ void PeersHandler::handleExamineCert(Request &req, Response &resp)
 	}
 }
 
-/**
- *  \brief Remove specific location or user
- *  
- *  \param [in] req request from user either peer_id or gpg_id is needed.
- *  \param [in] resp response to user
- *  \return 
- *  
- *  \details 
- */
 void PeersHandler::handleRemoveNode(Request &req, Response &resp)
 {
 	std::string ssl_peer_id;
-	std::string gpg_id;
 	req.mStream << makeKeyValueReference("peer_id", ssl_peer_id);
-	req.mStream << makeKeyValueReference("gpg_id", gpg_id);
 	RsPeerId peerId(ssl_peer_id);
-	RsPgpId gpgId(gpg_id);
-	
-	if(!gpgId.isNull())
-	{
-		mRsPeers->removeFriend(gpgId);
-		resp.mDataStream << makeKeyValue("gpg_id", gpg_id);
-		resp.setOk(); 
-	}
-	else if(!peerId.isNull())
+
+	if(!peerId.isNull())
 	{
 		mRsPeers->removeFriendLocation(peerId);
 		resp.mDataStream << makeKeyValue("peer_id", ssl_peer_id);
-		resp.setOk();        
-	}
-	else
-	{
-		resp.setFail("handleRemoveNode Invalid peer_id or gpg_id");
+		resp.setOk();
 	}
+	else resp.setFail("handleRemoveNode Invalid peer_id");
 }
 
 /**
diff --git a/libresapi/src/api/PeersHandler.h b/libresapi/src/api/PeersHandler.h
index acf398de4..810d8a798 100644
--- a/libresapi/src/api/PeersHandler.h
+++ b/libresapi/src/api/PeersHandler.h
@@ -72,10 +72,19 @@ private:
 
 	void handleGetNodeOptions(Request& req, Response& resp);
 	void handleSetNodeOptions(Request& req, Response& resp);
-	
+
+	/**
+	 *  \brief Remove specific location from trusted nodes
+	 *
+	 *  \param [in] req request from user either peer_id is needed.
+	 *  \param [out] resp response to user
+	 */
 	void handleRemoveNode(Request &req, Response &resp);
+
+
 	void handleGetInactiveUsers(Request &req, Response &resp);
-	// a helper which ensures proper mutex locking
+
+	/// Helper which ensures proper mutex locking
 	StateToken getCurrentStateToken();
 
 	StateTokenServer* mStateTokenServer;