Change base_url context processor into a middleware...

which makes it possible to also use it in views, making the base_url BetterView function unnecessary.

Fixes bug "'WSGIRequest' object has no attribute 'base_url'" upon creating event with calendar entry.

app/context_processors.py

@@ -3,7 +3,3 @@
 
 def now(request):
 	return {'now': timezone.now()}
-
-
-def base_url(request):
-	return {'base_url': request.build_absolute_uri('/').strip("/")}

app/middleware.py

@@ -15,3 +15,15 @@ def middleware(request):
 		return response
 
 	return middleware
+
+
+def base_url_middleware(get_response):
+	"""
+	Add base url to request
+	"""
+	def middleware(request):
+		request.base_url = request.build_absolute_uri('/').strip("/")
+
+		return get_response(request)
+
+	return middleware

app/settings.py

@@ -44,6 +44,7 @@
 	'app.middleware.last_seen_middleware',
 	'django.contrib.messages.middleware.MessageMiddleware',
 	'django.middleware.clickjacking.XFrameOptionsMiddleware',
+	'app.middleware.base_url_middleware',
 ]
 
 ROOT_URLCONF = 'app.urls'
@@ -60,7 +61,6 @@
 				'django.contrib.auth.context_processors.auth',
 				'django.contrib.messages.context_processors.messages',
 				'app.context_processors.now',
-				'app.context_processors.base_url'
 			],
 		},
 	},

app/templates/mails/registration_notification.html

@@ -5,7 +5,7 @@
 
 	<p>Beste {{ recipient }},</p>
 
-	<p>Je wordt erop geattendeerd dat {{ sender }} je heeft ingeschreven voor de activiteit <a href="{{ base_url }}{% url 'event-detail' event.pk %}">{{ event.name }}</a>.</p>
+	<p>Je wordt erop geattendeerd dat {{ sender }} je heeft ingeschreven voor de activiteit <a href="{{ request.base_url }}{% url 'event-detail' event.pk %}">{{ event.name }}</a>.</p>
 
 	<p>
 		Het is mogelijk om dit te annuleren door jezelf (via bovenstaande link) weer uit te schrijven.
@@ -14,13 +14,13 @@
 		{% endif %}
 	</p>
 
-	<p><i>Verzonden door het <a href="{{ base_url }}{% url 'home' %}">Alembic Inschrijfsysteem</a></i></p>
+	<p><i>Verzonden door het <a href="{{ request.base_url }}{% url 'home' %}">Alembic Inschrijfsysteem</a></i></p>
 
 	<hr>
 
 	<p>Dear {{ recipient }},</p>
 
-	<p>You are notified that {{ sender }} has enrolled you for the event <a href="{{ base_url }}{% url 'event-detail' event.pk %}">{{ event.name }}</a>.</p>
+	<p>You are notified that {{ sender }} has enrolled you for the event <a href="{{ request.base_url }}{% url 'event-detail' event.pk %}">{{ event.name }}</a>.</p>
 
 	<p>
 		It is possible to cancel this by disenrolling using the link above.
@@ -29,5 +29,5 @@
 		{% endif %}
 	</p>
 
-	<p><i>Sent by <a href="{{ base_url }}{% url 'home' %}">Alembic Inschrijfsysteem</a></i></p>
+	<p><i>Sent by <a href="{{ request.base_url }}{% url 'home' %}">Alembic Inschrijfsysteem</a></i></p>
 {% endblock %}

app/views/AdminView.py

@@ -19,15 +19,15 @@ class AdminView(StaffRequiredMixin, BetterView):
 	def __init__(self, route, request):
 		super().__init__(route, request)
 		# Instantiate FlowService
-		self.flow = FlowService(self.base_url() + reverse('admin-calendar-flow'))
+		self.flow = FlowService(request.base_url + reverse('admin-calendar-flow'))
 
 	def show(self, request):
 		# Get authorization URL for link
 		authorize_url = self.flow.get_authorize_url()
 
 		# Try to instantiate GoogleCalendarService and get list of calendars
 		try:
-			cal_service = GoogleCalendarService(self.base_url())
+			cal_service = GoogleCalendarService(request.base_url)
 			cals = cal_service.get_calendars()
 			active_cal = cal_service.calendar
 		except RuntimeError:
@@ -42,7 +42,7 @@ def show(self, request):
 
 	def calendar(self, request):
 		# Set 'active' calendar
-		cal_service = GoogleCalendarService(self.base_url())
+		cal_service = GoogleCalendarService(request.base_url)
 		cal_service.calendar = request.POST['calender_id']
 
 		messages.success(request, _("Kalender ingesteld!"))
@@ -55,7 +55,7 @@ def calendar_flow(self, request):
 		self.flow.exchange(request.GET['code'])
 
 		# Empty active calendar setting
-		cal_service = GoogleCalendarService(self.base_url())
+		cal_service = GoogleCalendarService(request.base_url)
 		cal_service.calendar = None
 
 		messages.success(request, _("Google-account gekoppeld!"))

app/views/CalendarView.py

@@ -10,6 +10,6 @@ class CalendarView(BetterView):
 	}
 
 	def show(self, request):
-		cal_service = GoogleCalendarService(self.base_url())
+		cal_service = GoogleCalendarService(request.base_url)
 
 		return render(request, 'calendar.html', {'calendar': cal_service.calendar})

lib/BetterView.py

@@ -67,9 +67,6 @@ def check_admin_of(self, committee):
 		if not self.request.user.is_admin_of_committee(committee):
 			raise PermissionDenied
 
-	def base_url(self):
-		return self.request.build_absolute_uri('/').strip("/")
-
 
 class StaffRequiredMixin:
 	"""