Fix MFA auth flow (#8720) (#8724)

* Re-add html account base Fixes #8690 * fix base template Co-authored-by: Matthias Mair <[email protected]>
inventree · Dec 19, 2024 · 39211ff · 39211ff
1 parent e37ff5c
commit 39211ff
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 88 deletions.
diff --git a/src/backend/InvenTree/templates/403_csrf.html b/src/backend/InvenTree/templates/403_csrf.html
@@ -1,4 +1,4 @@
-{% extends "account/base.html" %}
+{% extends "skeleton.html" %}
 
 {% load i18n %}
 {% load inventree_extras %}

diff --git a/src/backend/InvenTree/templates/account/base.html b/src/backend/InvenTree/templates/account/base.html
@@ -1,55 +1,9 @@
-{% load static %}
+{% extends "skeleton.html" %}
 {% load i18n %}
 {% load inventree_extras %}
 
-<!DOCTYPE html>
-<html lang="en">
-<head>
-
-<!-- Required meta tags -->
-<meta charset="utf-8">
-<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-
-<!-- Favicon -->
-<link rel="apple-touch-icon" sizes="57x57" href="{% static 'img/favicon/apple-icon-57x57.png' %}">
-<link rel="apple-touch-icon" sizes="60x60" href="{% static 'img/favicon/apple-icon-60x60.png' %}">
-<link rel="apple-touch-icon" sizes="72x72" href="{% static 'img/favicon/apple-icon-72x72.png' %}">
-<link rel="apple-touch-icon" sizes="76x76" href="{% static 'img/favicon/apple-icon-76x76.png' %}">
-<link rel="apple-touch-icon" sizes="114x114" href="{% static 'img/favicon/apple-icon-114x114.png' %}">
-<link rel="apple-touch-icon" sizes="120x120" href="{% static 'img/favicon/apple-icon-120x120.png' %}">
-<link rel="apple-touch-icon" sizes="144x144" href="{% static 'img/favicon/apple-icon-144x144.png' %}">
-<link rel="apple-touch-icon" sizes="152x152" href="{% static 'img/favicon/apple-icon-152x152.png' %}">
-<link rel="apple-touch-icon" sizes="180x180" href="{% static 'img/favicon/apple-icon-180x180.png' %}">
-<link rel="icon" type="image/png" sizes="192x192"  href="{% static 'img/favicon/android-icon-192x192.png' %}">
-<link rel="icon" type="image/png" sizes="32x32" href="{% static 'img/favicon/favicon-32x32.png' %}">
-<link rel="icon" type="image/png" sizes="96x96" href="{% static 'img/favicon/favicon-96x96.png' %}">
-<link rel="icon" type="image/png" sizes="16x16" href="{% static 'img/favicon/favicon-16x16.png' %}">
-<link rel="manifest" href="{% static 'img/favicon/manifest.json' %}">
-<meta name="msapplication-TileColor" content="#ffffff">
-<meta name="msapplication-TileImage" content="{% static 'img/favicon/ms-icon-144x144.png' %}">
-<meta name="theme-color" content="#ffffff">
-
-
-<!-- CSS -->
-<link rel="stylesheet" href="{% static 'fontawesome/css/brands.css' %}">
-<link rel="stylesheet" href="{% static 'fontawesome/css/solid.css' %}">
-<link rel="stylesheet" href="{% static 'bootstrap/css/bootstrap.min.css' %}">
-<link rel="stylesheet" href="{% static 'select2/css/select2.css' %}">
-<link rel="stylesheet" href="{% static 'select2/css/select2-bootstrap-5-theme.css' %}">
-<link rel="stylesheet" href="{% static 'css/inventree.css' %}">
-
-<link rel="stylesheet" href="{% get_color_theme_css request.user %}">
-
-<title>
-    {% inventree_title %} | {% block head_title %}{% endblock head_title %}
-</title>
-
-{% block extra_head %}
-{% endblock extra_head %}
-</head>
-
+{% block body %}
 <body class='login-screen' style='background: url({% inventree_splash %}); background-size: cover;'>
-
     <div class='container-fluid'>
         <div class='notification-area' id='alerts'>
             <!-- Div for displayed alerts -->
@@ -80,42 +34,4 @@
         {% block extra_body %}
         {% endblock extra_body %}
     </div>
-
-
-
-<!-- general JS -->
-{% include "third_party_js.html" %}
-
-<script type='text/javascript' src='{% static "script/inventree/inventree.js" %}'></script>
-<script type='text/javascript' src='{% static "script/inventree/message.js" %}'></script>
-
-<script type='text/javascript'>
-
-$(document).ready(function () {
-
-    {% if messages %}
-    {% for message in messages %}
-    showMessage("{{ message }}");
-    {% endfor %}
-    {% endif %}
-
-    showCachedAlerts();
-
-    // Add brand icons for SSO providers, if available
-    $('.socialaccount_provider').each(function(i, obj) {
-        var el = $(this);
-        var tag = el.attr('brand_name');
-
-        var icon = window.FontAwesome.icon({prefix: 'fab', iconName: tag});
-
-        if (icon) {
-            el.prepend(`<span class='fab fa-${tag}'></span>&nbsp;`);
-        }
-    });
-
-});
-
-</script>
-
-</body>
-</html>
+{% endblock body %}