Preserve back param during the current session

crs4 · Oct 5, 2021 · 403175e · 403175e
1 parent f2ef7cc
commit 403175e
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/lifemonitor/auth/controllers.py b/lifemonitor/auth/controllers.py
@@ -21,7 +21,7 @@
 import logging
 
 import flask
-from flask import flash, redirect, render_template, request, url_for
+from flask import flash, redirect, render_template, request, session, url_for
 from flask_login import login_required, login_user, logout_user
 from lifemonitor.utils import (NextRouteRegistry, next_route_aware,
                                split_by_crlf, decodeBase64)
@@ -91,12 +91,15 @@ def index():
 def profile(form=None, passwordForm=None, currentView=None, back=None):
     currentView = currentView or request.args.get("currentView", 'accountsTab')
     logger.debug(OpenApiSpecs.get_instance().authorization_code_scopes)
-    back_param = request.args.get('back', False)
-    try:
-        if back_param:
-            logger.debug("detected back param: %r", back_param)
-    except Exception as e:
-        logger.error("Unable to decode back param: %s", str(e))
+    back_param = request.args.get('back', None)
+    logger.debug("detected back param: %r", back_param)
+    if not current_user.is_authenticated:
+        session['lm_back_param'] = back_param
+        logger.debug("Pushing back param to session")
+    else:
+        logger.debug("Getting back param from session")
+        back_param = back_param or session.get('lm_back_param', False)
+        logger.debug("detected back param: %s", back_param)
     return render_template("auth/profile.j2",
                            passwordForm=passwordForm or SetPasswordForm(),
                            oauth2ClientForm=form or Oauth2ClientForm(),