Merge pull request #1698 from johngian/fix-multiple-emails

Fix mozillians.org logins from mozilla SSO.
mozilla · May 2, 2017 · 46899f2 · 46899f2
2 parents 00db09b + 2abfcf1
commit 46899f2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/mozillians/common/authbackend.py b/mozillians/common/authbackend.py
@@ -58,7 +58,8 @@ def filter_users_by_claims(self, claims):
                                                user=request_user.userprofile,
                                                identifier=email)
             else:
-                msg = u'Email {0} already exists in the database.'.format(email)
-                messages.error(self.request, msg)
+                if not user_q.filter(pk=request_user.id).exists():
+                    msg = u'Email {0} already exists in the database.'.format(email)
+                    messages.error(self.request, msg)
             return [request_user]
         return user_q
diff --git a/mozillians/common/tests/test_authbackend.py b/mozillians/common/tests/test_authbackend.py
@@ -70,8 +70,7 @@ def test_alternate_email_already_exists(self, mocked_message):
         ok_(email_q.exists())
         eq_(len(returned_user), 1)
         eq_(returned_user[0], user)
-        mocked_message.assert_called_once_with(request_mock, u'Email bar@example.com already '
-                                                             'exists in the database.')
+        ok_(not mocked_message.called)
 
     @patch('mozillians.common.authbackend.messages.error')
     def test_add_primary_email_as_alternate(self, mocked_message):
@@ -90,8 +89,7 @@ def test_add_primary_email_as_alternate(self, mocked_message):
         email_q = ExternalAccount.objects.filter(type=ExternalAccount.TYPE_EMAIL,
                                                  user=user.userprofile,
                                                  identifier='foo@example.com')
-        mocked_message.assert_called_once_with(request_mock, u'Email foo@example.com already '
-                                                             'exists in the database.')
+        ok_(not mocked_message.called)
         ok_(not email_q.exists())
 
     @patch('mozillians.common.authbackend.messages.error')