From 9aa2e6419963e3a5fe105700110700003c841bda Mon Sep 17 00:00:00 2001
From: Relintai <relintai@protonmail.com>
Date: Sun, 31 Oct 2021 02:07:50 +0100
Subject: [PATCH] Updated the engine, and added a redirect to the login page
 from index if the user is not logged in.

---
 HEADS                      |  2 +-
 app/mourne_application.cpp | 19 +++++++++++++------
 app/mourne_application.h   |  7 +++++++
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/HEADS b/HEADS
index 9fcf904..6e71e1c 100644
--- a/HEADS
+++ b/HEADS
@@ -1 +1 @@
-{"engine": {"master": "594ab744c52b4697464a49bf09f9895d97eb8723"}}
\ No newline at end of file
+{"engine": {"master": "8e4bb75bcb12fcab39b4fd874fb279b7620bfaab"}}
\ No newline at end of file
diff --git a/app/mourne_application.cpp b/app/mourne_application.cpp
index 087b624..27ef565 100644
--- a/app/mourne_application.cpp
+++ b/app/mourne_application.cpp
@@ -17,7 +17,20 @@
 #include "modules/users/user.h"
 #include "modules/users/user_controller.h"
 
+bool MourneApplication::ensure_login(Request *request) {
+	Ref<User> u = request->reference_data["user"];
+
+	if (!u.is_valid()) {
+		request->send_redirect("/user/login");
+		return false;
+	}
+
+	return true;
+}
+
 void MourneApplication::index(Object *instance, Request *request) {
+	ENSURE_LOGIN(request);
+
 	add_menu(request, MENUENTRY_NEWS);
 
 	/*
@@ -45,12 +58,6 @@ void MourneApplication::index(Object *instance, Request *request) {
 }
 
 void MourneApplication::session_middleware_func(Object *instance, Request *request) {
-	std::cout << "test: session_middleware_func called" << std::endl;
-
-	//if fail
-	//request->send(); in middleware
-
-	request->next_stage();
 }
 
 void MourneApplication::add_menu(Request *request, const MenuEntries index) {
diff --git a/app/mourne_application.h b/app/mourne_application.h
index eb4692a..8b6fc3b 100644
--- a/app/mourne_application.h
+++ b/app/mourne_application.h
@@ -10,6 +10,11 @@
 #include "modules/paged_article/paged_article.h"
 #include "modules/paged_list/paged_list.h"
 
+#define ENSURE_LOGIN(request) \
+	if (!ensure_login(request)) { \
+		return;\
+	}
+
 class MourneApplication : public DWebApplication {
 public:
 	enum MenuEntries {
@@ -29,6 +34,8 @@ public:
 	};
 
 public:
+	static bool ensure_login(Request *request);
+
 	static void index(Object *instance, Request *request);
 
 	static void session_middleware_func(Object *instance, Request *request);