diff --git a/include/http.hpp b/include/http.hpp index 3f2b68f..0fb605e 100644 --- a/include/http.hpp +++ b/include/http.hpp @@ -12,8 +12,8 @@ public: static void https_required(std::shared_ptr response); static void bad_json(std::shared_ptr response); static void bad_json(std::shared_ptr response); - static void bad_object(std::shared_ptr response); - static void bad_object(std::shared_ptr response); + static void bad_request(std::shared_ptr response); + static void bad_request(std::shared_ptr response); static void not_found(std::shared_ptr response); static void not_found(std::shared_ptr response); }; \ No newline at end of file diff --git a/src/http.cpp b/src/http.cpp index e0b0d12..64f16ab 100644 --- a/src/http.cpp +++ b/src/http.cpp @@ -1,49 +1,26 @@ #include #include -const auto https_required_msg = json::object({ - {"message", "100: Your server is configured to use https, but a " - "request on http was received."}, -}); +// const auto https_required_msg = json::object({ +// {"message", "100: Your server is configured to use https, but a " +// "request on http was received."}, +// }); -const auto bad_json_msg = json::object({ - {"message", "101: Your request was not a valid JSON document."}, -}); +// const auto bad_json_msg = json::object({ +// {"message", "101: Your request was not a valid JSON document."}, +// }); const auto bad_object_msg = json::object({ {"message", "102: Your request was not a valid store."}, }); -void response::https_required(std::shared_ptr response) { - return response->write(Status::client_error_bad_request, - https_required_msg.dump(), - {header_access_control, header_application_data}); -} - -void response::https_required(std::shared_ptr response) { - return response->write(Status::client_error_bad_request, - https_required_msg.dump(), - {header_access_control, header_application_data}); -} - -void response::bad_json(std::shared_ptr response) { - return response->write(Status::client_error_bad_request, bad_json_msg.dump(), - {header_access_control, header_application_data}); -} - -void response::bad_json(std::shared_ptr response) { - return response->write(Status::client_error_bad_request, bad_json_msg.dump(), - {header_access_control, header_application_data}); -} - - -void response::bad_object(std::shared_ptr response) { +void response::bad_request(std::shared_ptr response) { return response->write(Status::client_error_bad_request, bad_object_msg.dump(), {header_access_control, header_application_data}); } -void response::bad_object(std::shared_ptr response) { +void response::bad_request(std::shared_ptr response) { return response->write(Status::client_error_bad_request, bad_object_msg.dump(), {header_access_control, header_application_data}); diff --git a/src/store.cpp b/src/store.cpp index e9a2776..378d387 100644 --- a/src/store.cpp +++ b/src/store.cpp @@ -81,7 +81,7 @@ int Application::run() { const auto json_response = dat.process(data); if (json_response.is_null()) { - return response::bad_object(response); + return response::bad_request(response); } response->write(Status::success_created, json_response.dump(),