瀏覽代碼

Fix unstable network member list endpoint

It was returning an array of array instead of
just array
travisladuke 1 年之前
父節點
當前提交
6e8fcce777
共有 1 個文件被更改,包括 15 次插入15 次删除
  1. 15 15
      controller/EmbeddedNetworkController.cpp

+ 15 - 15
controller/EmbeddedNetworkController.cpp

@@ -1094,26 +1094,26 @@ void EmbeddedNetworkController::configureHTTPControlPlane(
 
 
 		auto out = nlohmann::json::object();
 		auto out = nlohmann::json::object();
 		auto meta = nlohmann::json::object();
 		auto meta = nlohmann::json::object();
-		auto members = nlohmann::json::array();
 		std::vector<json> memTmp;
 		std::vector<json> memTmp;
 		if (_db.get(nwid, network, memTmp)) {
 		if (_db.get(nwid, network, 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++; }
-		}
+			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;
+			meta["totalCount"] = totalCount;
+			meta["authorizedCount"] = authorizedCount;
 
 
-		out["data"] = members;
-		out["meta"] = meta;
+			out["data"] = memTmp;
+			out["meta"] = meta;
 
 
-		setContent(req, res, out.dump());
+			setContent(req, res, out.dump());
+		} else {
+			res.status = 404;
+			return;
+		}
 	};
 	};
 	s.Get(memberListPath2, memberListGet2);
 	s.Get(memberListPath2, memberListGet2);
 	sv6.Get(memberListPath2, memberListGet2);
 	sv6.Get(memberListPath2, memberListGet2);