Fix IntegrityError when user has multiple email addresses

sentry_ldap_auth/backend.py

@@ -19,27 +19,23 @@ def get_or_create_user(self, username, ldap_user):
 
         user.is_managed = True
 
+        # Add the user email address
         try:
             from sentry.models import (UserEmail)
         except ImportError:
             pass
         else:
-            userEmail = UserEmail.objects.filter(user=user)
-            if not userEmail:
-                userEmail = UserEmail.objects.create(user=user)
-            else:
-                userEmail = userEmail[0]
-
-            if not hasattr(settings, 'AUTH_LDAP_DEFAULT_EMAIL_DOMAIN'):
-                email = ' '
-            else:
-                email = username + '@' + settings.AUTH_LDAP_DEFAULT_EMAIL_DOMAIN
-
             if 'mail' in ldap_user.attrs:
-                userEmail.email = ldap_user.attrs.get('mail')[0]
+                email = ldap_user.attrs.get('mail')[0]
+            elif not hasattr(settings, 'AUTH_LDAP_DEFAULT_EMAIL_DOMAIN'):
+                email = ''
             else:
-                userEmail.email = email
-            userEmail.save()
+                email = username + '@' + settings.AUTH_LDAP_DEFAULT_EMAIL_DOMAIN
+
+            # django-auth-ldap may have accidentally created an empty email address
+            UserEmail.objects.filter(user=user, email='').delete()
+            if email:
+                UserEmail.objects.get_or_create(user=user, email=email)
 
         # Check to see if we need to add the user to an organization
         if not settings.AUTH_LDAP_DEFAULT_SENTRY_ORGANIZATION: