update buckler middleware

buckler_aiohttp.py

@@ -16,8 +16,8 @@ async def buckler_session(request, handler):
 	Verifies the user with the configured Buckler app and retrieves any
 	session data they may have. Redirects them to the login page otherwise.
 	"""
-	user_id = request.cookies.get('userid')
+	user_id = request.cookies.get('userid', '')
-	user_sid = request.cookies.get('session')
+	user_sid = request.cookies.get('session', '')
 
 	url = config.buckler['url'] + '/get_session'
 	params = {
@@ -30,7 +30,14 @@ async def buckler_session(request, handler):
 		async with session.get(url, params=params) as resp:
 			data = await resp.json()
 			if data.get('error'):
-				raise web.HTTPFound(location=config.buckler['login_url'])
+				resp = web.HTTPFound(config.buckler['login_url'])
+				resp.set_cookie(
+					'redirect',
+					request.url,
+					secure=True,
+					httponly=True)
+					#samesite='strict')
+				raise resp
 			request['session'] = data['session_data']
 			request['meta'] = data['meta']
 
@@ -51,11 +58,13 @@ async def buckler_session(request, handler):
 				max_age=30*24*60*60,
 				secure=True,
 				httponly=True)
+				#samesite='strict')
 			resp.set_cookie(
 				'session',
 				user_sid,
 				max_age=30*24*60*60,
 				secure=True,
 				httponly=True)
+				#samesite='strict')
 
 	return resp