From 35e8a0c3744c6f1b7f58cfdaf2b7efc9984fc073 Mon Sep 17 00:00:00 2001
From: Jens Langhammer <jens.langhammer@beryju.org>
Date: Sun, 14 Feb 2021 18:26:10 +0100
Subject: [PATCH] admin: fix ?next for Flow list

---
 authentik/admin/templates/administration/flow/list.html | 8 ++++++--
 authentik/providers/saml/processors/assertion.py        | 1 -
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/authentik/admin/templates/administration/flow/list.html b/authentik/admin/templates/administration/flow/list.html
index 7711ceaae..c6db5c17a 100644
--- a/authentik/admin/templates/administration/flow/list.html
+++ b/authentik/admin/templates/administration/flow/list.html
@@ -86,8 +86,12 @@
                             </ak-spinner-button>
                             <div slot="modal"></div>
                         </ak-modal-button>
-                        <a class="pf-c-button pf-m-secondary ak-root-link" href="{% url 'authentik_admin:flow-execute' pk=flow.pk %}?next={{ request.get_full_path }}">{% trans 'Execute' %}</a>
-                        <a class="pf-c-button pf-m-secondary ak-root-link" href="{% url 'authentik_admin:flow-export' pk=flow.pk %}?next={{ request.get_full_path }}">{% trans 'Export' %}</a>
+                        <a class="pf-c-button pf-m-secondary ak-root-link" href="{% url 'authentik_admin:flow-execute' pk=flow.pk %}?next=/#{{ request.get_full_path }}">
+                            {% trans 'Execute' %}
+                        </a>
+                        <a class="pf-c-button pf-m-secondary ak-root-link" href="{% url 'authentik_admin:flow-export' pk=flow.pk %}">
+                            {% trans 'Export' %}
+                        </a>
                     </td>
                 </tr>
                 {% endfor %}
diff --git a/authentik/providers/saml/processors/assertion.py b/authentik/providers/saml/processors/assertion.py
index 428472519..dd47003e0 100644
--- a/authentik/providers/saml/processors/assertion.py
+++ b/authentik/providers/saml/processors/assertion.py
@@ -3,7 +3,6 @@ from hashlib import sha256
 from types import GeneratorType
 
 import xmlsec
-from django.conf import settings
 from django.http import HttpRequest
 from lxml import etree  # nosec
 from lxml.etree import Element, SubElement  # nosec