From e48d3f30cb85c509ed1ae8a8d232ef2e6274c6bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BD=D1=82=D0=BE=D0=BD?= Date: Tue, 7 Oct 2025 06:35:25 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=B4=D0=B3=D0=BE=D1=82=D0=BE?= =?UTF-8?q?=D0=B2=D0=BA=D0=B0=20=D0=B8=D0=BD=D1=82=D0=B5=D0=B3=D1=80=D0=B0?= =?UTF-8?q?=D1=86=D0=B8=D0=BE=D0=BD=D0=BD=D0=BE=D0=B3=D0=BE=20=D1=82=D0=B5?= =?UTF-8?q?=D1=81=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/endpoints_handlers/AuthLoginExecutor.h | 9 +++++++++ src/endpoints_handlers/AuthLogoutExecutor.h | 8 ++++++++ src/endpoints_handlers/AuthRegistrationExecutor.h | 9 +++++++++ src/main.cpp | 3 ++- src/session/HttpSession.h | 3 +++ 5 files changed, 31 insertions(+), 1 deletion(-) diff --git a/src/endpoints_handlers/AuthLoginExecutor.h b/src/endpoints_handlers/AuthLoginExecutor.h index 12f8056..5082b8e 100644 --- a/src/endpoints_handlers/AuthLoginExecutor.h +++ b/src/endpoints_handlers/AuthLoginExecutor.h @@ -5,6 +5,8 @@ #include #include #include +#include +#include #include "IExecutor.h" #include "../DAO/IUserDAO.h" @@ -38,6 +40,8 @@ public: using namespace boost::beast; using namespace std::string_literals; + // BOOST_LOG_TRIVIAL(info) << "Auth/Login - Request"; + const auto body = req.body(); value req_json; @@ -47,6 +51,7 @@ public: } catch (const system::system_error& err) { + // BOOST_LOG_TRIVIAL(error) << "Auth/Login - Error 400"; throw session_exception(http::status::bad_request, "cannot deserialize json"); } @@ -56,6 +61,7 @@ public: if (login.empty() || password.empty()) { + // BOOST_LOG_TRIVIAL(error) << "Auth/Login - Error 422"; throw session_exception(http::status::unprocessable_entity, "Login or password are empty"s); } @@ -63,6 +69,7 @@ public: if (!maybe_user.has_value() && maybe_user.value().hashed_password != HashPassword(password)) { + // BOOST_LOG_TRIVIAL(error) << "Auth/Login - Error 403"; throw session_exception(http::status::forbidden,"Incorrect login or password"); } const std::string token = GenerateUUID(); @@ -78,6 +85,8 @@ public: res.set(http::field::content_type, "application/json"); res.content_length(res.body().size()); + // BOOST_LOG_TRIVIAL(info) << "Auth/Login - Success - 200"; + return res; } }; diff --git a/src/endpoints_handlers/AuthLogoutExecutor.h b/src/endpoints_handlers/AuthLogoutExecutor.h index f543d0c..4a56693 100644 --- a/src/endpoints_handlers/AuthLogoutExecutor.h +++ b/src/endpoints_handlers/AuthLogoutExecutor.h @@ -5,6 +5,8 @@ #include #include #include +#include +#include #include "IExecutor.h" #include "../DAO/IUserDAO.h" @@ -35,6 +37,8 @@ public: using namespace boost::beast; using namespace std::string_literals; + // BOOST_LOG_TRIVIAL(info) << "Auth/Logout - Request"; + const auto body = req.body(); value req_json; @@ -44,6 +48,7 @@ public: } catch (const system::system_error& err) { + // BOOST_LOG_TRIVIAL(error) << "Auth/Login - Error 500"; throw session_exception(http::status::internal_server_error, "cannot deserialize json"s); } @@ -51,6 +56,7 @@ public: if (!auth_dao_->Logout(token)) { + // BOOST_LOG_TRIVIAL(error) << "Auth/Login - Error 400"; throw session_exception(http::status::bad_request, "token is not authorized"s); } @@ -60,6 +66,8 @@ public: res.set(http::field::content_type, "application/json"); res.content_length(res.body().size()); + // BOOST_LOG_TRIVIAL(info) << "Auth/Login - Success 200"; + return res; } }; diff --git a/src/endpoints_handlers/AuthRegistrationExecutor.h b/src/endpoints_handlers/AuthRegistrationExecutor.h index 7506f18..9d1898e 100644 --- a/src/endpoints_handlers/AuthRegistrationExecutor.h +++ b/src/endpoints_handlers/AuthRegistrationExecutor.h @@ -3,6 +3,8 @@ #include #include #include +#include +#include #include "IExecutor.h" #include "../DAO/IUserDAO.h" @@ -32,6 +34,8 @@ public: using namespace boost::beast; using namespace std::string_literals; + // BOOST_LOG_TRIVIAL(info) << "Auth/Registration - Request"; + const auto& body = req.body(); value req_json; @@ -41,6 +45,7 @@ public: } catch (const system::system_error& err) { + // BOOST_LOG_TRIVIAL(error) << "Auth/Logout - Error 400"; throw session_exception(http::status::bad_request, "cannot deserialize json"); } @@ -49,6 +54,7 @@ public: if (!ValidateLogin(login) || !ValidatePassword(password)) { + // BOOST_LOG_TRIVIAL(error) << "Auth/Logout - Error 422"; throw session_exception( http::status::unprocessable_entity, "Validations failed. Login should have length from 3 to 50. Password from 5 characters length."s @@ -57,6 +63,7 @@ public: if (user_dao_->GetByLogin(login).has_value()) { + // BOOST_LOG_TRIVIAL(error) << "Auth/Logout - Error 409"; throw session_exception(http::status::conflict, "user with login "s + login + " exists"s); } @@ -87,6 +94,8 @@ public: res.set(http::field::content_type, "application/json"); res.content_length(res.body().size()); + // BOOST_LOG_TRIVIAL(info) << "Auth/Logout - Created 201"; + return res; } diff --git a/src/main.cpp b/src/main.cpp index bb9b3f8..0420ed3 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,4 +1,5 @@ #ifdef WIN32 +#define _WIN32_WINNT 0x0602 #include #endif @@ -63,7 +64,7 @@ int main(int argc, char* argv[]) net::signal_set signals(ioc, SIGINT, SIGTERM); signals.async_wait([&](beast::error_code const&, int) { ioc.stop(); }); - BOOST_LOG_TRIVIAL(error) << "Приложение запущено"; + BOOST_LOG_TRIVIAL(info) << "Приложение запущено"; std::vector v; v.reserve(threads - 1); diff --git a/src/session/HttpSession.h b/src/session/HttpSession.h index 1fbf127..73639f0 100644 --- a/src/session/HttpSession.h +++ b/src/session/HttpSession.h @@ -3,6 +3,9 @@ #include #include #include +#include +#include +#include namespace uad {