From 9f094cfdf49542aada19700cc9525487c660f587 Mon Sep 17 00:00:00 2001
From: Relintai <relintai@protonmail.com>
Date: Wed, 10 Nov 2021 20:56:21 +0100
Subject: [PATCH] Updated the engine to the latest.

---
 HEADS                        | 2 +-
 app/ccms_application.cpp     | 7 +++++--
 app/ccms_user_controller.cpp | 2 +-
 app/ccms_user_controller.h   | 6 +++---
 main.cpp                     | 4 ++--
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/HEADS b/HEADS
index 3d4c7f3..dc2286c 100644
--- a/HEADS
+++ b/HEADS
@@ -1 +1 @@
-{"engine": {"master": "adf847580462039e92b9b2181138136ec2928229"}}
\ No newline at end of file
+{"engine": {"master": "5872d9d74fb4fd74bc7401fb399951a2489b8811"}}
\ No newline at end of file
diff --git a/app/ccms_application.cpp b/app/ccms_application.cpp
index 517e8a3..cb82e6b 100644
--- a/app/ccms_application.cpp
+++ b/app/ccms_application.cpp
@@ -15,7 +15,8 @@
 #include "core/http/session_manager.h"
 
 #include "modules/users/user.h"
-#include "modules/users/user_controller.h"
+//#include "modules/users/user_controller.h"
+#include "modules/rbac_users/rbac_user_controller.h"
 
 #include "modules/admin_panel/admin_panel.h"
 #include "modules/rbac/rbac_controller.h"
@@ -235,7 +236,9 @@ void CCMSApplication::setup_routes() {
 
 void CCMSApplication::setup_middleware() {
 	middlewares.push_back(HandlerInstance(::SessionManager::session_setup_middleware));
-	middlewares.push_back(HandlerInstance(::UserController::user_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));
 
 	DWebApplication::setup_middleware();
 }
diff --git a/app/ccms_user_controller.cpp b/app/ccms_user_controller.cpp
index d44239b..cac80fa 100644
--- a/app/ccms_user_controller.cpp
+++ b/app/ccms_user_controller.cpp
@@ -184,7 +184,7 @@ void CCMSUserController::render_settings_request(Ref<User> &user, Request *reque
 }
 
 CCMSUserController::CCMSUserController() :
-		UserController() {
+		RBACUserController() {
 }
 
 CCMSUserController::~CCMSUserController() {
diff --git a/app/ccms_user_controller.h b/app/ccms_user_controller.h
index e795f18..bfcbb55 100644
--- a/app/ccms_user_controller.h
+++ b/app/ccms_user_controller.h
@@ -1,7 +1,7 @@
 #ifndef CCMS_USER_CONTROLLER_H
 #define CCMS_USER_CONTROLLER_H
 
-#include "modules/users/user_controller.h"
+#include "modules/rbac_users/rbac_user_controller.h"
 
 #include <string>
 #include "modules/users/user.h"
@@ -9,8 +9,8 @@
 class Request;
 class FormValidator;
 
-class CCMSUserController : public UserController {
-	RCPP_OBJECT(CCMSUserController, UserController);
+class CCMSUserController : public RBACUserController {
+	RCPP_OBJECT(CCMSUserController, RBACUserController);
 public:
 	void render_login_request_default(Request *request, LoginRequestData *data);
 	void render_register_request_default(Request *request, RegisterRequestData *data);
diff --git a/main.cpp b/main.cpp
index c64c086..2f40789 100644
--- a/main.cpp
+++ b/main.cpp
@@ -23,7 +23,7 @@
 
 #include "app/ccms_user_controller.h"
 #include "modules/users/user.h"
-#include "modules/users/user_model.h"
+#include "modules/rbac_users/rbac_user_model.h"
 
 #include "core/database/database_manager.h"
 #include "platform/platform_initializer.h"
@@ -63,7 +63,7 @@ int main(int argc, char **argv, char **envp) {
 
 	//todo init these in the module automatically
 	UserController *user_controller = new CCMSUserController();
-	UserModel *user_model = new UserModel();
+	RBACUserModel *user_model = new RBACUserModel();
 	//user_manager->set_path("./users/");
 
 	Settings *settings = new Settings(true);