Relintai/crystal_cms_rcpp_fw
1
0
Fork 0
mirror of https://github.com/Relintai/crystal_cms_rcpp_fw.git synced 2025-04-22 20:41:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Updated the engine.

Browse Source
This commit is contained in:
Relintai 2022-01-08 12:55:06 +01:00
parent e0092f72d3
commit fab26c6186
4 changed files with 10 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HEADS
View File

@ -1 +1 @@
{"engine": {"master": "e0b76706d959df1c423c0cab27e1da851ebd6564"}}
{"engine": {"master": "bf7948be474d712cceca1694081a14d75f7bc062"}}

28
app/ccms_root.cpp
View File

@ -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<SessionSetupMiddleware>(new SessionSetupMiddleware()));
// _middlewares.push_back(Ref<UserSessionSetupMiddleware>(new UserSessionSetupMiddleware()));
// _middlewares.push_back(Ref<RBACUserSessionSetupMiddleware>(new RBACUserSessionSetupMiddleware()));
_middlewares.push_back(Ref<RBACDefaultUserSessionSetupMiddleware>(new RBACDefaultUserSessionSetupMiddleware()));
WebRoot::setup_middleware();
//WebRoot::setup_middleware();
}
void CCMSRoot::migrate() {

1
app/ccms_root.h
View File

@ -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();

4
main.cpp
View File

@ -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";