Merge remote-tracking branch 'anka/master'

Author: pennersr

AUTHORS

@@ -11,6 +11,7 @@ Adam McKerlie
 Ahmet Emre Aladağ
 Aldiantoro Nugroho
 Alexander Gaevsky
+Anna Sirota
 Andrean Franc
 Andrey Balandin
 Andy Matthews

ChangeLog

@@ -1,3 +1,7 @@
+2016-03-11  Raymond Penners  <[email protected]>
+
+	* Shopify is now a supported provider, thanks Anna Sirota!
+
 2016-03-10  Raymond Penners  <[email protected]>
 
 	* In order to be secure by default, users are now blocked from

allauth/compat.py

@@ -17,9 +17,9 @@ def render_to_string(template_name, context=None, request=None, using=None):
         return _render_to_string(template_name, context, RequestContext(request))
 
 try:
-    from urllib.parse import parse_qsl, urlparse, urlunparse
+    from urllib.parse import parse_qsl, parse_qs, urlparse, urlunparse
 except ImportError:
-    from urlparse import parse_qsl, urlparse, urlunparse  # noqa
+    from urlparse import parse_qsl, parse_qs, urlparse, urlunparse  # noqa
 
 try:
     import importlib

allauth/socialaccount/providers/google/tests.py

@@ -68,7 +68,7 @@ def raise_for_status(self):
             reverse(self.provider.id + '_login'),
             dict(process='login'))
 
-        adapter = GoogleOAuth2Adapter()
+        adapter = GoogleOAuth2Adapter(request)
         app = adapter.get_provider().get_app(request)
         token = SocialToken(token='some_token')
         response_with_401 = LessMockedResponse(

allauth/socialaccount/providers/oauth/views.py

@@ -14,6 +14,9 @@
 
 class OAuthAdapter(object):
 
+    def __init__(self, request):
+        self.request = request
+
     def complete_login(self, request, app):
         """
         Returns a SocialLogin instance
@@ -30,7 +33,7 @@ def adapter_view(cls, adapter):
         def view(request, *args, **kwargs):
             self = cls()
             self.request = request
-            self.adapter = adapter()
+            self.adapter = adapter(request)
             return self.dispatch(request, *args, **kwargs)
         return view
 

allauth/socialaccount/providers/oauth2/views.py

@@ -7,6 +7,7 @@
 from django.http import HttpResponseRedirect
 from django.utils import timezone
 
+from allauth.exceptions import ImmediateHttpResponse
 from allauth.utils import build_absolute_uri
 from allauth.account import app_settings
 from allauth.socialaccount.helpers import render_authentication_error
@@ -29,6 +30,9 @@ class OAuth2Adapter(object):
     basic_auth = False
     headers = None
 
+    def __init__(self, request):
+        self.request = request
+
     def get_provider(self):
         return providers.registry.by_id(self.provider_id)
 
@@ -54,8 +58,11 @@ def adapter_view(cls, adapter):
         def view(request, *args, **kwargs):
             self = cls()
             self.request = request
-            self.adapter = adapter()
-            return self.dispatch(request, *args, **kwargs)
+            self.adapter = adapter(request)
+            try:
+                return self.dispatch(request, *args, **kwargs)
+            except ImmediateHttpResponse as e:
+                return e.response
         return view
 
     def get_client(self, request, app):

allauth/socialaccount/providers/shopify/__init__.py

@@ -0,0 +1 @@
+# Create your models here.

allauth/socialaccount/providers/shopify/models.py

@@ -0,0 +1,35 @@
+from allauth.socialaccount import providers
+from allauth.socialaccount.providers.base import ProviderAccount
+from allauth.socialaccount.providers.oauth2.provider import OAuth2Provider
+
+
+class ShopifyAccount(ProviderAccount):
+    pass
+
+
+class ShopifyProvider(OAuth2Provider):
+    id = 'shopify'
+    name = 'Shopify'
+    package = 'allauth.socialaccount.providers.shopify'
+    account_class = ShopifyAccount
+
+    def get_auth_params(self, request, action):
+        ret = super(ShopifyProvider, self).get_auth_params(request, action)
+        shop = request.GET.get('shop', None)
+        if shop:
+            ret.update({'shop': shop})
+        return ret
+
+    def get_default_scope(self):
+        return ['read_orders', 'read_products']
+
+    def extract_uid(self, data):
+        return str(data['shop']['id'])
+
+    def extract_common_fields(self, data):
+        # See: https://docs.shopify.com/api/shop
+        # User is only available with Shopify Plus, email is the only
+        # common field
+        return dict(email=data['shop']['email'])
+
+providers.registry.register(ShopifyProvider)

allauth/socialaccount/providers/shopify/provider.py

@@ -0,0 +1,44 @@
+from django.core.urlresolvers import reverse
+
+from allauth.socialaccount.tests import create_oauth2_tests
+from allauth.tests import MockedResponse, mocked_response
+from allauth.socialaccount.providers import registry
+from allauth.compat import parse_qs, urlparse
+
+from .provider import ShopifyProvider
+
+
+class ShopifyTests(create_oauth2_tests(registry.by_id(ShopifyProvider.id))):
+    def login(self, resp_mock, process='login', with_refresh_token=True):
+        resp = self.client.get(reverse(self.provider.id + '_login'),
+                               {'process': process, 'shop': 'test'})
+        p = urlparse(resp['location'])
+        q = parse_qs(p.query)
+        complete_url = reverse(self.provider.id+'_callback')
+        self.assertGreater(q['redirect_uri'][0]
+                           .find(complete_url), 0)
+        response_json = self \
+            .get_login_response_json(with_refresh_token=with_refresh_token)
+        with mocked_response(
+                MockedResponse(
+                    200,
+                    response_json,
+                    {'content-type': 'application/json'}),
+                resp_mock):
+            resp = self.client.get(complete_url,
+                                   {'code': 'test',
+                                    'state': q['state'][0],
+                                    'shop': 'test',
+                                    })
+        return resp
+
+    def get_mocked_response(self):
+        return MockedResponse(200, """
+        {
+            "shop": {
+                "id": "1234566",
+                "name": "Test Shop",
+                "email": "[email protected]"
+            }
+        }
+        """)

allauth/socialaccount/providers/shopify/tests.py

@@ -0,0 +1,4 @@
+from allauth.socialaccount.providers.oauth2.urls import default_urlpatterns
+from .provider import ShopifyProvider
+
+urlpatterns = default_urlpatterns(ShopifyProvider)

allauth/socialaccount/providers/shopify/urls.py

@@ -0,0 +1,58 @@
+import re
+import requests
+
+from django.http import HttpResponseBadRequest
+
+from allauth.exceptions import ImmediateHttpResponse
+from allauth.socialaccount.providers.oauth2.views import (OAuth2Adapter,
+                                                          OAuth2LoginView,
+                                                          OAuth2CallbackView)
+from .provider import ShopifyProvider
+
+
+class ShopifyOAuth2Adapter(OAuth2Adapter):
+    provider_id = ShopifyProvider.id
+    supports_state = False
+    scope_delimiter = ','
+
+    def _shop_domain(self):
+        shop = self.request.GET.get('shop', '')
+        if '.' not in shop:
+            shop = '{}.myshopify.com'.format(shop)
+        # Ensure the provided hostname parameter is a valid hostname,
+        # ends with myshopify.com, and does not contain characters
+        # other than letters (a-z), numbers (0-9), dots, and hyphens.
+        if not re.match(r'^[a-z0-9-]+\.myshopify\.com$', shop):
+            raise ImmediateHttpResponse(HttpResponseBadRequest(
+                'Invalid `shop` parameter'))
+        return shop
+
+    def _shop_url(self, path):
+        shop = self._shop_domain()
+        return 'https://{}{}'.format(shop, path)
+
+    @property
+    def access_token_url(self):
+        return self._shop_url('/admin/oauth/access_token')
+
+    @property
+    def authorize_url(self):
+        return self._shop_url('/admin/oauth/authorize')
+
+    @property
+    def profile_url(self):
+        return self._shop_url('/admin/shop.json')
+
+    def complete_login(self, request, app, token, **kwargs):
+        headers = {
+            'X-Shopify-Access-Token': '{token}'.format(token=token.token)}
+        response = requests.get(
+            self.profile_url,
+            headers=headers)
+        extra_data = response.json()
+        return self.get_provider().sociallogin_from_response(
+            request, extra_data)
+
+
+oauth2_login = OAuth2LoginView.adapter_view(ShopifyOAuth2Adapter)
+oauth2_callback = OAuth2CallbackView.adapter_view(ShopifyOAuth2Adapter)

allauth/socialaccount/providers/shopify/views.py

@@ -0,0 +1 @@
+{% extends "socialaccount/base.html" %}

allauth/templates/shopify/base.html

@@ -0,0 +1,21 @@
+{% extends "shopify/base.html" %}
+
+{% load i18n socialaccount %}
+
+{% block head_title %}Shopify Sign In{% endblock %}
+
+{% block content %}
+
+<h1>{% trans 'Shopify Sign In' %}</h1>
+
+
+<form class="shopify_login" method="post" action="{% provider_login_url "shopify" %}">
+{% csrf_token %}
+<label for="auth_param_shop">Enter your Shopify store name:
+    <input type="text" placeholder="your-store" name="shop" id="auth_param_shop">
+    <span>.myshopify.com</span>
+</label>
+<button type="submit">Sign In</button>
+</form>
+
+{% endblock %}

allauth/templates/shopify/login.html

@@ -81,6 +81,7 @@ settings.py (Important - Please note 'django.contrib.sites' is required as INSTA
         'allauth.socialaccount.providers.persona',
         'allauth.socialaccount.providers.pinterest',
         'allauth.socialaccount.providers.reddit',
+        'allauth.socialaccount.providers.shopify',
         'allauth.socialaccount.providers.soundcloud',
         'allauth.socialaccount.providers.spotify',
         'allauth.socialaccount.providers.stackexchange',

docs/installation.rst

@@ -89,6 +89,8 @@ Supported Providers
 
 - Reddit (OAuth2)
 
+- Shopify (OAuth2)
+
 - SoundCloud (OAuth2)
 
 - Spotify (OAuth2)

docs/overview.rst

@@ -148,6 +148,7 @@
     'allauth.socialaccount.providers.openid',
     'allauth.socialaccount.providers.persona',
     'allauth.socialaccount.providers.reddit',
+    'allauth.socialaccount.providers.shopify',
     'allauth.socialaccount.providers.soundcloud',
     'allauth.socialaccount.providers.stackexchange',
     'allauth.socialaccount.providers.twitch',

example/example/settings.py

@@ -101,6 +101,7 @@
     'allauth.socialaccount.providers.pinterest',
     'allauth.socialaccount.providers.reddit',
     'allauth.socialaccount.providers.robinhood',
+    'allauth.socialaccount.providers.shopify',
     'allauth.socialaccount.providers.soundcloud',
     'allauth.socialaccount.providers.spotify',
     'allauth.socialaccount.providers.stackexchange',