Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions oauth2_provider/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
'AUTHORIZATION_CODE_EXPIRE_SECONDS': 60,
'ACCESS_TOKEN_EXPIRE_SECONDS': 36000,
'APPLICATION_MODEL': getattr(settings, 'OAUTH2_PROVIDER_APPLICATION_MODEL', 'oauth2_provider.Application'),
'REQUEST_APPROVAL_PROMPT': 'force',

# Special settings that will be evaluated at runtime
'_SCOPES': [],
Expand Down
44 changes: 44 additions & 0 deletions oauth2_provider/tests/test_authorization_code.py
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,50 @@ def test_pre_auth_approval_prompt(self):
response = self.client.get(url)
self.assertEqual(response.status_code, 200)

def test_pre_auth_approval_prompt_default(self):
"""

"""
self.assertEqual(oauth2_settings.REQUEST_APPROVAL_PROMPT, 'force')

AccessToken.objects.create(user=self.test_user, token='1234567890',
application=self.application,
expires=timezone.now()+datetime.timedelta(days=1),
scope='read write')
self.client.login(username="test_user", password="123456")
query_string = urlencode({
'client_id': self.application.client_id,
'response_type': 'code',
'state': 'random_state_string',
'scope': 'read write',
'redirect_uri': 'http://example.it',
})
url = "{url}?{qs}".format(url=reverse('oauth2_provider:authorize'), qs=query_string)
response = self.client.get(url)
self.assertEqual(response.status_code, 200)

def test_pre_auth_approval_prompt_default_override(self):
"""

"""
oauth2_settings.REQUEST_APPROVAL_PROMPT = 'auto'

AccessToken.objects.create(user=self.test_user, token='1234567890',
application=self.application,
expires=timezone.now()+datetime.timedelta(days=1),
scope='read write')
self.client.login(username="test_user", password="123456")
query_string = urlencode({
'client_id': self.application.client_id,
'response_type': 'code',
'state': 'random_state_string',
'scope': 'read write',
'redirect_uri': 'http://example.it',
})
url = "{url}?{qs}".format(url=reverse('oauth2_provider:authorize'), qs=query_string)
response = self.client.get(url)
self.assertEqual(response.status_code, 302)

def test_pre_auth_default_redirect(self):
"""
Test for default redirect uri if omitted from query string with response_type: code
Expand Down
2 changes: 1 addition & 1 deletion oauth2_provider/views/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ def get(self, request, *args, **kwargs):

# Check to see if the user has already granted access and return
# a successful response depending on 'approval_prompt' url parameter
require_approval = request.GET.get('approval_prompt', 'force')
require_approval = request.GET.get('approval_prompt', oauth2_settings.REQUEST_APPROVAL_PROMPT)
if require_approval == 'auto':
tokens = request.user.accesstoken_set.filter(application=kwargs['application'],
expires__gt=timezone.now()).all()
Expand Down
2 changes: 1 addition & 1 deletion requirements/testing.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
-r optional.txt
coverage==3.6
mock
mock