Return tan to API requests whenever possible

hyperion-project · Sep 11, 2020 · 2260155 · 2260155
1 parent 8bb5833
commit 2260155
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/include/api/JsonAPI.h b/include/api/JsonAPI.h
@@ -280,7 +280,7 @@ private slots:
 	///
 	/// Handle an incoming JSON message of unknown type
 	///
-	void handleNotImplemented();
+	void handleNotImplemented(const QString &command, int tan);
 
 	///
 	/// Send a standard reply indicating success

diff --git a/libsrc/api/JsonAPI.cpp b/libsrc/api/JsonAPI.cpp
@@ -97,23 +97,25 @@ void JsonAPI::handleMessage(const QString &messageString, const QString &httpAut
 		return;
 	}
 
+	int tan = -1;
+	if (message.value("tan") != QJsonValue::Undefined)
+		tan = message["tan"].toInt();
+
 	// check basic message
 	if (!JsonUtils::validate(ident, message, ":schema", _log))
 	{
-		sendErrorReply("Errors during message validation, please consult the Hyperion Log.");
+		sendErrorReply("Errors during message validation, please consult the Hyperion Log.", "" /*command*/, tan);
 		return;
 	}
 
 	// check specific message
 	const QString command = message["command"].toString();
 	if (!JsonUtils::validate(ident, message, QString(":schema-%1").arg(command), _log))
 	{
-		sendErrorReply("Errors during specific message validation, please consult the Hyperion Log", command);
+		sendErrorReply("Errors during specific message validation, please consult the Hyperion Log", command, tan);
 		return;
 	}
 
-	int tan = message["tan"].toInt();
-
 	// client auth before everything else but not for http
 	if (!_noListener && command == "authorize")
 	{
@@ -177,12 +179,12 @@ void JsonAPI::handleMessage(const QString &messageString, const QString &httpAut
 	else if (command == "clearall")
 		handleClearallCommand(message, command, tan);
 	else if (command == "transform" || command == "correction" || command == "temperature")
-		sendErrorReply("The command " + command + "is deprecated, please use the Hyperion Web Interface to configure");
+		sendErrorReply("The command " + command + "is deprecated, please use the Hyperion Web Interface to configure", command, tan);
 	// END
 
 	// handle not implemented commands
 	else
-		handleNotImplemented();
+		handleNotImplemented(command, tan);
 }
 
 void JsonAPI::handleColorCommand(const QJsonObject &message, const QString &command, int tan)
@@ -1426,9 +1428,9 @@ void JsonAPI::handleLedDeviceCommand(const QJsonObject &message, const QString &
 	}
 }
 
-void JsonAPI::handleNotImplemented()
+void JsonAPI::handleNotImplemented(const QString &command, int tan)
 {
-	sendErrorReply("Command not implemented");
+	sendErrorReply("Command not implemented", command, tan);
 }
 
 void JsonAPI::sendSuccessReply(const QString &command, int tan)