Tivix/django-rest-auth
1
1
Fork 0
mirror of https://github.com/Tivix/django-rest-auth.git synced 2025-02-06 13:10:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

pep8 cleanups

Browse Source
This commit is contained in:
mario 2017-11-12 10:32:27 +01:00
parent 945008d326
commit f89471f980
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
rest_auth/registration/serializers.py
View File

@ -116,18 +116,19 @@ class SocialLoginSerializer(serializers.Serializer):
# with the same email address: raise an exception. # with the same email address: raise an exception.
# This needs to be handled in the frontend. We can not just # This needs to be handled in the frontend. We can not just
# link up the accounts due to security constraints # link up the accounts due to security constraints
if(allauth_settings.UNIQUE_EMAIL): if allauth_settings.UNIQUE_EMAIL:
# Do we have an account already with this email address? # Do we have an account already with this email address?
existing_account = get_user_model().objects.filter( account_exists = get_user_model().objects.filter(
email=login.user.email, email=login.user.email,
).count() ).exists()
if(existing_account != 0): if account_exists:
# There is an account already
raise serializers.ValidationError( raise serializers.ValidationError(
_("A user is already registered with this e-mail address.")) _("User is already registered with this e-mail address.")
)
login.lookup() login.lookup()
login.save(request, connect=True) login.save(request, connect=True)
attrs['user'] = login.account.user attrs['user'] = login.account.user
return attrs return attrs

11
rest_auth/tests/test_social.py
View File

@ -225,7 +225,7 @@ class TestSocialAuth(TestsMixin, TestCase):
REST_SESSION_LOGIN=False, REST_SESSION_LOGIN=False,
ACCOUNT_EMAIL_CONFIRMATION_HMAC=False ACCOUNT_EMAIL_CONFIRMATION_HMAC=False
) )
def test_edge_case(self): def test_email_clash_with_existing_account(self):
resp_body = { resp_body = {
"id": "123123123123", "id": "123123123123",
"first_name": "John", "first_name": "John",
@ -251,6 +251,8 @@ class TestSocialAuth(TestsMixin, TestCase):
# test empty payload # test empty payload
self.post(self.register_url, data={}, status_code=400) self.post(self.register_url, data={}, status_code=400)
# register user and send email confirmation
self.post( self.post(
self.register_url, self.register_url,
data=self.REGISTRATION_DATA, data=self.REGISTRATION_DATA,
@ -271,16 +273,11 @@ class TestSocialAuth(TestsMixin, TestCase):
self._login() self._login()
self._logout() self._logout()
# fb log in with already existing email
payload = { payload = {
'access_token': 'abc123' 'access_token': 'abc123'
} }
# You should not have access to an account created through register
# by loging in through FB with an account that has the same
# email address.
self.post(self.fb_login_url, data=payload, status_code=400) self.post(self.fb_login_url, data=payload, status_code=400)
# self.post(self.fb_login_url, data=payload, status_code=200)
# self.assertIn('key', self.response.json.keys())
@responses.activate @responses.activate
@override_settings( @override_settings(