mirror of
https://github.com/django/django.git
synced 2025-10-24 06:06:09 +00:00
Fixed #25847 -- Made User.is_(anonymous|authenticated) properties.
This commit is contained in:
@@ -138,7 +138,7 @@ def logout(request):
|
||||
# Dispatch the signal before the user is logged out so the receivers have a
|
||||
# chance to find out *who* logged out.
|
||||
user = getattr(request, 'user', None)
|
||||
if hasattr(user, 'is_authenticated') and not user.is_authenticated():
|
||||
if hasattr(user, 'is_authenticated') and not user.is_authenticated:
|
||||
user = None
|
||||
user_logged_out.send(sender=user.__class__, request=request, user=user)
|
||||
|
||||
|
||||
@@ -45,7 +45,7 @@ class ModelBackend(object):
|
||||
be either "group" or "user" to return permissions from
|
||||
`_get_group_permissions` or `_get_user_permissions` respectively.
|
||||
"""
|
||||
if not user_obj.is_active or user_obj.is_anonymous() or obj is not None:
|
||||
if not user_obj.is_active or user_obj.is_anonymous or obj is not None:
|
||||
return set()
|
||||
|
||||
perm_cache_name = '_%s_perm_cache' % from_name
|
||||
@@ -73,7 +73,7 @@ class ModelBackend(object):
|
||||
return self._get_permissions(user_obj, obj, 'group')
|
||||
|
||||
def get_all_permissions(self, user_obj, obj=None):
|
||||
if not user_obj.is_active or user_obj.is_anonymous() or obj is not None:
|
||||
if not user_obj.is_active or user_obj.is_anonymous or obj is not None:
|
||||
return set()
|
||||
if not hasattr(user_obj, '_perm_cache'):
|
||||
user_obj._perm_cache = self.get_user_permissions(user_obj)
|
||||
|
||||
@@ -10,6 +10,7 @@ from django.contrib.auth.hashers import (
|
||||
)
|
||||
from django.db import models
|
||||
from django.utils.crypto import get_random_string, salted_hmac
|
||||
from django.utils.deprecation import CallableFalse, CallableTrue
|
||||
from django.utils.encoding import python_2_unicode_compatible
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
|
||||
@@ -79,19 +80,21 @@ class AbstractBaseUser(models.Model):
|
||||
def natural_key(self):
|
||||
return (self.get_username(),)
|
||||
|
||||
@property
|
||||
def is_anonymous(self):
|
||||
"""
|
||||
Always return False. This is a way of comparing User objects to
|
||||
anonymous users.
|
||||
"""
|
||||
return False
|
||||
return CallableFalse
|
||||
|
||||
@property
|
||||
def is_authenticated(self):
|
||||
"""
|
||||
Always return True. This is a way to tell if the user has been
|
||||
authenticated in templates.
|
||||
"""
|
||||
return True
|
||||
return CallableTrue
|
||||
|
||||
def set_password(self, raw_password):
|
||||
self.password = make_password(raw_password)
|
||||
|
||||
@@ -43,7 +43,7 @@ def login_required(function=None, redirect_field_name=REDIRECT_FIELD_NAME, login
|
||||
to the log-in page if necessary.
|
||||
"""
|
||||
actual_decorator = user_passes_test(
|
||||
lambda u: u.is_authenticated(),
|
||||
lambda u: u.is_authenticated,
|
||||
login_url=login_url,
|
||||
redirect_field_name=redirect_field_name
|
||||
)
|
||||
|
||||
@@ -70,13 +70,13 @@ class RemoteUserMiddleware(object):
|
||||
# If specified header doesn't exist then remove any existing
|
||||
# authenticated remote-user, or return (leaving request.user set to
|
||||
# AnonymousUser by the AuthenticationMiddleware).
|
||||
if self.force_logout_if_no_header and request.user.is_authenticated():
|
||||
if self.force_logout_if_no_header and request.user.is_authenticated:
|
||||
self._remove_invalid_user(request)
|
||||
return
|
||||
# If the user is already authenticated and that user is the user we are
|
||||
# getting passed in the headers, then the correct user is already
|
||||
# persisted in the session and we don't need to continue.
|
||||
if request.user.is_authenticated():
|
||||
if request.user.is_authenticated:
|
||||
if request.user.get_username() == self.clean_username(username, request):
|
||||
return
|
||||
else:
|
||||
|
||||
@@ -51,7 +51,7 @@ class LoginRequiredMixin(AccessMixin):
|
||||
CBV mixin which verifies that the current user is authenticated.
|
||||
"""
|
||||
def dispatch(self, request, *args, **kwargs):
|
||||
if not request.user.is_authenticated():
|
||||
if not request.user.is_authenticated:
|
||||
return self.handle_no_permission()
|
||||
return super(LoginRequiredMixin, self).dispatch(request, *args, **kwargs)
|
||||
|
||||
|
||||
@@ -10,6 +10,7 @@ from django.core.mail import send_mail
|
||||
from django.db import models
|
||||
from django.db.models.manager import EmptyManager
|
||||
from django.utils import six, timezone
|
||||
from django.utils.deprecation import CallableFalse, CallableTrue
|
||||
from django.utils.encoding import python_2_unicode_compatible
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
|
||||
@@ -438,11 +439,13 @@ class AnonymousUser(object):
|
||||
def has_module_perms(self, module):
|
||||
return _user_has_module_perms(self, module)
|
||||
|
||||
@property
|
||||
def is_anonymous(self):
|
||||
return True
|
||||
return CallableTrue
|
||||
|
||||
@property
|
||||
def is_authenticated(self):
|
||||
return False
|
||||
return CallableFalse
|
||||
|
||||
def get_username(self):
|
||||
return self.username
|
||||
|
||||
@@ -68,7 +68,7 @@ def login(request, template_name='registration/login.html',
|
||||
"""
|
||||
redirect_to = request.POST.get(redirect_field_name, request.GET.get(redirect_field_name, ''))
|
||||
|
||||
if redirect_authenticated_user and request.user.is_authenticated():
|
||||
if redirect_authenticated_user and request.user.is_authenticated:
|
||||
redirect_to = _get_login_redirect_url(request, redirect_to)
|
||||
if redirect_to == request.path:
|
||||
raise ValueError(
|
||||
|
||||
@@ -33,7 +33,7 @@ class FlatpageNode(template.Node):
|
||||
# was provided, filter the list to only public flatpages.
|
||||
if self.user:
|
||||
user = self.user.resolve(context)
|
||||
if not user.is_authenticated():
|
||||
if not user.is_authenticated:
|
||||
flatpages = flatpages.filter(registration_required=False)
|
||||
else:
|
||||
flatpages = flatpages.filter(registration_required=False)
|
||||
|
||||
@@ -52,7 +52,7 @@ def render_flatpage(request, f):
|
||||
"""
|
||||
# If registration is required for accessing this page, and the user isn't
|
||||
# logged in, redirect to the login page.
|
||||
if f.registration_required and not request.user.is_authenticated():
|
||||
if f.registration_required and not request.user.is_authenticated:
|
||||
from django.contrib.auth.views import redirect_to_login
|
||||
return redirect_to_login(request.path)
|
||||
if f.template_name:
|
||||
|
||||
@@ -79,3 +79,33 @@ class DeprecationInstanceCheck(type):
|
||||
self.deprecation_warning, 2
|
||||
)
|
||||
return super(DeprecationInstanceCheck, self).__instancecheck__(instance)
|
||||
|
||||
|
||||
class CallableBool:
|
||||
"""
|
||||
An boolean-like object that is also callable for backwards compatibility.
|
||||
"""
|
||||
do_not_call_in_templates = True
|
||||
|
||||
def __init__(self, value):
|
||||
self.value = value
|
||||
|
||||
def __bool__(self):
|
||||
return self.value
|
||||
|
||||
def __call__(self):
|
||||
warnings.warn(
|
||||
"Using user.is_authenticated() and user.is_anonymous() as a method "
|
||||
"is deprecated. Remove the parentheses to use it as an attribute.",
|
||||
RemovedInDjango20Warning, stacklevel=2
|
||||
)
|
||||
return self.value
|
||||
|
||||
def __nonzero__(self): # Python 2 compatibility
|
||||
return self.value
|
||||
|
||||
def __repr__(self):
|
||||
return 'CallableBool(%r)' % self.value
|
||||
|
||||
CallableFalse = CallableBool(False)
|
||||
CallableTrue = CallableBool(True)
|
||||
|
||||
Reference in New Issue
Block a user