Add setting to define extra arguments that should be sent to providers

diff --git a/README.rst b/README.rst
index b18cfa8b592f4c8a9da96114d0bf992394106bcb..0ee4894ab41b98084d91104d3ba670e1d28f2c45 100644 (file)
--- a/README.rst
+++ b/README.rst
@@ -293,6 +293,16 @@ Configuration
 
       SOCIAL_AUTH_ASSOCIATE_BY_MAIL = True
 
+- You can send extra parameters on auth process by defining settings per
+  provider, example to request Facebook to show Mobile authorization page,
+  define::
+
+      FACEBOOK_AUTH_EXTRA_ARGUMENTS = {'display': 'touch'}
+
+  For other providers, just define settings in the form::
+
+      <uppercase backend name>_AUTH_EXTRA_ARGUMENTS = {...}
+
 
 -------
 Signals

diff --git a/doc/configuration.rst b/doc/configuration.rst
index 6c3b8f3ac92b5334c3e31b887b0a6b4ee200cf8e..4c2cc1f1edbc8fc055155f0dcdcde3d04ddb2e51 100644 (file)
--- a/doc/configuration.rst
+++ b/doc/configuration.rst
@@ -197,6 +197,16 @@ Configuration
 
       SOCIAL_AUTH_ASSOCIATE_BY_MAIL = True
 
+- You can send extra parameters on auth process by defining settings per
+  provider, example to request Facebook to show Mobile authorization page,
+  define::
+
+      FACEBOOK_AUTH_EXTRA_ARGUMENTS = {'display': 'touch'}
+
+  For other providers, just define settings in the form::
+
+      <uppercase backend name>_AUTH_EXTRA_ARGUMENTS = {...}
+
 
 .. _Model Manager: http://docs.djangoproject.com/en/dev/topics/db/managers/#managers
 .. _Login URL: http://docs.djangoproject.com/en/dev/ref/settings/?from=olddocs#login-url

diff --git a/social_auth/backends/__init__.py b/social_auth/backends/__init__.py
index 5db8fd6a912855a1b661466f45f3279ef9d798c3..2bda3972d9d60ebafee44b929af72ccb6bf9155d 100644 (file)
--- a/social_auth/backends/__init__.py
+++ b/social_auth/backends/__init__.py
@@ -14,7 +14,7 @@ from os.path import basename
 from uuid import uuid4
 from urllib2 import Request, urlopen
 from urllib import urlencode
-from httplib import HTTPSConnection
+from urlparse import urlsplit
 
 from openid.consumer.consumer import Consumer, SUCCESS, CANCEL, FAILURE
 from openid.consumer.discover import DiscoveryFailure
@@ -418,6 +418,13 @@ class BaseAuth(object):
         """Completes loging process, must return user instance"""
         raise NotImplementedError('Implement in subclass')
 
+    def auth_extra_arguments(self):
+        """Return extra argumens needed on auth process, setting is per bancked
+        and defined by <backend name in uppercase>_AUTH_EXTRA_ARGUMENTS.
+        """
+        name = self.AUTH_BACKEND.name.upper() + '_AUTH_EXTRA_ARGUMENTS'
+        return getattr(settings, name, {})
+
     @property
     def uses_redirect(self):
         """Return True if this provider uses redirect url method,
@@ -445,14 +452,14 @@ class OpenIdAuth(BaseAuth):
 
     def auth_url(self):
         """Return auth URL returned by service"""
-        openid_request = self.setup_request()
+        openid_request = self.setup_request(self.auth_extra_arguments())
         # Construct completion URL, including page we should redirect to
         return_to = self.request.build_absolute_uri(self.redirect)
         return openid_request.redirectURL(self.trust_root(), return_to)
 
     def auth_html(self):
         """Return auth HTML returned by service"""
-        openid_request = self.setup_request()
+        openid_request = self.setup_request(self.auth_extra_arguments())
         return_to = self.request.build_absolute_uri(self.redirect)
         form_tag = {'id': 'openid_message'}
         return openid_request.htmlMarkup(self.trust_root(), return_to,
@@ -481,9 +488,9 @@ class OpenIdAuth(BaseAuth):
             raise ValueError('Unknown OpenID response type: %r' % \
                              response.status)
 
-    def setup_request(self):
+    def setup_request(self, extra_params=None):
         """Setup request"""
-        openid_request = self.openid_request()
+        openid_request = self.openid_request(extra_params)
         # Request some user details. Use attribute exchange if provider
         # advertises support.
         if openid_request.endpoint.supportsType(ax.AXMessage.ns_uri):
@@ -508,22 +515,19 @@ class OpenIdAuth(BaseAuth):
         """Return true if openid request will be handled with redirect or
         HTML content will be returned.
         """
-        if not hasattr(self, '_uses_redirect'):
-            setattr(self, '_uses_redirect',
-                    self.openid_request().shouldSendRedirect())
-        return getattr(self, '_uses_redirect', True)
+        return self.openid_request().shouldSendRedirect()
 
-    def openid_request(self):
+    def openid_request(self, extra_params=None):
         """Return openid request"""
-        if not hasattr(self, '_openid_request'):
-            openid_url = self.openid_url()
-            try:
-                openid_request = self.consumer().begin(openid_url)
-            except DiscoveryFailure, err:
-                raise ValueError('OpenID discovery error: %s' % err)
-            else:
-                setattr(self, '_openid_request', openid_request)
-        return getattr(self, '_openid_request', None)
+        openid_url = self.openid_url()
+        if extra_params:
+            query = urlsplit(openid_url).query
+            openid_url += (query and '&' or '?') + urlencode(extra_params)
+
+        try:
+            return self.consumer().begin(openid_url)
+        except DiscoveryFailure, err:
+            raise ValueError('OpenID discovery error: %s' % err)
 
     def openid_url(self):
         """Return service provider URL.
@@ -563,7 +567,8 @@ class ConsumerBasedOAuth(BaseOAuth):
         token = self.unauthorized_token()
         name = self.AUTH_BACKEND.name + 'unauthorized_token_name'
         self.request.session[name] = token.to_string()
-        return self.oauth_request(token, self.AUTHORIZATION_URL).to_url()
+        return self.oauth_request(token, self.AUTHORIZATION_URL,
+                                  self.auth_extra_arguments()).to_url()
 
     def auth_complete(self, *args, **kwargs):
         """Return user, might be logged in"""
@@ -607,9 +612,8 @@ class ConsumerBasedOAuth(BaseOAuth):
 
     def fetch_response(self, request):
         """Executes request and fetchs service response"""
-        connection = HTTPSConnection(self.SERVER_URL)
-        connection.request(request.method.upper(), request.to_url())
-        return connection.getresponse().read()
+        response = urlopen(request.to_url())
+        return '\n'.join(response.readlines())
 
     def access_token(self, token):
         """Return request for access token value"""
@@ -623,11 +627,7 @@ class ConsumerBasedOAuth(BaseOAuth):
     @property
     def consumer(self):
         """Setups consumer"""
-        consumer = getattr(self, '_consumer', None)
-        if consumer is None:
-            consumer = OAuthConsumer(*self.get_key_and_secret())
-            setattr(self, '_consumer', consumer)
-        return consumer
+        return OAuthConsumer(*self.get_key_and_secret())
 
     def get_key_and_secret(self):
         """Return tuple with Consumer Key and Consumer Secret for current
@@ -663,10 +663,15 @@ class BaseOAuth2(BaseOAuth):
                 'scope': ' '.join(self.get_scope()),
                 'redirect_uri': self.redirect_uri,
                 'response_type': 'code'}  # requesting code
+        args.update(self.auth_extra_arguments())
         return self.AUTHORIZATION_URL + '?' + urlencode(args)
 
     def auth_complete(self, *args, **kwargs):
         """Completes loging process, must return user instance"""
+        if self.data.get('error'):
+            error = self.data.get('error_description') or self.data['error']
+            raise ValueError('OAuth2 authentication failed: %s' % error)
+
         client_id, client_secret = self.get_key_and_secret()
         params = {'grant_type': 'authorization_code',  # request auth code
                   'code': self.data.get('code', ''),  # server response code

diff --git a/social_auth/backends/contrib/github.py b/social_auth/backends/contrib/github.py
index 82bef4b9322ba300f5e712181a25b728c5e8dd1f..9bc5a5cbaeb3da2cab80f9c5ce53c091307bd48a 100644 (file)
--- a/social_auth/backends/contrib/github.py
+++ b/social_auth/backends/contrib/github.py
@@ -52,6 +52,7 @@ class GithubAuth(BaseOAuth):
                 'redirect_uri': self.redirect_uri}
         if hasattr(settings, 'GITHUB_EXTENDED_PERMISSIONS'):
             args['scope'] = ','.join(settings.GITHUB_EXTENDED_PERMISSIONS)
+        args.update(self.auth_extra_arguments())
         return GITHUB_AUTHORIZATION_URL + '?' + urllib.urlencode(args)
 
     def auth_complete(self, *args, **kwargs):

diff --git a/social_auth/backends/facebook.py b/social_auth/backends/facebook.py
index 351701280c2188865901c3a41af02410f24322af..661bc471a84aa768ba8f92b220e74971a77cb87a 100644 (file)
--- a/social_auth/backends/facebook.py
+++ b/social_auth/backends/facebook.py
@@ -55,6 +55,7 @@ class FacebookAuth(BaseOAuth):
                 'redirect_uri': self.redirect_uri}
         if hasattr(settings, 'FACEBOOK_EXTENDED_PERMISSIONS'):
             args['scope'] = ','.join(settings.FACEBOOK_EXTENDED_PERMISSIONS)
+        args.update(self.auth_extra_arguments())
         return FACEBOOK_AUTHORIZATION_URL + '?' + urlencode(args)
 
     def auth_complete(self, *args, **kwargs):