Check for user in associate_by_email pipeline method. Closes #392

omab · Jul 9, 2012 · d52c0fc · d52c0fc
1 parent 9ed16f2
commit d52c0fc
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/social_auth/backends/pipeline/associate.py b/social_auth/backends/pipeline/associate.py
@@ -6,8 +6,11 @@
 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')