Check for user in associate_by_email pipeline method. Closes #392

diff --git a/social_auth/backends/pipeline/associate.py b/social_auth/backends/pipeline/associate.py
index aafd2d3bd84b49f52b25a1886c6351a852e0b51b..c2d0b2357ed98620cf852dba32d22a2955fa1884 100644 (file)
--- a/social_auth/backends/pipeline/associate.py
+++ b/social_auth/backends/pipeline/associate.py
@@ -6,8 +6,11 @@ from social_auth.backends.pipeline import warn_setting
 from social_auth.backends.exceptions import AuthException
 
 
-def associate_by_email(details, *args, **kwargs):
+def associate_by_email(details, user=None, *args, **kwargs):
     """Return user entry with same email address as one returned on details."""
+    if user:
+        return None
+
     email = details.get('email')
 
     warn_setting('SOCIAL_AUTH_ASSOCIATE_BY_MAIL', 'associate_by_email')