From e0693d3746440077bf13f9663e854d55dc56437f Mon Sep 17 00:00:00 2001 From: Jeff Bradberry Date: Thu, 13 Jun 2019 14:13:09 -0400 Subject: [PATCH] is_anonymous and is_authenticated no longer support being called as methods --- awx/api/permissions.py | 2 +- awx/main/consumers.py | 2 +- awx/main/middleware.py | 2 +- awx/sso/middleware.py | 2 +- awx/sso/views.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/awx/api/permissions.py b/awx/api/permissions.py index 867388a08d..3c4de0ad27 100644 --- a/awx/api/permissions.py +++ b/awx/api/permissions.py @@ -95,7 +95,7 @@ class ModelAccessPermission(permissions.BasePermission): ''' # Don't allow anonymous users. 401, not 403, hence no raised exception. - if not request.user or request.user.is_anonymous(): + if not request.user or request.user.is_anonymous: return False # Always allow superusers diff --git a/awx/main/consumers.py b/awx/main/consumers.py index aee25e8ff9..a4fcdc96a6 100644 --- a/awx/main/consumers.py +++ b/awx/main/consumers.py @@ -24,7 +24,7 @@ def ws_connect(message): headers = dict(message.content.get('headers', '')) message.reply_channel.send({"accept": True}) message.content['method'] = 'FAKE' - if message.user.is_authenticated(): + if message.user.is_authenticated: message.reply_channel.send( {"text": json.dumps({"accept": True, "user": message.user.id})} ) diff --git a/awx/main/middleware.py b/awx/main/middleware.py index 86bb58e33e..b1a03c9a38 100644 --- a/awx/main/middleware.py +++ b/awx/main/middleware.py @@ -73,7 +73,7 @@ class ActivityStreamMiddleware(threading.local, MiddlewareMixin): super().__init__(get_response) def process_request(self, request): - if hasattr(request, 'user') and hasattr(request.user, 'is_authenticated') and request.user.is_authenticated(): + if hasattr(request, 'user') and request.user.is_authenticated: user = request.user else: user = None diff --git a/awx/sso/middleware.py b/awx/sso/middleware.py index 4edd4c4a2e..5ed1e5a9e2 100644 --- a/awx/sso/middleware.py +++ b/awx/sso/middleware.py @@ -39,7 +39,7 @@ class SocialAuthMiddleware(SocialAuthExceptionMiddleware): request.successful_authenticator = None if not request.path.startswith('/sso/') and 'migrations_notran' not in request.path: - if request.user and request.user.is_authenticated(): + if request.user and request.user.is_authenticated: # The rest of the code base rely hevily on type/inheritance checks, # LazyObject sent from Django auth middleware can be buggy if not # converted back to its original object. diff --git a/awx/sso/views.py b/awx/sso/views.py index 9eb0c33a95..fa248f634f 100644 --- a/awx/sso/views.py +++ b/awx/sso/views.py @@ -40,7 +40,7 @@ class CompleteView(BaseRedirectView): def dispatch(self, request, *args, **kwargs): response = super(CompleteView, self).dispatch(request, *args, **kwargs) - if self.request.user and self.request.user.is_authenticated(): + if self.request.user and self.request.user.is_authenticated: logger.info(smart_text(u"User {} logged in".format(self.request.user.username))) response.set_cookie('userLoggedIn', 'true') current_user = UserSerializer(self.request.user)