Improve members2 endpoint

Move members list data inside data[]

Putting the actual data inside data[]
lets you extend the response without breaking changes.

Added totalCount and authorized count to meta{}

Author: laduke

controller/EmbeddedNetworkController.cpp

@@ -872,7 +872,7 @@ void EmbeddedNetworkController::configureHTTPControlPlane(
 	std::string networkPath = "/controller/network/([0-9a-fA-F]{16})";
 	std::string oldAndBustedNetworkCreatePath = "/controller/network/([0-9a-fA-F]{10})______";
 	std::string memberListPath = "/controller/network/([0-9a-fA-F]{16})/member";
-	std::string memberListPath2 = "/controller/network/([0-9a-fA-F]{16})/member2";
+	std::string memberListPath2 = "/unstable/controller/network/([0-9a-fA-F]{16})/member";
 	std::string memberPath = "/controller/network/([0-9a-fA-F]{16})/member/([0-9a-fA-F]{10})";
 
 	auto controllerGet = [&, setContent](const httplib::Request &req, httplib::Response &res) {
@@ -1045,12 +1045,27 @@ void EmbeddedNetworkController::configureHTTPControlPlane(
 			return;
 		}
 
-		auto out = nlohmann::json::array();
+		auto out = nlohmann::json::object();
+		auto meta = nlohmann::json::object();
+		auto members = nlohmann::json::array();
 		std::vector<json> memTmp;
 		if (_db.get(nwid, network, memTmp)) {
-			out.push_back(memTmp);
+			members.push_back(memTmp);
 		}
 
+		uint64_t authorizedCount = 0;
+		uint64_t totalCount = memTmp.size();
+		for (auto m = memTmp.begin(); m != memTmp.end(); ++m) {
+			bool a = OSUtils::jsonBool((*m)["authorized"], 0);
+			if (a) { authorizedCount++; }
+		}
+
+		meta["totalCount"] = totalCount;
+		meta["authorizedCount"] = authorizedCount;
+
+		out["data"] = members;
+		out["meta"] = meta;
+
 		setContent(req, res, out.dump());
 	};
 	s.Get(memberListPath2, memberListGet2);