andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-07 08:19:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

minor text changes

Browse Source
This commit is contained in:
Proddy
2021-10-11 16:41:44 +02:00
parent 6433d5f744
commit 3113d392ac
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/web/WebAPIService.cpp
View File

@@ -162,14 +162,13 @@ void WebAPIService::parse(AsyncWebServerRequest * request, std::string & device_
} }
} }
// now go and verify the values // device checks
// device check
if (device_s.empty()) { if (device_s.empty()) {
// see if we have a device embedded in the json body, then use that // see if we have a device embedded in the json body, then use that
send_message_response(request, 422, "Missing device"); // Unprocessable Entity send_message_response(request, 422, "Missing device"); // Unprocessable Entity
return; return;
} }
device_type = EMSdevice::device_name_2_device_type(device_s.c_str()); device_type = EMSdevice::device_name_2_device_type(device_s.c_str());
if (device_type == EMSdevice::DeviceType::UNKNOWN) { if (device_type == EMSdevice::DeviceType::UNKNOWN) {
send_message_response(request, 422, "Invalid call"); // Unprocessable Entity send_message_response(request, 422, "Invalid call"); // Unprocessable Entity
@@ -182,6 +181,7 @@ void WebAPIService::parse(AsyncWebServerRequest * request, std::string & device_
auto method = request->method(); auto method = request->method();
bool have_data = !value_s.empty(); bool have_data = !value_s.empty();
bool authenticated = false; bool authenticated = false;
EMSESP::webSettingsService.read([&](WebSettings & settings) { EMSESP::webSettingsService.read([&](WebSettings & settings) {
Authentication authentication = _securityManager->authenticateRequest(request); Authentication authentication = _securityManager->authenticateRequest(request);
authenticated = settings.notoken_api | AuthenticationPredicates::IS_ADMIN(authentication); authenticated = settings.notoken_api | AuthenticationPredicates::IS_ADMIN(authentication);
@@ -252,7 +252,7 @@ void WebAPIService::send_message_response(AsyncWebServerRequest * request, uint1
request->send(response); request->send(response);
} }
EMSESP::logger().debug(F("API returns, code: %d, message: %s"), error_code, error_message); EMSESP::logger().debug(F("API return code: %d, message: %s"), error_code, error_message);
} }
/** /**