From 37544700d5eb557544841a7cbb3e2db3ee2b0dda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Madis=20M=C3=A4gi?= <madis.magi@k-space.ee>
Date: Mon, 29 Jul 2024 06:42:40 +0300
Subject: [PATCH] Fix login endpoint redirect

---
 inventory-app/inventory.py                         | 2 ++
 inventory-app/main.py                              | 2 +-
 inventory-app/templates/inventory_view_public.html | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/inventory-app/inventory.py b/inventory-app/inventory.py
index 4a68a0a..acb195b 100644
--- a/inventory-app/inventory.py
+++ b/inventory-app/inventory.py
@@ -1,5 +1,6 @@
 import boto3
 import pymongo
+import urllib
 from datetime import datetime, date, timedelta
 from botocore.exceptions import ClientError
 from bson.objectid import ObjectId
@@ -30,6 +31,7 @@ def view_inventory_view(item_id):
         if not item["inventory"].get("public"):
             return do_login()
         template = "inventory_view_public.html"
+        redirect_url = urllib.parse.quote_plus(request.full_path)
     else:
         can_audit = "k-space:janitors" in user["groups"]
         can_edit = check_edit_permission(item_id)
diff --git a/inventory-app/main.py b/inventory-app/main.py
index 12a435b..d709595 100755
--- a/inventory-app/main.py
+++ b/inventory-app/main.py
@@ -208,7 +208,7 @@ def name_check(form, field):
 @app.route("/login")
 @login_required
 def login_dummy():
-    return redirect("/m/inventory")
+    return redirect(request.args.get("redirect_url", "/m/inventory"))
 
 @app.route("/")
 def index():
diff --git a/inventory-app/templates/inventory_view_public.html b/inventory-app/templates/inventory_view_public.html
index 2383ddb..0ffa6ad 100644
--- a/inventory-app/templates/inventory_view_public.html
+++ b/inventory-app/templates/inventory_view_public.html
@@ -1,7 +1,7 @@
 {% extends 'base.html' %}
 {% block content %}
 <div class="container">
-<h6>Please <a href="/login">log in</a> to see more details</h6>
+<h6>Please <a href="/login?redirect_url={{ redirect_url }}">log in</a> to see more details</h6>
 <p>Inventory item.</p>
 
 <table>