From 3201fd8d9c02a6133cac3d04543119af062359ed Mon Sep 17 00:00:00 2001 From: Phat Nguyen Date: Mon, 13 May 2024 17:43:42 +0700 Subject: [PATCH] Fix: Configuratoin failed response mesasge and failed condition handle. --- src/AgConfigure.cpp | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/src/AgConfigure.cpp b/src/AgConfigure.cpp index dfccdc6..f3dd511 100644 --- a/src/AgConfigure.cpp +++ b/src/AgConfigure.cpp @@ -411,6 +411,7 @@ bool Configuration::parse(String data, bool isLocal) { changed = true; } } else { + failedMessage = jsonValueInvalidMessage(String(jprop_displayMode), mode); jsonInvalid(); return false; @@ -503,10 +504,16 @@ bool Configuration::parse(String data, bool isLocal) { if (JSON.typeof_(root[jprop_mqttBrokerUrl]) == "string") { String broker = root[jprop_mqttBrokerUrl]; String oldBroker = jconfig[jprop_mqttBrokerUrl]; - if (broker != oldBroker) { - changed = true; - configLogInfo(String(jprop_mqttBrokerUrl), oldBroker, broker); - jconfig[jprop_mqttBrokerUrl] = broker; + if (broker.length() <= 255) { + if (broker != oldBroker) { + changed = true; + configLogInfo(String(jprop_mqttBrokerUrl), oldBroker, broker); + jconfig[jprop_mqttBrokerUrl] = broker; + } + } else { + failedMessage = "\"mqttBrokerUrl\" length should <= 255"; + jsonInvalid(); + return false; } } else { if (jsonTypeInvalid(root[jprop_mqttBrokerUrl], "string")) { @@ -528,7 +535,7 @@ bool Configuration::parse(String data, bool isLocal) { configLogInfo(String(jprop_temperatureUnit), oldUnit, unit); } } else { - jsonValueInvalidMessage(String(jprop_temperatureUnit), unit); + failedMessage = jsonValueInvalidMessage(String(jprop_temperatureUnit), unit); jsonInvalid(); return false; }