stephb9959
2023-01-26 21:14:57 -08:00
parent d5e0687ade
commit 0b35942ef6
8 changed files with 902 additions and 398 deletions

View File

@@ -87,8 +87,8 @@ namespace OpenWifi{
}
auto Config=RawObject->get("configuration").toString();
Poco::JSON::Object Answer;
std::string Error;
auto Res = ValidateUCentralConfiguration(Config,Error);
std::vector<std::string> Error;
auto Res = ValidateUCentralConfiguration(Config,Error, GetBoolParameter("strict",true));
Answer.set("valid",Res);
Answer.set("error", Error);
return ReturnObject(Answer);
@@ -124,9 +124,9 @@ namespace OpenWifi{
return BadRequest(RESTAPI::Errors::InvalidDeviceTypes);
}
RESTAPI::Errors::msg Error;
if(!ValidateConfigBlock(NewObject,Error)) {
return BadRequest(Error);
std::vector<std::string> Errors;
if(!ValidateConfigBlock(NewObject,Errors)) {
return BadRequest(RESTAPI::Errors::ConfigBlockInvalid);
}
if(DB_.CreateRecord(NewObject)) {
@@ -171,9 +171,9 @@ namespace OpenWifi{
if(!NewObject.deviceTypes.empty())
Existing.deviceTypes = NewObject.deviceTypes;
RESTAPI::Errors::msg Error;
if(!ValidateConfigBlock( NewObject,Error)) {
return BadRequest(Error);
std::vector<std::string> Errors;
if(!ValidateConfigBlock( NewObject,Errors)) {
return BadRequest(RESTAPI::Errors::ConfigBlockInvalid);
}
if(RawObject->has("configuration")) {