openstack/deb-python-oauth2client
Code Issues Proposed changes

Reviewed in http://codereview.appspot.com/4515195/

Browse Source
This commit is contained in:
Joe Gregorio
2011-06-13 09:35:26 -04:00
parent 14edb84640
commit f427c53ecc
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
oauth2client/appengine.py
View File

@@ -220,12 +220,16 @@ class OAuth2Decorator(object):
method: callable, to be decorated method of a webapp.RequestHandler method: callable, to be decorated method of a webapp.RequestHandler
instance. instance.
""" """
@login_required
def check_oauth(request_handler, *args): def check_oauth(request_handler, *args):
user = users.get_current_user()
# Don't use @login_decorator as this could be used in a POST request.
if not user:
request_handler.redirect(users.create_login_url(
request_handler.request.uri))
return
# Store the request URI in 'state' so we can use it later # Store the request URI in 'state' so we can use it later
self.flow.params['state'] = request_handler.request.url self.flow.params['state'] = request_handler.request.url
self._request_handler = request_handler self._request_handler = request_handler
user = users.get_current_user()
self.credentials = StorageByKeyName( self.credentials = StorageByKeyName(
CredentialsModel, user.user_id(), 'credentials').get() CredentialsModel, user.user_id(), 'credentials').get()
@@ -251,11 +255,15 @@ class OAuth2Decorator(object):
method: callable, to be decorated method of a webapp.RequestHandler method: callable, to be decorated method of a webapp.RequestHandler
instance. instance.
""" """
@login_required
def setup_oauth(request_handler, *args): def setup_oauth(request_handler, *args):
user = users.get_current_user()
# Don't use @login_decorator as this could be used in a POST request.
if not user:
request_handler.redirect(users.create_login_url(
request_handler.request.uri))
return
self.flow.params['state'] = request_handler.request.url self.flow.params['state'] = request_handler.request.url
self._request_handler = request_handler self._request_handler = request_handler
user = users.get_current_user()
self.credentials = StorageByKeyName( self.credentials = StorageByKeyName(
CredentialsModel, user.user_id(), 'credentials').get() CredentialsModel, user.user_id(), 'credentials').get()
method(request_handler, *args) method(request_handler, *args)