Skip to content

wrong exception is sent due to separator being hard coded to "?" when raising an error #239

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 23, 2015
Merged

wrong exception is sent due to separator being hard coded to "?" when raising an error #239

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a2984e3
separator is hard coded to "?", when in fact it may need to be an & b…
honestbleeps Apr 27, 2015
27fe47b
fix test coverage
honestbleeps Apr 28, 2015
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
10 changes: 9 additions & 1 deletion oauth2_provider/views/mixins.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,9 +155,17 @@ def error_response(self, error, **kwargs):
:param error: :attr:`OAuthToolkitError`
"""
oauthlib_error = error.oauthlib_error

separator = '?'
try:
if '?' in oauthlib_error.redirect_uri:
separator = '&'
except:
pass
Copy link
Contributor

@masci masci Apr 30, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sorry for being pedantic but I don't like except: pass very much ;)
What about something like:

redirect_uri = oauthlib_error.redirect_uri or ""
separator = '&' if '?' in redirect_uri else '?'

Also, I guess a test case checking the double ? problem (a test that fails without your patch) should be added


error_response = {
'error': oauthlib_error,
'url': "{0}?{1}".format(oauthlib_error.redirect_uri, oauthlib_error.urlencoded)
'url': "{0}{1}{2}".format(oauthlib_error.redirect_uri, separator, oauthlib_error.urlencoded)
}
error_response.update(kwargs)

Expand Down