From c7893e67db14149e8cd1e1ccf0faa55490493038 Mon Sep 17 00:00:00 2001
From: Aurélien Bompard <aurelien@bompard.org>
Date: Jul 05 2022 11:05:36 +0000
Subject: Don't redirect to the Continue endpoint on auth failure


This should prevent the "User not authenticated at continue" error.

Fixes: #361

Signed-off-by: Aurélien Bompard <aurelien@bompard.org>

---

diff --git a/ipsilon/login/common.py b/ipsilon/login/common.py
index e00d4db..d76437e 100644
--- a/ipsilon/login/common.py
+++ b/ipsilon/login/common.py
@@ -197,7 +197,12 @@ class LoginManagerBase(ConfigHelper, PluginObject, LoginHelper):
             session.logout(None)
             raise cherrypy.HTTPError(401, message)
 
-        raise cherrypy.HTTPRedirect(transdata['login_return'])
+        # Redirect to the login page
+        raise cherrypy.HTTPRedirect(
+            "%s/login?%s" % (
+                cherrypy.config.get('base.mount', ""),
+                trans.get_GET_arg())
+        )
 
     def set_auth_error(self):
         cherrypy.response.status = 401
@@ -286,10 +291,12 @@ class LoginFormBase(LoginPageBase):
         username = cookie.value
 
         target = None
+        error = None
         if self.trans is not None:
             tid = self.trans.transaction_id
             target = self.trans.retrieve().get('login_target')
             username = self.trans.retrieve().get('login_username')
+            error = self.trans.retrieve().get('message')
         if tid is None:
             tid = ''
 
@@ -306,6 +313,7 @@ class LoginFormBase(LoginPageBase):
             "other_stacks": other_stacks,
             "username": username,
             "login_target": target,
+            "error": error,
             "cancel_url": '%s/login/cancel?%s' % (self.basepath,
                                                   self.trans.get_GET_arg()),
         }