fix: revert "fix: check-split-length-before-accessing-with-index" (#5943)

Author: matthewelwell

api/custom_auth/serializers.py

@@ -1,12 +1,8 @@
-import re
 from typing import Any
 
 from common.core.utils import is_saas
 from django.conf import settings
-from djoser.serializers import (  # type: ignore[import-untyped]
-    TokenCreateSerializer,
-    UserCreateSerializer,
-)
+from djoser.serializers import UserCreateSerializer  # type: ignore[import-untyped]
 from rest_framework import serializers
 from rest_framework.authtoken.models import Token
 from rest_framework.exceptions import PermissionDenied
@@ -23,15 +19,6 @@
     USER_REGISTRATION_WITHOUT_INVITE_ERROR_MESSAGE,
 )
 
-EMAIL_REGEX = re.compile(r"^[^@]+@(?:\w+\.)+\w{2,}$")
-
-
-class CustomTokenCreateSerializer(TokenCreateSerializer):  # type: ignore[misc]
-    def validate_email(self, value: str) -> str:
-        if not EMAIL_REGEX.match(value):
-            raise serializers.ValidationError("Invalid email format.")
-        return value
-
 
 class CustomTokenSerializer(serializers.ModelSerializer):  # type: ignore[type-arg]
     class Meta:

api/custom_auth/views.py

@@ -30,7 +30,7 @@
 from custom_auth.mfa.trench.responses import ErrorResponse
 from custom_auth.mfa.trench.serializers import CodeLoginSerializer
 from custom_auth.mfa.trench.utils import user_token_generator
-from custom_auth.serializers import CustomTokenCreateSerializer, CustomUserDelete
+from custom_auth.serializers import CustomUserDelete
 from integrations.lead_tracking.hubspot.services import (
     register_hubspot_tracker_and_track_user,
 )
@@ -46,7 +46,6 @@ class CustomAuthTokenLoginOrRequestMFACode(TokenCreateView):  # type: ignore[mis
     Class to handle throttling for login requests
     """
 
-    serializer_class = CustomTokenCreateSerializer
     authentication_classes = []  # type: ignore[var-annotated]
     throttle_classes = [ScopedRateThrottle]
     throttle_scope = "login"

api/integrations/lead_tracking/hubspot/services.py

@@ -69,8 +69,7 @@ def register_hubspot_tracker(
 def create_self_hosted_onboarding_lead(
     email: str, first_name: str, last_name: str, organisation_name: str
 ) -> None:
-    email_parts = email.split("@")
-    email_domain = email_parts[1] if len(email_parts) > 1 else organisation_name
+    email_domain = email.split("@")[1]
     hubspot_client = HubspotClient()
     company = hubspot_client.get_company_by_domain(email_domain)
     if not company:

api/tests/integration/custom_auth/end_to_end/test_custom_auth_integration.py

@@ -746,33 +746,3 @@ def test_marketing_consent_given_defaults_to_true(
     # Then
     assert response.status_code == status.HTTP_201_CREATED
     assert response.json()["marketing_consent_given"] is True
-
-
-@pytest.mark.parametrize(
-    "invalid_email",
-    [
-        "invalid_email",
-        "12345",
-        "invalid@email@com.com",
-        "invalid_email.com",
-        "invalid_email@com",
-        "foo@..!.bar.",
-    ],
-)
-def test_create_user_returns_error_if_email_is_invalid(
-    staff_client: APIClient,
-    invalid_email: str,
-) -> None:
-    # Given
-    url = reverse("api-v1:custom_auth:custom-mfa-authtoken-login")
-    register_data = {
-        "email": invalid_email,
-        "password": "password",
-    }
-
-    # When
-    response = staff_client.post(url, data=register_data)
-
-    # Then
-    assert response.status_code == status.HTTP_400_BAD_REQUEST
-    assert response.json()["email"][0] == "Invalid email format."

api/tests/unit/users/test_unit_users_models.py

@@ -241,5 +241,5 @@ def test_delete_user():  # type: ignore[no-untyped-def]
     assert Organisation.objects.filter(name="org1").count() == 1
 
 
-def test_user_email_domain_property() -> None:
+def test_user_email_domain_property():  # type: ignore[no-untyped-def]
     assert FFAdminUser(email="test@example.com").email_domain == "example.com"