encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-02-02 20:54:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

Simplify APIClient implementation

Browse Source
This commit is contained in:
Tom Christie 2013-06-29 21:34:47 +01:00
parent 664f8c6365
commit ab799ccc3e
2 changed files with 16 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rest_framework/authentication.py
View File

@ -109,14 +109,14 @@ class SessionAuthentication(BaseAuthentication):
""" """
# Get the underlying HttpRequest object # Get the underlying HttpRequest object
http_request = request._request request = request._request
user = getattr(http_request, 'user', None) user = getattr(request, 'user', None)
# Unauthenticated, CSRF validation not required # Unauthenticated, CSRF validation not required
if not user or not user.is_active: if not user or not user.is_active:
return None return None
self.enforce_csrf(http_request) self.enforce_csrf(request)
# CSRF passed with authenticated user # CSRF passed with authenticated user
return (user, None) return (user, None)

66
rest_framework/test.py
View File

@ -86,10 +86,6 @@ class ForceAuthClientHandler(ClientHandler):
self._force_auth_token = None self._force_auth_token = None
super(ForceAuthClientHandler, self).__init__(*args, **kwargs) super(ForceAuthClientHandler, self).__init__(*args, **kwargs)
def force_authenticate(self, user=None, token=None):
self._force_auth_user = user
self._force_auth_token = token
def get_response(self, request): def get_response(self, request):
# This is the simplest place we can hook into to patch the # This is the simplest place we can hook into to patch the
# request object. # request object.
@ -108,56 +104,20 @@ class APIClient(APIRequestFactory, DjangoClient):
self._credentials = {} self._credentials = {}
def credentials(self, **kwargs): def credentials(self, **kwargs):
"""
Sets headers that will be used on every outgoing request.
"""
self._credentials = kwargs self._credentials = kwargs
def authenticate(self, user=None, token=None): def authenticate(self, user=None, token=None):
self.handler.force_authenticate(user, token) """
Forcibly authenticates outgoing requests with the given
user and/or token.
"""
self.handler._force_auth_user = user
self.handler._force_auth_token = token
def get(self, path, data={}, follow=False, **extra): def request(self, **request):
extra.update(self._credentials) # Ensure that any credentials set get added to every request.
response = super(APIClient, self).get(path, data=data, **extra) request.update(self._credentials)
if follow: return super(APIClient, self).request(**request)
response = self._handle_redirects(response, **extra)
return response
def head(self, path, data={}, follow=False, **extra):
extra.update(self._credentials)
response = super(APIClient, self).head(path, data=data, **extra)
if follow:
response = self._handle_redirects(response, **extra)
return response
def post(self, path, data=None, format=None, content_type=None, follow=False, **extra):
extra.update(self._credentials)
response = super(APIClient, self).post(path, data=data, format=format, content_type=content_type, **extra)
if follow:
response = self._handle_redirects(response, **extra)
return response
def put(self, path, data=None, format=None, content_type=None, follow=False, **extra):
extra.update(self._credentials)
response = super(APIClient, self).post(path, data=data, format=format, content_type=content_type, **extra)
if follow:
response = self._handle_redirects(response, **extra)
return response
def patch(self, path, data=None, format=None, content_type=None, follow=False, **extra):
extra.update(self._credentials)
response = super(APIClient, self).post(path, data=data, format=format, content_type=content_type, **extra)
if follow:
response = self._handle_redirects(response, **extra)
return response
def delete(self, path, data=None, format=None, content_type=None, follow=False, **extra):
extra.update(self._credentials)
response = super(APIClient, self).post(path, data=data, format=format, content_type=content_type, **extra)
if follow:
response = self._handle_redirects(response, **extra)
return response
def options(self, path, data=None, format=None, content_type=None, follow=False, **extra):
extra.update(self._credentials)
response = super(APIClient, self).post(path, data=data, format=format, content_type=content_type, **extra)
if follow:
response = self._handle_redirects(response, **extra)
return response