change session hint technique

1 files changed, 10 insertions, 18 deletions

diff --git a/talerbank/app/views.py b/talerbank/app/views.py
index e8862c1..924ba23 100644
--- a/talerbank/app/views.py
+++ b/talerbank/app/views.py
@@ -201,21 +201,13 @@ def get_session_flag(request, name):
 # @param request the HTTP request being served.
 # @param name hint name
 # @return the hint (a "null" one if none was found)
-def get_session_hint(request, hintId):
-    if hintId in request.session:
-        ret = request.session[hintId]
-        del request.session[hintId]
-        return ret
-    return True, None
+def get_session_hint(request):
+    if "hint" in request.session:
+        del request.session["hint"]
+    return request.session.get("hint", (True, ""))
 
-def set_profile_hint(request, *, success, hint):
-    set_session_hint(
-        request, "profile_hint", success=success, hint=hint
-    )
-
-
-def set_session_hint(request, hintId, *, success, hint):
-    if hintId in request.session:
+def set_session_hint(request, *, success, hint):
+    if "hint" in request.session:
         LOGGER.warning(f"Overriding a non consumed hint: {hintId}")
         del request.session[hintId]
     request.session[hintId] = success, hint
@@ -324,7 +316,7 @@ def profile_page(request):
                 wtf.cleaned_data.get("subject"),
             )
 
-            set_profile_hint(
+            set_session_hint(
                 request, success=True, hint="Wire transfer successful!"
             )
 
@@ -502,7 +494,7 @@ def register(request):
             {"wrong": True, "hint": "Out of business, cannot admit new customers."},
         )
 
-    set_profile_hint(
+    set_session_hint(
         request, success=True, hint="Registration successful!"
     )
 
@@ -1221,7 +1213,7 @@ def confirm_withdrawal(request, withdraw_id):
             op.selected_reserve_pub,
         )
 
-        set_profile_hint(
+        set_session_hint(
             request, success=True, hint="Withdrawal successful!"
         )
         request.session["just_withdrawn"] = True
@@ -1408,7 +1400,7 @@ def withdraw_abort_internal(wid):
 @login_required
 def abort_withdrawal(request, withdraw_id):
     internal_status = withdraw_abort_internal(withdraw_id)
-    set_profile_hint(request, success=internal_status["status"] == 200, hint=internal_status["hint"])
+    set_session_hint(request, success=internal_status["status"] == 200, hint=internal_status["hint"])
     return redirect("profile")