Added twitter login test

rest_auth/social_serializers.py

@@ -46,7 +46,7 @@ class TwitterLoginSerializer(serializers.Serializer):
         if not adapter_class:
             raise serializers.ValidationError('Define adapter_class in view')
 
-        adapter = adapter_class()
+        adapter = adapter_class(request)
         app = adapter.get_provider().get_app(request)
 
         if('access_token' in attrs) and ('token_secret' in attrs):

rest_auth/tests/settings.py

@@ -80,6 +80,7 @@ INSTALLED_APPS = [
     'allauth.account',
     'allauth.socialaccount',
     'allauth.socialaccount.providers.facebook',
+    'allauth.socialaccount.providers.twitter',
 
     'rest_framework',
     'rest_framework.authtoken',

rest_auth/tests/test_base.py

@@ -99,6 +99,7 @@ class BaseAPITestCase(object):
         self.user_url = reverse('rest_user_details')
         self.veirfy_email_url = reverse('rest_verify_email')
         self.fb_login_url = reverse('fb_login')
+        self.tw_login_url = reverse('tw_login')
 
     def _login(self):
         payload = {

rest_auth/tests/test_social.py

@@ -1,3 +1,5 @@
+import json
+
 from django.test import TestCase
 from django.contrib.auth import get_user_model
 from django.test.utils import override_settings
@@ -34,9 +36,19 @@ class TestSocialAuth(TestCase, BaseAPITestCase):
             client_id='123123123',
             secret='321321321',
         )
+
+        twitter_social_app = SocialApp.objects.create(
+            provider='twitter',
+            name='Twitter',
+            client_id='11223344',
+            secret='55667788',
+        )
+
         site = Site.objects.get_current()
         social_app.sites.add(site)
+        twitter_social_app.sites.add(site)
         self.graph_api_url = GRAPH_API_URL + '/me'
+        self.twitter_url = 'http://twitter.com/foobarme'
 
     @responses.activate
     def test_failed_social_auth(self):
@@ -57,11 +69,24 @@ class TestSocialAuth(TestCase, BaseAPITestCase):
     @responses.activate
     def test_social_auth(self):
         # fake response for facebook call
-        resp_body = '{"id":"123123123123","first_name":"John","gender":"male","last_name":"Smith","link":"https:\\/\\/www.facebook.com\\/john.smith","locale":"en_US","name":"John Smith","timezone":2,"updated_time":"2014-08-13T10:14:38+0000","username":"john.smith","verified":true}'  # noqa
+        resp_body = {
+            "id": "123123123123",
+            "first_name": "John",
+            "gender": "male",
+            "last_name": "Smith",
+            "link": "https://www.facebook.com/john.smith",
+            "locale": "en_US",
+            "name": "John Smith",
+            "timezone": 2,
+            "updated_time": "2014-08-13T10:14:38+0000",
+            "username": "john.smith",
+            "verified": True
+        }
+
         responses.add(
             responses.GET,
             self.graph_api_url,
-            body=resp_body,
+            body=json.dumps(resp_body),
             status=200,
             content_type='application/json'
         )
@@ -80,6 +105,37 @@ class TestSocialAuth(TestCase, BaseAPITestCase):
         self.assertIn('key', self.response.json.keys())
         self.assertEqual(get_user_model().objects.all().count(), users_count + 1)
 
+    @responses.activate
+    def test_twitter_social_auth(self):
+        # fake response for twitter call
+        resp_body = {
+            "id": "123123123123",
+        }
+
+        responses.add(
+            responses.GET,
+            'https://api.twitter.com/1.1/account/verify_credentials.json',
+            body=json.dumps(resp_body),
+            status=200,
+            content_type='application/json'
+        )
+
+        users_count = get_user_model().objects.all().count()
+        payload = {
+            'access_token': 'abc123',
+            'token_secret': '1111222233334444'
+        }
+
+        resp = self.post(self.tw_login_url, data=payload)
+
+        self.assertIn('key', self.response.json.keys())
+        self.assertEqual(get_user_model().objects.all().count(), users_count + 1)
+
+        # make sure that second request will not create a new user
+        self.post(self.tw_login_url, data=payload, status_code=200)
+        self.assertIn('key', self.response.json.keys())
+        self.assertEqual(get_user_model().objects.all().count(), users_count + 1)
+
     @responses.activate
     @override_settings(
         ACCOUNT_EMAIL_VERIFICATION='mandatory',
@@ -87,11 +143,25 @@ class TestSocialAuth(TestCase, BaseAPITestCase):
         REST_SESSION_LOGIN=False
     )
     def test_edge_case(self):
-        resp_body = '{"id":"123123123123","first_name":"John","gender":"male","last_name":"Smith","link":"https:\\/\\/www.facebook.com\\/john.smith","locale":"en_US","name":"John Smith","timezone":2,"updated_time":"2014-08-13T10:14:38+0000","username":"john.smith","verified":true,"email":"%s"}'  # noqa
+        resp_body = {
+            "id": "123123123123",
+            "first_name": "John",
+            "gender": "male",
+            "last_name": "Smith",
+            "link": "https://www.facebook.com/john.smith",
+            "locale": "en_US",
+            "name": "John Smith",
+            "timezone": 2,
+            "updated_time": "2014-08-13T10:14:38+0000",
+            "username": "john.smith",
+            "verified": True,
+            "email": self.EMAIL
+        }
+
         responses.add(
             responses.GET,
             self.graph_api_url,
-            body=resp_body % self.EMAIL,
+            body=json.dumps(resp_body),
             status=200,
             content_type='application/json'
         )

rest_auth/tests/urls.py

@@ -3,14 +3,23 @@ from django.views.generic import TemplateView
 from . import django_urls
 
 from allauth.socialaccount.providers.facebook.views import FacebookOAuth2Adapter
+from allauth.socialaccount.providers.twitter.views import TwitterOAuthAdapter
 
 from rest_auth.urls import urlpatterns
 from rest_auth.registration.views import SocialLoginView
+from rest_auth.social_serializers import TwitterLoginSerializer
+from rest_auth.views import LoginView
 
 
 class FacebookLogin(SocialLoginView):
     adapter_class = FacebookOAuth2Adapter
 
+
+class TwitterLogin(LoginView):
+    adapter_class = TwitterOAuthAdapter
+    serializer_class = TwitterLoginSerializer
+
+
 urlpatterns += [
     url(r'^rest-registration/', include('rest_auth.registration.urls')),
     url(r'^test-admin/', include(django_urls)),
@@ -19,5 +28,6 @@ urlpatterns += [
     url(r'^account-confirm-email/(?P<key>\w+)/$', TemplateView.as_view(),
         name='account_confirm_email'),
     url(r'^social-login/facebook/$', FacebookLogin.as_view(), name='fb_login'),
+    url(r'^social-login/twitter/$', TwitterLogin.as_view(), name='tw_login'),
     url(r'^accounts/', include('allauth.socialaccount.urls'))
 ]