Allow access_type parameter to be overriden (googleapis#16)

Jon Wayne Parrott · web-flow · commit 0e6eade7350e · 2017-09-19T12:26:05.000-07:00
diff --git a/packages/google-auth-oauthlib/google_auth_oauthlib/flow.py b/packages/google-auth-oauthlib/google_auth_oauthlib/flow.py
@@ -87,7 +87,9 @@ class Flow(object):
         https://console.developers.google.com/apis/credentials
     """
 
-    def __init__(self, oauth2session, client_type, client_config):
+    def __init__(
+            self, oauth2session, client_type, client_config,
+            redirect_uri=None):
         """
         Args:
             oauth2session (requests_oauthlib.OAuth2Session):
@@ -96,6 +98,9 @@ def __init__(self, oauth2session, client_type, client_config):
                 ``installed``.
             client_config (Mapping[str, Any]): The client
                 configuration in the Google `client secrets`_ format.
+            redirect_uri (str): The OAuth 2.0 redirect URI if known at flow
+                creation time. Otherwise, it will need to be set using
+                :attr:`redirect_uri`.
 
         .. _client secrets:
             https://developers.google.com/api-client-library/python/guide
@@ -107,6 +112,7 @@ def __init__(self, oauth2session, client_type, client_config):
         """Mapping[str, Any]: The OAuth 2.0 client configuration."""
         self.oauth2session = oauth2session
         """requests_oauthlib.OAuth2Session: The OAuth 2.0 session."""
+        self.redirect_uri = redirect_uri
 
     @classmethod
     def from_client_config(cls, client_config, scopes, **kwargs):
@@ -200,9 +206,9 @@ def authorization_url(self, **kwargs):
                 :class:`Flow` instance to obtain the token, you will need to
                 specify the ``state`` when constructing the :class:`Flow`.
         """
+        kwargs.setdefault('access_type', 'offline')
         url, state = self.oauth2session.authorization_url(
-            self.client_config['auth_uri'],
-            access_type='offline', **kwargs)
+            self.client_config['auth_uri'], **kwargs)
 
         return url, state
 
@@ -229,10 +235,9 @@ def fetch_token(self, **kwargs):
                 :meth:`credentials` to obtain a
                 :class:`~google.auth.credentials.Credentials` instance.
         """
+        kwargs.setdefault('client_secret', self.client_config['client_secret'])
         return self.oauth2session.fetch_token(
-            self.client_config['token_uri'],
-            client_secret=self.client_config['client_secret'],
-            **kwargs)
+            self.client_config['token_uri'], **kwargs)
 
     @property
     def credentials(self):
diff --git a/packages/google-auth-oauthlib/tests/test_flow.py b/packages/google-auth-oauthlib/tests/test_flow.py
@@ -81,6 +81,22 @@ def test_authorization_url(self, instance):
                 access_type='offline',
                 prompt='consent')
 
+    def test_authorization_url_access_type(self, instance):
+        scope = 'scope_one'
+        instance.oauth2session.scope = [scope]
+        authorization_url_patch = mock.patch.object(
+            instance.oauth2session, 'authorization_url',
+            wraps=instance.oauth2session.authorization_url)
+
+        with authorization_url_patch as authorization_url_spy:
+            url, _ = instance.authorization_url(access_type='meep')
+
+            assert CLIENT_SECRETS_INFO['web']['auth_uri'] in url
+            assert scope in url
+            authorization_url_spy.assert_called_with(
+                CLIENT_SECRETS_INFO['web']['auth_uri'],
+                access_type='meep')
+
     def test_fetch_token(self, instance):
         fetch_token_patch = mock.patch.object(
             instance.oauth2session, 'fetch_token', autospec=True,
