try-except auth_header

awx/api/authentication.py

@@ -46,17 +46,14 @@ class SessionAuthentication(authentication.SessionAuthentication):
 class LoggedOAuth2Authentication(OAuth2Authentication):
 
     def authenticate(self, request):
-        if 'Bearer' in request.META['HTTP_AUTHORIZATION']:
         ret = super(LoggedOAuth2Authentication, self).authenticate(request)
         if ret:
             user, token = ret
             username = user.username if user else '<none>'
-                logger.debug(smart_text(
+            logger.info(smart_text(
                 u"User {} performed a {} to {} through the API using OAuth token {}.".format(
                     username, request.method, request.path, token.pk
                 )
             ))
             setattr(user, 'oauth_scopes', [x for x in token.scope.split() if x])
         return ret
-        else:
-            return None

awx/api/generics.py

@@ -234,9 +234,12 @@ class APIView(views.APIView):
         was attempted.
         """
         for authenticator in self.get_authenticators():
+            try: 
                 resp_hdr = authenticator.authenticate_header(request)
                 if not resp_hdr:
                     continue
+            except AttributeError:
+                continue
             req_hdr = get_authorization_header(request)
             if not req_hdr:
                 continue