From 0e975757b8c224f28bbd7a2ac781989998104ede Mon Sep 17 00:00:00 2001
From: Jens Langhammer <jens.langhammer@beryju.org>
Date: Sat, 20 Feb 2021 18:26:36 +0100
Subject: [PATCH] core: remove UILoginButton's icon_path

---
 authentik/core/templates/login/base.html                    | 6 ++----
 authentik/core/templates/shell.html                         | 2 ++
 authentik/core/types.py                                     | 3 ---
 authentik/sources/oauth/models.py                           | 3 ++-
 authentik/sources/saml/models.py                            | 1 -
 .../templates/stages/identification/login.html              | 6 ++----
 6 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/authentik/core/templates/login/base.html b/authentik/core/templates/login/base.html
index f4f979996..e25da38ec 100644
--- a/authentik/core/templates/login/base.html
+++ b/authentik/core/templates/login/base.html
@@ -28,10 +28,8 @@
         {% for source in sources %}
         <li class="pf-c-login__main-footer-links-item">
             <a href="{{ source.url }}" class="pf-c-login__main-footer-links-item-link">
-                {% if source.icon_path %}
-                <img src="{% static source.icon_path %}" alt="{{ source.name }}">
-                {% elif source.icon_url %}
-                <img src="icon_url" alt="{{ source.name }}">
+                {% if source.icon_url %}
+                <img src="{{ source.icon_url }}" alt="{{ source.name }}">
                 {% else %}
                 <i class="pf-icon pf-icon-arrow" title="{{ source.name }}"></i>
                 {% endif %}
diff --git a/authentik/core/templates/shell.html b/authentik/core/templates/shell.html
index d57edfdc1..131719097 100644
--- a/authentik/core/templates/shell.html
+++ b/authentik/core/templates/shell.html
@@ -1,5 +1,7 @@
 {% extends "base/skeleton.html" %}
 
+{% load static %}
+
 {% block head %}
 <script src="{% static 'dist/main.js' %}?v={{ ak_version }}" type="module"></script>
 {% endblock %}
diff --git a/authentik/core/types.py b/authentik/core/types.py
index 4dd249682..e7a46feb8 100644
--- a/authentik/core/types.py
+++ b/authentik/core/types.py
@@ -13,8 +13,5 @@ class UILoginButton:
     # URL Which Button points to
     url: str
 
-    # Icon name, ran through django's static
-    icon_path: Optional[str] = None
-
     # Icon URL, used as-is
     icon_url: Optional[str] = None
diff --git a/authentik/sources/oauth/models.py b/authentik/sources/oauth/models.py
index f01728889..23d99643f 100644
--- a/authentik/sources/oauth/models.py
+++ b/authentik/sources/oauth/models.py
@@ -6,6 +6,7 @@ from django.forms import ModelForm
 from django.urls import reverse, reverse_lazy
 from django.utils.translation import gettext_lazy as _
 from rest_framework.serializers import Serializer
+from django.templatetags.static import static
 
 from authentik.core.models import Source, UserSourceConnection
 from authentik.core.types import UILoginButton
@@ -60,7 +61,7 @@ class OAuthSource(Source):
                 "authentik_sources_oauth:oauth-client-login",
                 kwargs={"source_slug": self.slug},
             ),
-            icon_path=f"authentik/sources/{self.provider_type}.svg",
+            icon_url=static(f"authentik/sources/{self.provider_type}.svg"),
             name=self.name,
         )
 
diff --git a/authentik/sources/saml/models.py b/authentik/sources/saml/models.py
index b4398cb98..fb55a72e0 100644
--- a/authentik/sources/saml/models.py
+++ b/authentik/sources/saml/models.py
@@ -169,7 +169,6 @@ class SAMLSource(Source):
             url=reverse_lazy(
                 "authentik_sources_saml:login", kwargs={"source_slug": self.slug}
             ),
-            icon_path="",
         )
 
     @property
diff --git a/authentik/stages/identification/templates/stages/identification/login.html b/authentik/stages/identification/templates/stages/identification/login.html
index 34b9e7ac4..54eb7812a 100644
--- a/authentik/stages/identification/templates/stages/identification/login.html
+++ b/authentik/stages/identification/templates/stages/identification/login.html
@@ -34,10 +34,8 @@
         {% for source in sources %}
         <li class="pf-c-login__main-footer-links-item">
             <a href="{{ source.url }}" class="pf-c-login__main-footer-links-item-link">
-                {% if source.icon_path %}
-                <img src="{% static source.icon_path %}" style="width:24px;" alt="{{ source.name }}">
-                {% elif source.icon_url %}
-                <img src="icon_url" alt="{{ source.name }}">
+                {% if source.icon_url %}
+                <img src="{{ source.icon_url }}" alt="{{ source.name }}">
                 {% else %}
                 <i class="pf-icon pf-icon-arrow" title="{{ source.name }}"></i>
                 {% endif %}