From 28242e52aa76020d5ff42b60235c07a4af78f065 Mon Sep 17 00:00:00 2001
From: Maico Timmerman <MaicoTimmerman@users.noreply.github.com>
Date: Mon, 16 Dec 2019 10:42:51 +0100
Subject: [PATCH] =?UTF-8?q?Fix=20#1522=20--=20Login=20button=20redirects?=
 =?UTF-8?q?=20to=20authentication=20url=20with=E2=80=A6=20(#1525)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pretix/base/forms/auth.py                              | 3 ++-
 src/pretix/control/templates/pretixcontrol/auth/login.html | 7 +++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/pretix/base/forms/auth.py b/src/pretix/base/forms/auth.py
index 942424515b..4eda9e4eb3 100644
--- a/src/pretix/base/forms/auth.py
+++ b/src/pretix/base/forms/auth.py
@@ -32,7 +32,8 @@ class LoginForm(forms.Form):
         for k, f in backend.login_form_fields.items():
             self.fields[k] = f
 
-        if not settings.PRETIX_LONG_SESSIONS:
+        # Authentication backends which use urls cannot have long sessions.
+        if not settings.PRETIX_LONG_SESSIONS or backend.url:
             del self.fields['keep_logged_in']
         else:
             self.fields.move_to_end('keep_logged_in')
diff --git a/src/pretix/control/templates/pretixcontrol/auth/login.html b/src/pretix/control/templates/pretixcontrol/auth/login.html
index 9aeb518138..560d4ddff7 100644
--- a/src/pretix/control/templates/pretixcontrol/auth/login.html
+++ b/src/pretix/control/templates/pretixcontrol/auth/login.html
@@ -22,9 +22,16 @@
         {% csrf_token %}
         {% bootstrap_form form %}
         <div class="form-group buttons">
+            {% if backend.login_form_fields %}
             <button type="submit" class="btn btn-primary btn-block">
                 {% trans "Log in" %}
             </button>
+            {% endif %}
+            {% if backend.url %}
+                <a href="{{ backend.url }}" class="btn btn-primary btn-block">
+                    {{ backend.verbose_name }}
+                </a>
+            {% endif %}
             {% if backend.identifier == "native" %}
                 {% if can_reset %}
                     <a href="{% url "control:auth.forgot" %}" class="btn btn-link btn-block">