From d018c46bf4b31b9f346f789c32867fb01c14825b Mon Sep 17 00:00:00 2001
From: Cayo Puigdefabregas <cayo@usody.com>
Date: Fri, 12 Jan 2024 17:22:28 +0100
Subject: [PATCH] fix problems with login

---
 idhub/templates/auth/login.html |  2 --
 idhub/views.py                  | 10 +++++-----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/idhub/templates/auth/login.html b/idhub/templates/auth/login.html
index 28c199e..8ae5822 100644
--- a/idhub/templates/auth/login.html
+++ b/idhub/templates/auth/login.html
@@ -4,8 +4,6 @@
 {% block login_content %}
 <form action="{% url 'idhub:login' %}" role="form" method="post">
     {% csrf_token %}
-    <input type="hidden" name="next" value="{{ next }}" />
-
     <div id="div_id_username"
         class="clearfix control-group {% if form.username.errors %}error{% endif %}">
         <div class="form-group">
diff --git a/idhub/views.py b/idhub/views.py
index 53db736..5f6fb71 100644
--- a/idhub/views.py
+++ b/idhub/views.py
@@ -13,16 +13,16 @@ class LoginView(auth_views.LoginView):
     }
 
     def get(self, request, *args, **kwargs):
-        if request.GET.get('next'):
-            self.extra_context['success_url'] = request.GET.get('next')
+        self.extra_context['success_url'] = request.GET.get(
+            'next',
+            reverse_lazy('idhub:user_dashboard')
+        )
         return super().get(request, *args, **kwargs)
 
     def form_valid(self, form):
         user = form.get_user()
         if not user.is_anonymous and user.is_admin:
-            user_dashboard = reverse_lazy('idhub:user_dashboard')
             admin_dashboard = reverse_lazy('idhub:admin_dashboard')
-            if self.extra_context['success_url'] == user_dashboard:
-                self.extra_context['success_url'] = admin_dashboard
+            self.extra_context['success_url'] = admin_dashboard
         auth_login(self.request, user)
         return HttpResponseRedirect(self.extra_context['success_url'])