Rooba
/
tornado
mirror of https://github.com/tornadoweb/tornado.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use request.uri instead of request.path as default redirect for auth.py. 

This allows the next parameter (added by @authenticated) to be preserved.

Closes #161.
This commit is contained in:
Ben Darnell 2010-11-29 15:01:16 -08:00
parent 6151498dba
commit 96ecb6603a
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tornado/auth.py
View File

@ -77,7 +77,7 @@ class OpenIdMixin(object):
all those attributes for your app, you can request fewer with all those attributes for your app, you can request fewer with
the ax_attrs keyword argument. the ax_attrs keyword argument.
""" """
callback_uri = callback_uri or self.request.path callback_uri = callback_uri or self.request.uri
args = self._openid_args(callback_uri, ax_attrs=ax_attrs) args = self._openid_args(callback_uri, ax_attrs=ax_attrs)
self.redirect(self._OPENID_ENDPOINT + "?" + urllib.urlencode(args)) self.redirect(self._OPENID_ENDPOINT + "?" + urllib.urlencode(args))
@ -703,7 +703,7 @@ class GoogleMixin(OpenIdMixin, OAuthMixin):
You can authorize multiple resources by separating the resource You can authorize multiple resources by separating the resource
URLs with a space. URLs with a space.
""" """
callback_uri = callback_uri or self.request.path callback_uri = callback_uri or self.request.uri
args = self._openid_args(callback_uri, ax_attrs=ax_attrs, args = self._openid_args(callback_uri, ax_attrs=ax_attrs,
oauth_scope=oauth_scope) oauth_scope=oauth_scope)
self.redirect(self._OPENID_ENDPOINT + "?" + urllib.urlencode(args)) self.redirect(self._OPENID_ENDPOINT + "?" + urllib.urlencode(args))
@ -771,7 +771,7 @@ class FacebookMixin(object):
extended_permissions=None): extended_permissions=None):
"""Authenticates/installs this app for the current user.""" """Authenticates/installs this app for the current user."""
self.require_setting("facebook_api_key", "Facebook Connect") self.require_setting("facebook_api_key", "Facebook Connect")
callback_uri = callback_uri or self.request.path callback_uri = callback_uri or self.request.uri
args = { args = {
"api_key": self.settings["facebook_api_key"], "api_key": self.settings["facebook_api_key"],
"v": "1.0", "v": "1.0",