add user_agent back to OAuth2Decorator argument
diff --git a/oauth2client/appengine.py b/oauth2client/appengine.py
index f97ce69..b463100 100644
--- a/oauth2client/appengine.py
+++ b/oauth2client/appengine.py
@@ -309,6 +309,7 @@
def __init__(self, client_id, client_secret, scope,
auth_uri='https://accounts.google.com/o/oauth2/auth',
token_uri='https://accounts.google.com/o/oauth2/token',
+ user_agent=None,
message=None, **kwargs):
"""Constructor for OAuth2Decorator
@@ -322,13 +323,14 @@
defaults to Google's endpoints but any OAuth 2.0 provider can be used.
token_uri: string, URI for token endpoint. For convenience
defaults to Google's endpoints but any OAuth 2.0 provider can be used.
+ user_agent: string, User agent of your application, default to None.
message: Message to display if there are problems with the OAuth 2.0
configuration. The message may contain HTML and will be presented on the
web interface for any method that uses the decorator.
**kwargs: dict, Keyword arguments are be passed along as kwargs to the
OAuth2WebServerFlow constructor.
"""
- self.flow = OAuth2WebServerFlow(client_id, client_secret, scope, None,
+ self.flow = OAuth2WebServerFlow(client_id, client_secret, scope, user_agent,
auth_uri, token_uri, **kwargs)
self.credentials = None
self._request_handler = None
diff --git a/tests/test_oauth2client_appengine.py b/tests/test_oauth2client_appengine.py
index 90ee335..1f58814 100644
--- a/tests/test_oauth2client_appengine.py
+++ b/tests/test_oauth2client_appengine.py
@@ -134,7 +134,8 @@
decorator = OAuth2Decorator(client_id='foo_client_id',
client_secret='foo_client_secret',
- scope=['foo_scope', 'bar_scope'])
+ scope=['foo_scope', 'bar_scope'],
+ user_agent='foo')
self.decorator = decorator
class TestRequiredHandler(webapp.RequestHandler):
@@ -264,11 +265,14 @@
def test_kwargs_are_passed_to_underlying_flow(self):
decorator = OAuth2Decorator(client_id='foo_client_id',
client_secret='foo_client_secret',
+ user_agent='foo_user_agent',
scope=['foo_scope', 'bar_scope'],
access_type='offline',
approval_prompt='force')
self.assertEqual('offline', decorator.flow.params['access_type'])
self.assertEqual('force', decorator.flow.params['approval_prompt'])
+ self.assertEqual('foo_user_agent', decorator.flow.user_agent)
+ self.assertEqual(None, decorator.flow.params.get('user_agent', None))
if __name__ == '__main__':