Clean-up subscriptions, ensure downward compatability

Author: Lord-Grey

include/api/JsonCallbacks.h

@@ -36,7 +36,7 @@ class JsonCallbacks : public QObject
 
 	///
 	/// @brief Subscribe to future data updates given by subscription list
-	/// @param type   Array of subscriptionsm
+	/// @param type   Array of subscriptions, an empty array subscribes to all updates
 	///
 	QStringList subscribe(const QJsonArray& subscriptions);
 
@@ -56,7 +56,7 @@ class JsonCallbacks : public QObject
 
 	///
 	/// @brief Unsubscribe to future data updates given by subscription list
-	/// @param type   Array of subscriptions
+	/// @param type   Array of subscriptions, an empty array will unsubcribe all current subscriptions
 	///
 	QStringList unsubscribe(const QJsonArray& subscriptions);
 

libsrc/api/JSONRPC_schema/schema-serverinfo.json

@@ -16,18 +16,11 @@
 			"minimum": 0,
 			"maximum": 254
 		},
-		"data": {
-		  "type": ["null", "array"],
-		  "properties": {
-			"subscriptions": {
-			  "type": "array",
-			  "items": {}
-			}
-		  },
-		  "additionalProperties": false
-		},
 		"subscribe" : {
-			"type" : "array"
+			"type" : "array",
+			"items": {
+				"type" : "string"
+			}
 		},
 		"tan" : {
 			"type" : "integer"

libsrc/api/JsonAPI.cpp

@@ -719,13 +719,13 @@ void JsonAPI::handleServerInfoCommand(const QJsonObject &message, const JsonApiC
 	case SubCommand::Subscribe:
 	case SubCommand::Unsubscribe:
 	{
-		const QJsonObject &params = message["data"].toObject();
-		const QJsonArray &subscriptions = params["subscriptions"].toArray();
-		if (subscriptions.isEmpty()) {
+		QJsonValue const subscriptionsValue = message["subscribe"];
+		if (subscriptionsValue.isUndefined())
+		{
 			sendErrorReply("Invalid params", {"No subscriptions provided"}, cmd);
-			return;
 		}
 
+		const QJsonArray &subscriptions = subscriptionsValue.toArray();
 		QStringList invaliCommands;
 		if (cmd.subCommand == SubCommand::Subscribe)
 		{

libsrc/api/JsonCallbacks.cpp

@@ -124,7 +124,7 @@ bool JsonCallbacks::subscribe(const QString& cmd)
 QStringList JsonCallbacks::subscribe(const QJsonArray& subscriptions)
 {
 	QJsonArray subsArr;
-	if (subscriptions.contains("all"))
+	if (subscriptions.isEmpty())
 	{
 		for (const auto& entry : getCommands(false))
 		{
@@ -229,7 +229,7 @@ bool JsonCallbacks::unsubscribe(const Subscription::Type cmd)
 
 bool JsonCallbacks::unsubscribe(const QString& cmd)
 {
-	JsonApiSubscription subscription = ApiSubscriptionRegister::getSubscriptionInfo(cmd);
+	JsonApiSubscription const subscription = ApiSubscriptionRegister::getSubscriptionInfo(cmd);
 	if (subscription.cmd == Subscription::Unknown)
 	{
 		return false;
@@ -240,18 +240,14 @@ bool JsonCallbacks::unsubscribe(const QString& cmd)
 QStringList JsonCallbacks::unsubscribe(const QJsonArray& subscriptions)
 {
 	QJsonArray subsArr;
-	if (subscriptions.contains("all"))
-	{
-		for (const auto& entry : getCommands(false))
-		{
-			subsArr.append(entry);
-		}
-	}
-	else
+	if (subscriptions.isEmpty())
 	{
-		subsArr = subscriptions;
+		resetSubscriptions();
+		return {};
 	}
 
+	subsArr = subscriptions;
+
 	QStringList invalidSubscriptions;
 	for (auto it = subsArr.begin(); it != subsArr.end(); ++it)
 	{