8000 fix: Async support and middleware update for django CMS 4.2+ by fsbraun · Pull Request #8147 · django-cms/django-cms · GitHub
[go: up one dir, main page]
Skip to content

fix: Async support and middleware update for django CMS 4.2+ #8147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Feb 19, 2025
Merged

fix: Async support and middleware update for django CMS 4.2+ #8147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
73c5417
fix: Mark language and user middleware synchronous for ASGI (#7985) (…
jbazik Sep 8, 2024
ffe3427
fix: Remove MiddlewareMixin from middlewares
fsbraun Feb 17, 2025
49f2e15
Remove unneded `async_capable`
fsbraun Feb 17, 2025
88ac745
Merge branch 'develop-4' into backport/async-middleware
vinitkumar Feb 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions cms/middleware/language.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,21 @@
from django.conf import settings
from django.utils.deprecation import MiddlewareMixin
from django.utils.translation import get_language


class LanguageCookieMiddleware(MiddlewareMixin):
class LanguageCookieMiddleware:
def __init__(self, get_response):
super().__init__(get_response)
self.get_response = get_response
super().__init__()

def __call__(self, request):
response = self.get_response(request)
return self.process_response(request, response)

async def __acall__(self, request):
response = await self.get_response(request)
return self.process_response(request, response)

def process_response(self, request, response):
language = get_language()
if (
settings.LANGUAGE_COOKIE_NAME in request.COOKIES # noqa: W503
Expand Down
13 changes: 10 additions & 3 deletions cms/middleware/page.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
from django.utils.deprecation import MiddlewareMixin
from django.utils.functional import SimpleLazyObject


Expand All @@ -15,6 +14,14 @@ def get_page(request):
return request._current_page_cache


class CurrentPageMiddleware(MiddlewareMixin):
def process_request(self, request):
class CurrentPageMiddleware:
def __init__(self, get_response):
self.get_response = get_response

def __call__(self, request):
request.current_page = SimpleLazyObject(lambda: get_page(request))
return self.get_response(request)

async def __acall__(self, request):
request.current_page = SimpleLazyObject(lambda: get_page(request))
return await self.get_response(request)
16 changes: 14 additions & 2 deletions cms/middleware/toolbar.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
from django.core.exceptions import ValidationError
from django.urls import resolve
from django.urls.exceptions import Resolver404
from django.utils.deprecation import MiddlewareMixin
from django.utils.functional import SimpleLazyObject

from cms.toolbar.toolbar import CMSToolbar
Expand All @@ -16,10 +15,13 @@
get_request_ip = get_request_ip_resolver()


class ToolbarMiddleware(MiddlewareMixin):
class ToolbarMiddleware:
"""
Middleware to set up CMS Toolbar.
"""
def __init__(self, get_response):
self.get_response = get_response
super().__init__()

def is_edit_mode(self, request):
try:
Expand Down Expand Up @@ -87,3 +89,13 @@ def process_response(self, request, response):
if toolbar._cache_disabled:
add_never_cache_headers(response)
return response

def __call__(self, request):
self.process_request(request)
response = self.get_response(request)
return self.process_response(request, response)

async def __acall__(self, request):
self.process_request(request)
response = await self.get_response(request)
return self.process_response(request, response)
8 changes: 5 additions & 3 deletions cms/middleware/user.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,13 @@

This middleware is required only when CMS_PERMISSION = True.
"""
from django.utils.deprecation import MiddlewareMixin

class CurrentUserMiddleware:
def __init__(self, get_response):
self.get_response = get_response

class CurrentUserMiddleware(MiddlewareMixin):
def process_request(self, request):
def __call__(self, request):
from cms.utils.permissions import set_current_user

set_current_user(getattr(request, 'user', None))
return self.get_response(request)
15 changes: 11 additions & 4 deletions cms/middleware/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,18 @@
from django.utils.deprecation import MiddlewareMixin

from cms.utils import apphook_reload


class ApphookReloadMiddleware(MiddlewareMixin):
class ApphookReloadMiddleware:
"""
If the URLs are stale, reload them.
"""
def process_request(self, request):
def __init__(self, get_response):
self.get_response = get_response

def __call__(self, request):
apphook_reload.ensure_urlconf_is_up_to_date()
return self.get_response(request)

async def __acall__(self, request):
apphook_reload.ensure_urlconf_is_up_to_date()
return await self.get_response(request)

Loading
0