This commit is contained in:
William Zhou 2016-10-31 00:03:18 +00:00 committed by GitHub
commit 8a8479e53b

View File

@ -63,7 +63,8 @@ class SocialLoginSerializer(serializers.Serializer):
# http://stackoverflow.com/questions/8666316/facebook-oauth-2-0-code-and-token # http://stackoverflow.com/questions/8666316/facebook-oauth-2-0-code-and-token
# Case 1: We received the access_token # Case 1: We received the access_token
if('access_token' in attrs): access_token = attrs.get('access_token', None)
if(access_token is not None and len(access_token) > 0):
access_token = attrs.get('access_token') access_token = attrs.get('access_token')
# Case 2: We received the authorization code # Case 2: We received the authorization code
@ -93,13 +94,12 @@ class SocialLoginSerializer(serializers.Serializer):
self.callback_url, self.callback_url,
scope scope
) )
token = client.get_access_token(code) access_token = client.get_access_token(code)
access_token = token['access_token']
else: else:
raise serializers.ValidationError(_('Incorrect input. access_token or code is required.')) raise serializers.ValidationError(_('Incorrect input. access_token or code is required.'))
token = adapter.parse_token({'access_token': access_token}) token = adapter.parse_token(access_token)
token.app = app token.app = app
try: try: