From 5d682dc0fbe1bbd7ad568c84eef3cd475b08d503 Mon Sep 17 00:00:00 2001
From: Agate Berriot <aberriot@entrouvert.com>
Date: Thu, 1 Sep 2022 10:54:04 +0200
Subject: [PATCH 3/6] django4: replaced deprecated request.is_ajax() call
 (#68607)

---
 .../manager/templates/authentic2/manager/form.html         | 6 +++---
 src/authentic2/manager/user_views.py                       | 5 +++--
 src/authentic2/manager/views.py                            | 3 ++-
 src/authentic2/templatetags/__init__.py                    | 0
 src/authentic2/templatetags/is_ajax.py                     | 7 +++++++
 src/authentic2/utils/request.py                            | 2 ++
 6 files changed, 17 insertions(+), 6 deletions(-)
 create mode 100644 src/authentic2/templatetags/__init__.py
 create mode 100644 src/authentic2/templatetags/is_ajax.py
 create mode 100644 src/authentic2/utils/request.py

diff --git a/src/authentic2/manager/templates/authentic2/manager/form.html b/src/authentic2/manager/templates/authentic2/manager/form.html
index c12f4867..522abb82 100644
--- a/src/authentic2/manager/templates/authentic2/manager/form.html
+++ b/src/authentic2/manager/templates/authentic2/manager/form.html
@@ -1,8 +1,8 @@
 {% extends "authentic2/manager/base.html" %}
-{% load gadjo i18n %}
+{% load gadjo i18n is_ajax %}
 
 {% block messages %}
-  {% if not request.is_ajax %}
+  {% if not request|is_ajax %}
     {{ block.super }}
   {% endif %}
 {% endblock %}
@@ -14,7 +14,7 @@
     class="{{ form.css_class }}" method="post">
     <div class="form-inner-container">
       {% if messages %}
-        {% if request.is_ajax %}
+        {% if request|is_ajax %}
           <ul class="messages">
               {% for message in messages %}
               <li{% if message.tags %} class="{{ message.tags }}"{% endif %}>
diff --git a/src/authentic2/manager/user_views.py b/src/authentic2/manager/user_views.py
index ca434bb1..83328059 100644
--- a/src/authentic2/manager/user_views.py
+++ b/src/authentic2/manager/user_views.py
@@ -44,6 +44,7 @@ from authentic2.apps.journal.views import JournalViewWithContext
 from authentic2.models import Attribute, PasswordReset
 from authentic2.utils import spooler, switch_user
 from authentic2.utils.misc import make_url, redirect, select_next_url, send_password_reset_mail
+from authentic2.utils.request import is_ajax
 from authentic2_idp_oidc.models import OIDCAuthorization, OIDCClient
 
 from . import app_settings
@@ -539,7 +540,7 @@ class UsersExportProgressView(MediaMixin, TemplateView):
         if not export.exists:
             raise Http404()
 
-        if request.is_ajax():
+        if is_ajax(request):
             return HttpResponse(export.progress)
 
         return super().get(request, *args, **kwargs)
@@ -891,7 +892,7 @@ class UserImportReportView(MediaMixin, PermissionMixin, TemplateView):
         return ctx
 
     def get_template_names(self):
-        if self.request.is_ajax():
+        if is_ajax(self.request):
             return ['authentic2/manager/user_import_report_row.html']
         return ['authentic2/manager/user_import_report.html']
 
diff --git a/src/authentic2/manager/views.py b/src/authentic2/manager/views.py
index f75bc0b3..a2ce95a6 100644
--- a/src/authentic2/manager/views.py
+++ b/src/authentic2/manager/views.py
@@ -47,6 +47,7 @@ from authentic2.decorators import json as json_view
 from authentic2.forms.profile import modelform_factory
 from authentic2.utils import crypto
 from authentic2.utils.misc import batch_queryset, redirect
+from authentic2.utils.request import is_ajax
 
 from . import app_settings, forms, utils, widgets
 
@@ -250,7 +251,7 @@ class AjaxFormViewMixin:
         return self.return_ajax_response(request, response)
 
     def return_ajax_response(self, request, response):
-        if not request.is_ajax():
+        if not is_ajax(request):
             return response
         data = {}
         if 'Location' in response:
diff --git a/src/authentic2/templatetags/__init__.py b/src/authentic2/templatetags/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/src/authentic2/templatetags/is_ajax.py b/src/authentic2/templatetags/is_ajax.py
new file mode 100644
index 00000000..da02d7de
--- /dev/null
+++ b/src/authentic2/templatetags/is_ajax.py
@@ -0,0 +1,7 @@
+from django import template
+
+from authentic2.utils import request
+
+register = template.Library()
+
+register.filter('is_ajax', request.is_ajax)
diff --git a/src/authentic2/utils/request.py b/src/authentic2/utils/request.py
new file mode 100644
index 00000000..22ff240b
--- /dev/null
+++ b/src/authentic2/utils/request.py
@@ -0,0 +1,2 @@
+def is_ajax(request):
+    return request.headers.get('x-requested-with') == 'XMLHttpRequest'
-- 
2.37.2