From fab26c6186b6f9c68b2887ee09831acbc1bf8281 Mon Sep 17 00:00:00 2001 From: Relintai Date: Sat, 8 Jan 2022 12:55:06 +0100 Subject: [PATCH] Updated the engine. --- HEADS | 2 +- app/ccms_root.cpp | 28 +++++++++------------------- app/ccms_root.h | 1 - main.cpp | 4 ---- 4 files changed, 10 insertions(+), 25 deletions(-) diff --git a/HEADS b/HEADS index c9b3826..7086549 100644 --- a/HEADS +++ b/HEADS @@ -1 +1 @@ -{"engine": {"master": "e0b76706d959df1c423c0cab27e1da851ebd6564"}} \ No newline at end of file +{"engine": {"master": "bf7948be474d712cceca1694081a14d75f7bc062"}} \ No newline at end of file diff --git a/app/ccms_root.cpp b/app/ccms_root.cpp index 374ea17..d0d82d8 100644 --- a/app/ccms_root.cpp +++ b/app/ccms_root.cpp @@ -6,8 +6,6 @@ #include "core/file_cache.h" -#include "core/http/handler_instance.h" - #include "core/database/database_manager.h" #include "core/html/html_builder.h" @@ -28,8 +26,8 @@ #include "menu/menu_node.h" void CCMSRoot::handle_request_main(Request *request) { - //this is a hack, until I have a simple index node, or port contentcontroller. - + // this is a hack, until I have a simple index node, or port contentcontroller. + if (try_send_wwwroot_file(request)) { return; } @@ -55,7 +53,7 @@ bool CCMSRoot::is_logged_in(Request *request) { } void CCMSRoot::index(Object *instance, Request *request) { - //ENSURE_LOGIN(request); + // ENSURE_LOGIN(request); add_menu(instance, request); @@ -98,24 +96,16 @@ void CCMSRoot::user_page_func(Object *instance, Request *request) { add_menu(instance, request); } - UserController::get_singleton()->handle_request_default(request); -} - -void CCMSRoot::setup_routes() { - WebRoot::setup_routes(); - - index_func = HandlerInstance(index, this); - main_route_map["admin"] = HandlerInstance(admin_page_func, this); - main_route_map["user"] = HandlerInstance(user_page_func, this); + UserController::get_singleton()->handle_request_main(request); } void CCMSRoot::setup_middleware() { - middlewares.push_back(HandlerInstance(::SessionManager::session_setup_middleware)); - // middlewares.push_back(HandlerInstance(::UserController::user_session_setup_middleware)); - // middlewares.push_back(HandlerInstance(::RBACUserController::rbac_user_session_setup_middleware)); - middlewares.push_back(HandlerInstance(::RBACUserController::rbac_default_user_session_middleware)); + _middlewares.push_back(Ref(new SessionSetupMiddleware())); + // _middlewares.push_back(Ref(new UserSessionSetupMiddleware())); + // _middlewares.push_back(Ref(new RBACUserSessionSetupMiddleware())); + _middlewares.push_back(Ref(new RBACDefaultUserSessionSetupMiddleware())); - WebRoot::setup_middleware(); + //WebRoot::setup_middleware(); } void CCMSRoot::migrate() { diff --git a/app/ccms_root.h b/app/ccms_root.h index d5fa564..d254412 100644 --- a/app/ccms_root.h +++ b/app/ccms_root.h @@ -43,7 +43,6 @@ public: static void admin_page_func(Object *instance, Request *request); static void user_page_func(Object *instance, Request *request); - virtual void setup_routes(); virtual void setup_middleware(); virtual void migrate(); diff --git a/main.cpp b/main.cpp index 94d3592..ffb3d6b 100644 --- a/main.cpp +++ b/main.cpp @@ -61,10 +61,6 @@ int main(int argc, char **argv, char **envp) { app->set_root(app_root); - app_root->load_settings(); - app_root->setup_routes(); - app_root->setup_middleware(); - app->add_listener("127.0.0.1", 8080); LOG_INFO << "Server running on 127.0.0.1:8080";