From 8bc1fab74df9f14a47ad1923a718633702ae82eb Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Thu, 7 Oct 2021 00:26:57 -0700
Subject: [PATCH] change(FastAPI): automate request login requirement

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 aurweb/routers/packages.py               | 2 +-
 templates/partials/packages/actions.html | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index a3effb36..539f9526 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -571,7 +571,7 @@ async def requests(request: Request,
 
 
 @router.get("/pkgbase/{name}/request")
-@auth_required(True)
+@auth_required(True, login=True, redirect="/pkgbase/{name}")
 async def package_request(request: Request, name: str):
     context = make_context(request, "Submit Request")
 
diff --git a/templates/partials/packages/actions.html b/templates/partials/packages/actions.html
index a54d4c90..7355420c 100644
--- a/templates/partials/packages/actions.html
+++ b/templates/partials/packages/actions.html
@@ -132,15 +132,9 @@
                 </li>
             {% endif %}
             <li>
-            {% if not request.user.is_authenticated() %}
-                <a href="/login?next={{ '/pkgbase/%s/request' | format(result.Name) | quote_plus }}">
-                    {{ "Submit Request" | tr }}
-                </a>
-            {% else %}
                 <a href="/pkgbase/{{ result.Name }}/request/">
                     {{ "Submit Request" | tr }}
                 </a>
-            {% endif %}
             </li>
             {% if request.user.has_credential("CRED_PKGBASE_DELETE") %}
                 <li>