mirror of
https://github.com/TandoorRecipes/recipes.git
synced 2026-01-07 23:28:16 -05:00
added prefix to request.path.startswith() conditionals
This commit is contained in:
@@ -5,6 +5,7 @@ from rest_framework.authtoken.models import Token
|
|||||||
from rest_framework.exceptions import AuthenticationFailed
|
from rest_framework.exceptions import AuthenticationFailed
|
||||||
|
|
||||||
from cookbook.views import views
|
from cookbook.views import views
|
||||||
|
from recipes import settings
|
||||||
|
|
||||||
|
|
||||||
class ScopeMiddleware:
|
class ScopeMiddleware:
|
||||||
@@ -14,14 +15,15 @@ class ScopeMiddleware:
|
|||||||
def __call__(self, request):
|
def __call__(self, request):
|
||||||
if request.user.is_authenticated:
|
if request.user.is_authenticated:
|
||||||
|
|
||||||
if request.path.startswith('/admin/'):
|
prefix = settings.JS_REVERSE_SCRIPT_PREFIX or ''
|
||||||
|
if request.path.startswith(prefix + '/admin/'):
|
||||||
with scopes_disabled():
|
with scopes_disabled():
|
||||||
return self.get_response(request)
|
return self.get_response(request)
|
||||||
|
|
||||||
if request.path.startswith('/signup/') or request.path.startswith('/invite/'):
|
if request.path.startswith(prefix + '/signup/') or request.path.startswith(prefix + '/invite/'):
|
||||||
return self.get_response(request)
|
return self.get_response(request)
|
||||||
|
|
||||||
if request.path.startswith('/accounts/'):
|
if request.path.startswith(prefix + '/accounts/'):
|
||||||
return self.get_response(request)
|
return self.get_response(request)
|
||||||
|
|
||||||
with scopes_disabled():
|
with scopes_disabled():
|
||||||
@@ -36,7 +38,7 @@ class ScopeMiddleware:
|
|||||||
with scope(space=request.space):
|
with scope(space=request.space):
|
||||||
return self.get_response(request)
|
return self.get_response(request)
|
||||||
else:
|
else:
|
||||||
if request.path.startswith('/api/'):
|
if request.path.startswith(prefix + '/api/'):
|
||||||
try:
|
try:
|
||||||
if auth := TokenAuthentication().authenticate(request):
|
if auth := TokenAuthentication().authenticate(request):
|
||||||
request.space = auth[0].userpreference.space
|
request.space = auth[0].userpreference.space
|
||||||
|
|||||||
Reference in New Issue
Block a user