Skip to content

Commit 74f2ffe

Browse files
now also accepting authorization codes from social login (e.g. facebook)
1 parent 8ea935e commit 74f2ffe

File tree

3 files changed

+75
-6
lines changed

3 files changed

+75
-6
lines changed

docs/api_endpoints.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,3 +73,4 @@ Basing on example from installation section :doc:`Installation </installation>`
7373
- /rest-auth/facebook/ (POST)
7474

7575
- access_token
76+
- code

rest_auth/registration/serializers.py

Lines changed: 40 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010

1111

1212
class SocialLoginSerializer(serializers.Serializer):
13-
access_token = serializers.CharField(required=True)
13+
access_token = serializers.CharField(required=False)
14+
code = serializers.CharField(required=False)
1415

1516
def _get_request(self):
1617
request = self.context.get('request')
@@ -33,7 +34,6 @@ def get_social_login(self, adapter, app, token, response):
3334
return social_login
3435

3536
def validate(self, attrs):
36-
access_token = attrs.get('access_token')
3737
view = self.context.get('view')
3838
request = self._get_request()
3939

@@ -48,6 +48,44 @@ def validate(self, attrs):
4848

4949
adapter = adapter_class()
5050
app = adapter.get_provider().get_app(request)
51+
52+
# More info on code vs access_token
53+
# http://stackoverflow.com/questions/8666316/facebook-oauth-2-0-code-and-token
54+
55+
# Case 1: We received the access_token
56+
if('access_token' in attrs):
57+
access_token = attrs.get('access_token')
58+
59+
# Case 2: We received the authorization code
60+
elif('code' in attrs):
61+
self.callback_url = getattr(view, 'callback_url', None)
62+
self.client_class = getattr(view, 'client_class', None)
63+
64+
if not self.callback_url:
65+
raise serializers.ValidationError(
66+
'Define callback_url in view'
67+
)
68+
if not self.client_class:
69+
raise serializers.ValidationError(
70+
'Define client_class in view'
71+
)
72+
73+
code = attrs.get('code')
74+
75+
provider = self.adapter.get_provider()
76+
scope = provider.get_scope(request)
77+
client = self.client_class(
78+
request,
79+
app.client_id,
80+
app.secret,
81+
self.adapter.access_token_method,
82+
self.adapter.access_token_url,
83+
self.callback_url,
84+
scope
85+
)
86+
token = client.get_access_token(code)
87+
access_token = token['access_token']
88+
5189
token = adapter.parse_token({'access_token': access_token})
5290
token.app = app
5391

rest_auth/registration/views.py

Lines changed: 34 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,33 @@
33
from rest_framework.response import Response
44
from rest_framework.permissions import AllowAny
55
from rest_framework import status
6+
from rest_framework.authtoken.models import Token
67

78
from allauth.account.views import SignupView, ConfirmEmailView
89
from allauth.account.utils import complete_signup
910
from allauth.account import app_settings
1011

11-
from rest_auth.app_settings import UserDetailsSerializer
12+
from rest_auth.app_settings import UserDetailsSerializer, TokenSerializer
1213
from rest_auth.registration.serializers import SocialLoginSerializer
1314
from rest_auth.views import Login
1415

1516

1617
class Register(APIView, SignupView):
18+
"""
19+
Accepts the credentials and creates a new user
20+
if user does not exist already
21+
Return the REST Token if the credentials are valid and authenticated.
22+
Calls allauth complete_signup method
23+
24+
Accept the following POST parameters: username, email, password
25+
Return the REST Framework Token Object's key.
26+
"""
1727

1828
permission_classes = (AllowAny,)
19-
user_serializer_class = UserDetailsSerializer
29+
# user_serializer_class = UserDetailsSerializer
2030
allowed_methods = ('POST', 'OPTIONS', 'HEAD')
31+
token_model = Token
32+
serializer_class = TokenSerializer
2133

2234
def get(self, *args, **kwargs):
2335
return Response({}, status=status.HTTP_405_METHOD_NOT_ALLOWED)
@@ -27,6 +39,9 @@ def put(self, *args, **kwargs):
2739

2840
def form_valid(self, form):
2941
self.user = form.save(self.request)
42+
self.token, created = self.token_model.objects.get_or_create(
43+
user=self.user
44+
)
3045
if isinstance(self.request, HttpRequest):
3146
request = self.request
3247
else:
@@ -47,7 +62,8 @@ def post(self, request, *args, **kwargs):
4762
return self.get_response_with_errors()
4863

4964
def get_response(self):
50-
serializer = self.user_serializer_class(instance=self.user)
65+
# serializer = self.user_serializer_class(instance=self.user)
66+
serializer = self.serializer_class(instance=self.token)
5167
return Response(serializer.data, status=status.HTTP_201_CREATED)
5268

5369
def get_response_with_errors(self):
@@ -72,11 +88,25 @@ def post(self, request, *args, **kwargs):
7288
class SocialLogin(Login):
7389
"""
7490
class used for social authentications
75-
example usage for facebook
91+
example usage for facebook with access_token
92+
-------------
93+
from allauth.socialaccount.providers.facebook.views import FacebookOAuth2Adapter
7694
95+
class FacebookLogin(SocialLogin):
96+
adapter_class = FacebookOAuth2Adapter
97+
-------------
98+
99+
example usage for facebook with code
100+
101+
-------------
77102
from allauth.socialaccount.providers.facebook.views import FacebookOAuth2Adapter
103+
from allauth.socialaccount.providers.oauth2.client import OAuth2Client
104+
78105
class FacebookLogin(SocialLogin):
79106
adapter_class = FacebookOAuth2Adapter
107+
client_class = OAuth2Client
108+
callback_url = 'localhost:8000'
109+
-------------
80110
"""
81111

82112
serializer_class = SocialLoginSerializer

0 commit comments

Comments
 (0)