fix: logout via POST

basxsoftwareassociation · Jan 7, 2025 · 93f5892 · 93f5892
1 parent 4384f70
commit 93f5892
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 34 deletions.
diff --git a/basxbread/layout/components/shell_header.py b/basxbread/layout/components/shell_header.py
@@ -1,9 +1,11 @@
 import htmlgenerator as hg
+from django.forms import Form
 from django.utils.translation import gettext_lazy as _
 
 from basxbread.utils import reverse
 
 from ..utils import HasBasxBreadCookieValue
+from . import forms
 from .icon import Icon
 
 
@@ -38,24 +40,21 @@ def __init__(self, platform, company, searchbar, actions=(), *args, **kwargs):
                 ),
                 hg.If(
                     hg.C("request.user.is_authenticated"),
-                    hg.BUTTON(
-                        Icon(
-                            "logout",
-                            size=20,
-                            _class="bx--navigation-menu-panel-expand-icon",
-                            aria_hidden="true",
+                    forms.Form(
+                        Form(),
+                        hg.BUTTON(
+                            Icon(
+                                "logout",
+                                size=20,
+                                _class="bx--navigation-menu-panel-expand-icon",
+                                aria_hidden="true",
+                            ),
+                            _class="bx--header__menu-trigger bx--header__action",
+                            title=_("Logout"),
+                            # onclick=f"document.location = '{reverse('logout')}'",
                         ),
-                        Icon(
-                            "logout",
-                            size=20,
-                            _class="bx--navigation-menu-panel-collapse-icon",
-                            aria_hidden="true",
-                        ),
-                        _class="bx--header__menu-trigger bx--header__action",
-                        title=_("Logout"),
-                        data_navigation_menu_panel_label_expand=_("Logout"),
-                        data_navigation_menu_panel_label_collapse=_("Close"),
-                        onclick=f"document.location = '{reverse('logout')}'",
+                        action=reverse("logout"),
+                        method="POST",
                     ),
                 ),
                 _class="bx--header__global",

diff --git a/basxbread/urls.py b/basxbread/urls.py
@@ -1,6 +1,7 @@
 import django_celery_results.models
 from django.apps import apps
 from django.contrib.auth.models import Group, User
+from django.contrib.auth.views import LogoutView
 from django.urls import include, path
 
 from .utils import autopath, default_model_paths
@@ -15,7 +16,7 @@
     ),
     path(
         "accounts/logout/",
-        auth.LogoutView.as_view(),
+        LogoutView.as_view(),
         name="logout",
     ),
     path(

diff --git a/basxbread/views/auth.py b/basxbread/views/auth.py
@@ -1,7 +1,6 @@
 import htmlgenerator as hg
 from django.conf import settings
 from django.contrib.auth.views import LoginView as DjangoLoginView
-from django.contrib.auth.views import LogoutView as DjangoLogoutView
 from django.contrib.auth.views import (
     PasswordResetCompleteView as DjangoPasswordResetCompleteView,
 )
@@ -95,21 +94,6 @@ def get_form(self, *args, **kwargs):
         return form
 
 
-class LogoutView(BaseView, DjangoLogoutView):
-    def get(self, *args, **kwargs):
-        super().get(*args, **kwargs)
-        return redirect("login")
-
-    def get_context_data(self, *args, **kwargs):
-        return {
-            **super().get_context_data(*args, **kwargs),
-            "pagetitle": _("Logout"),
-        }
-
-    def get_layout(self):
-        return hg.DIV(_("Logged out"))
-
-
 class PasswordResetView(BaseView, DjangoPasswordResetView):
     def get_context_data(self, *args, **kwargs):
         return {