Merge pull request #29 from Anexen/fix/empty-username

Fix an issue with empty username when user creation disrupted

django_google_sso/main.py

@@ -100,38 +100,51 @@ def email_is_valid(self) -> bool:
 
     def get_or_create_user(self):
         user_model = get_user_model()
-        user, created = user_model.objects.get_or_create(email=self.user_email)
-        self.check_first_super_user(user, user_model)
+        user, created = user_model.objects.get_or_create(
+            email=self.user_email, defaults={"username": self.user_email}
+        )
+        updated = self.check_first_super_user(user, user_model)
+
         if created or conf.GOOGLE_SSO_ALWAYS_UPDATE_USER_DATA:
             self.check_for_permissions(user)
             user.first_name = self.user_info["given_name"]
             user.last_name = self.user_info["family_name"]
-            user.username = self.user_email
             user.set_unusable_password()
-        user.save()
+            updated = True
+
+        if updated:
+            user.save()
 
-        google_user, created = GoogleSSOUser.objects.get_or_create(user=user)
-        google_user.google_id = self.user_info["id"]
-        google_user.picture_url = self.user_info["picture"]
-        google_user.locale = self.user_info["locale"]
-        google_user.save()
+        GoogleSSOUser.objects.update_or_create(
+            user=user,
+            defaults={
+                "google_id": self.user_info["id"],
+                "picture_url": self.user_info["picture"],
+                "locale": self.user_info["locale"],
+            },
+        )
 
         return user
 
     def check_first_super_user(self, user, user_model):
-        if conf.GOOGLE_SSO_AUTO_CREATE_FIRST_SUPERUSER:
-            superuser_exists = user_model.objects.filter(
-                is_superuser=True, email__contains=f"@{self.user_email.split('@')[-1]}"
-            ).exists()
-            if not superuser_exists:
-                message_text = _(
-                    f"GOOGLE_SSO_AUTO_CREATE_FIRST_SUPERUSER is True. "
-                    f"Adding SuperUser status to email: {self.user_email}"
-                )
-                messages.add_message(self.request, messages.INFO, message_text)
-                logger.warning(message_text)
-                user.is_superuser = True
-                user.is_staff = True
+        if not conf.GOOGLE_SSO_AUTO_CREATE_FIRST_SUPERUSER:
+            return False
+
+        superuser_exists = user_model.objects.filter(
+            is_superuser=True, email__contains=f"@{self.user_email.split('@')[-1]}"
+        ).exists()
+        if superuser_exists:
+            return False
+
+        message_text = _(
+            f"GOOGLE_SSO_AUTO_CREATE_FIRST_SUPERUSER is True. "
+            f"Adding SuperUser status to email: {self.user_email}"
+        )
+        messages.add_message(self.request, messages.INFO, message_text)
+        logger.warning(message_text)
+        user.is_superuser = True
+        user.is_staff = True
+        return True
 
     def check_for_permissions(self, user):
         if user.email in conf.GOOGLE_SSO_STAFF_LIST: