Commit7fbf5b0

committed

Merge pull request#2155 from martinmaillard/set-user-on-wrapped-request

Set authenticated user on wrapped request

2 parentsd872c8e +a68e78b commit7fbf5b0Copy full SHA for 7fbf5b0

File tree

+49

-4

lines changed

+49

-4

lines changed

Lines changed: 6 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -277,8 +277,11 @@ def user(self, value):`
`277`	`277`	`Sets the user on the current request. This is necessary to maintain`
`278`	`278`	`compatibility with django.contrib.auth where the user property is`
`279`	`279`	`set in the login and logout functions.`
	`280`	`+`
	`281`	`+ Sets the user on the wrapped original request as well.`
`280`	`282`	`"""`
`281`	`283`	`self._user=value`
	`284`	`+self._request.user=value`
`282`	`285`
`283`	`286`	`@property`
`284`	`287`	`defauth(self):`
`@@ -456,7 +459,7 @@ def _authenticate(self):`
`456`	`459`
`457`	`460`	`ifuser_auth_tupleisnotNone:`
`458`	`461`	`self._authenticator=authenticator`
`459`		`-self._user,self._auth=user_auth_tuple`
	`462`	`+self.user,self._auth=user_auth_tuple`
`460`	`463`	`return`
`461`	`464`
`462`	`465`	`self._not_authenticated()`
`@@ -471,9 +474,9 @@ def _not_authenticated(self):`
`471`	`474`	`self._authenticator=None`
`472`	`475`
`473`	`476`	`ifapi_settings.UNAUTHENTICATED_USER:`
`474`		`-self._user=api_settings.UNAUTHENTICATED_USER()`
	`477`	`+self.user=api_settings.UNAUTHENTICATED_USER()`
`475`	`478`	`else:`
`476`		`-self._user=None`
	`479`	`+self.user=None`
`477`	`480`
`478`	`481`	`ifapi_settings.UNAUTHENTICATED_TOKEN:`
`479`	`482`	`self._auth=api_settings.UNAUTHENTICATED_TOKEN()`

Lines changed: 37 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,37 @@`
	`1`	`+`
	`2`	`+fromdjango.conf.urlsimportpatterns,url`
	`3`	`+fromdjango.contrib.auth.modelsimportUser`
	`4`	`+fromrest_framework.authenticationimportTokenAuthentication`
	`5`	`+fromrest_framework.authtoken.modelsimportToken`
	`6`	`+fromrest_framework.testimportAPITestCase`
	`7`	`+fromrest_framework.viewsimportAPIView`
	`8`	`+`
	`9`	`+`
	`10`	`+urlpatterns=patterns(`
	`11`	`+'',`
	`12`	`+url(r'^$',APIView.as_view(authentication_classes=(TokenAuthentication,))),`
	`13`	`+)`
	`14`	`+`
	`15`	`+`
	`16`	`+classMyMiddleware(object):`
	`17`	`+`
	`18`	`+defprocess_response(self,request,response):`
	`19`	+asserthasattr(request,'user'),'`user` is not set on request'
	`20`	+assertrequest.user.is_authenticated(),'`user` is not authenticated'
	`21`	`+returnresponse`
	`22`	`+`
	`23`	`+`
	`24`	`+classTestMiddleware(APITestCase):`
	`25`	`+`
	`26`	`+urls='tests.test_middleware'`
	`27`	`+`
	`28`	`+deftest_middleware_can_access_user_when_processing_response(self):`
	`29`	`+user=User.objects.create_user('john','john@example.com','password')`
	`30`	`+key='abcd1234'`
	`31`	`+Token.objects.create(key=key,user=user)`
	`32`	`+`
	`33`	`+withself.settings(`
	`34`	`+MIDDLEWARE_CLASSES=('tests.test_middleware.MyMiddleware',)`
	`35`	`+ ):`
	`36`	`+auth='Token '+key`
	`37`	`+self.client.get('/',HTTP_AUTHORIZATION=auth)`

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -224,7 +224,8 @@ class TestUserSetter(TestCase):`
`224`	`224`	`defsetUp(self):`
`225`	`225`	`# Pass request object through session middleware so session is`
`226`	`226`	`# available to login and logout functions`
`227`		`-self.request=Request(factory.get('/'))`
	`227`	`+self.wrapped_request=factory.get('/')`
	`228`	`+self.request=Request(self.wrapped_request)`
`228`	`229`	`SessionMiddleware().process_request(self.request)`
`229`	`230`
`230`	`231`	`User.objects.create_user('ringo','starr@thebeatles.com','yellow')`
`@@ -244,6 +245,10 @@ def test_user_can_logout(self):`
`244`	`245`	`logout(self.request)`
`245`	`246`	`self.assertTrue(self.request.user.is_anonymous())`
`246`	`247`
	`248`	`+deftest_logged_in_user_is_set_on_wrapped_request(self):`
	`249`	`+login(self.request,self.user)`
	`250`	`+self.assertEqual(self.wrapped_request.user,self.user)`
	`251`	`+`
`247`	`252`
`248`	`253`	`classTestAuthSetter(TestCase):`
`249`	`254`

Comments

(0)