karaoke-gen 0.101.0__py3-none-any.whl → 0.103.1__py3-none-any.whl

backend/tests/test_audio_search.py

@@ -845,7 +845,8 @@ class TestAudioSearchThemeSupport:
         This is the key behavior: selecting a theme should automatically
         enable CDG and TXT output formats.
         """
-        from backend.api.routes.audio_search import AudioSearchRequest, _resolve_cdg_txt_defaults
+        from backend.api.routes.audio_search import AudioSearchRequest
+        from backend.services.job_defaults_service import resolve_cdg_txt_defaults
 
         # When theme_id is set, enable_cdg/enable_txt should default to True
         request = AudioSearchRequest(
@@ -855,7 +856,7 @@ class TestAudioSearchThemeSupport:
             # enable_cdg and enable_txt are None (not specified)
         )
 
-        resolved_cdg, resolved_txt = _resolve_cdg_txt_defaults(
+        resolved_cdg, resolved_txt = resolve_cdg_txt_defaults(
             request.theme_id, request.enable_cdg, request.enable_txt
         )
 
@@ -864,7 +865,8 @@ class TestAudioSearchThemeSupport:
 
     def test_audio_search_request_no_theme_no_cdg_txt(self):
         """Test that without theme_id, CDG/TXT defaults to disabled."""
-        from backend.api.routes.audio_search import AudioSearchRequest, _resolve_cdg_txt_defaults
+        from backend.api.routes.audio_search import AudioSearchRequest
+        from backend.services.job_defaults_service import resolve_cdg_txt_defaults
 
         request = AudioSearchRequest(
             artist="Test Artist",
@@ -872,7 +874,7 @@ class TestAudioSearchThemeSupport:
             # No theme_id, no enable_cdg, no enable_txt
         )
 
-        resolved_cdg, resolved_txt = _resolve_cdg_txt_defaults(
+        resolved_cdg, resolved_txt = resolve_cdg_txt_defaults(
             request.theme_id, request.enable_cdg, request.enable_txt
         )
 
@@ -881,7 +883,8 @@ class TestAudioSearchThemeSupport:
 
     def test_explicit_cdg_txt_overrides_theme_default(self):
         """Test that explicit enable_cdg/enable_txt values override theme defaults."""
-        from backend.api.routes.audio_search import AudioSearchRequest, _resolve_cdg_txt_defaults
+        from backend.api.routes.audio_search import AudioSearchRequest
+        from backend.services.job_defaults_service import resolve_cdg_txt_defaults
 
         # Theme set (would default to True), but explicitly disabled
         request = AudioSearchRequest(
@@ -892,7 +895,7 @@ class TestAudioSearchThemeSupport:
             enable_txt=False,
         )
 
-        resolved_cdg, resolved_txt = _resolve_cdg_txt_defaults(
+        resolved_cdg, resolved_txt = resolve_cdg_txt_defaults(
             request.theme_id, request.enable_cdg, request.enable_txt
         )
 
@@ -901,7 +904,8 @@ class TestAudioSearchThemeSupport:
 
     def test_explicit_cdg_txt_enables_without_theme(self):
         """Test that explicit True enables CDG/TXT even without theme."""
-        from backend.api.routes.audio_search import AudioSearchRequest, _resolve_cdg_txt_defaults
+        from backend.api.routes.audio_search import AudioSearchRequest
+        from backend.services.job_defaults_service import resolve_cdg_txt_defaults
 
         # No theme (would default to False), but explicitly enabled
         request = AudioSearchRequest(
@@ -911,7 +915,7 @@ class TestAudioSearchThemeSupport:
             enable_txt=True,
         )
 
-        resolved_cdg, resolved_txt = _resolve_cdg_txt_defaults(
+        resolved_cdg, resolved_txt = resolve_cdg_txt_defaults(
             request.theme_id, request.enable_cdg, request.enable_txt
         )
 

backend/tests/test_email_validation_service.py

@@ -0,0 +1,298 @@
+"""
+Unit tests for EmailValidationService.
+
+Tests email normalization, disposable domain detection, and blocklist management.
+"""
+
+import pytest
+from unittest.mock import Mock, MagicMock, patch
+
+# Mock Google Cloud before imports
+import sys
+sys.modules['google.cloud.firestore'] = MagicMock()
+sys.modules['google.cloud.storage'] = MagicMock()
+
+
+class TestEmailNormalization:
+    """Test email normalization logic."""
+
+    @pytest.fixture
+    def mock_db(self):
+        """Create a mock Firestore client."""
+        mock = MagicMock()
+        # Default: empty blocklist config
+        mock_doc = Mock()
+        mock_doc.exists = False
+        mock.collection.return_value.document.return_value.get.return_value = mock_doc
+        return mock
+
+    @pytest.fixture
+    def email_service(self, mock_db):
+        """Create EmailValidationService instance with mocks."""
+        from backend.services.email_validation_service import EmailValidationService
+        service = EmailValidationService(db=mock_db)
+        return service
+
+    # =========================================================================
+    # Gmail Normalization Tests
+    # =========================================================================
+
+    def test_normalize_gmail_removes_dots(self, email_service):
+        """Test that dots are removed from Gmail local part."""
+        result = email_service.normalize_email("j.o.h.n@gmail.com")
+        assert result == "john@gmail.com"
+
+    def test_normalize_gmail_removes_plus_suffix(self, email_service):
+        """Test that +tag is removed from Gmail local part."""
+        result = email_service.normalize_email("john+spam@gmail.com")
+        assert result == "john@gmail.com"
+
+    def test_normalize_gmail_removes_dots_and_plus(self, email_service):
+        """Test both dots and +tag are removed from Gmail."""
+        result = email_service.normalize_email("j.o.h.n+newsletter@gmail.com")
+        assert result == "john@gmail.com"
+
+    def test_normalize_googlemail_treated_like_gmail(self, email_service):
+        """Test that googlemail.com is normalized like gmail.com."""
+        result = email_service.normalize_email("j.o.h.n+test@googlemail.com")
+        assert result == "john@googlemail.com"
+
+    def test_normalize_gmail_to_lowercase(self, email_service):
+        """Test Gmail addresses are lowercased."""
+        result = email_service.normalize_email("JOHN.DOE+Test@GMAIL.COM")
+        assert result == "johndoe@gmail.com"
+
+    # =========================================================================
+    # Non-Gmail Normalization Tests
+    # =========================================================================
+
+    def test_normalize_non_gmail_preserves_dots(self, email_service):
+        """Test dots are preserved for non-Gmail domains."""
+        result = email_service.normalize_email("j.o.h.n@example.com")
+        assert result == "j.o.h.n@example.com"
+
+    def test_normalize_non_gmail_preserves_plus(self, email_service):
+        """Test +tag is preserved for non-Gmail domains."""
+        result = email_service.normalize_email("john+tag@company.com")
+        assert result == "john+tag@company.com"
+
+    def test_normalize_non_gmail_to_lowercase(self, email_service):
+        """Test non-Gmail addresses are lowercased."""
+        result = email_service.normalize_email("John.Doe@Example.Com")
+        assert result == "john.doe@example.com"
+
+    def test_normalize_strips_whitespace(self, email_service):
+        """Test whitespace is stripped."""
+        result = email_service.normalize_email("  john@example.com  ")
+        assert result == "john@example.com"
+
+    # =========================================================================
+    # Edge Cases
+    # =========================================================================
+
+    def test_normalize_empty_string(self, email_service):
+        """Test empty string returns empty."""
+        result = email_service.normalize_email("")
+        assert result == ""
+
+    def test_normalize_none_returns_empty(self, email_service):
+        """Test None returns empty string."""
+        result = email_service.normalize_email(None)
+        assert result == ""
+
+    def test_normalize_invalid_no_at_sign(self, email_service):
+        """Test email without @ is returned as-is (lowercase)."""
+        result = email_service.normalize_email("notanemail")
+        assert result == "notanemail"
+
+
+class TestDisposableDomainDetection:
+    """Test disposable domain detection."""
+
+    @pytest.fixture
+    def mock_db(self):
+        """Create a mock Firestore client."""
+        mock = MagicMock()
+        mock_doc = Mock()
+        mock_doc.exists = False
+        mock.collection.return_value.document.return_value.get.return_value = mock_doc
+        return mock
+
+    @pytest.fixture
+    def email_service(self, mock_db):
+        """Create EmailValidationService instance with mocks."""
+        from backend.services.email_validation_service import EmailValidationService
+        # Clear any cached blocklist
+        EmailValidationService._blocklist_cache = None
+        EmailValidationService._blocklist_cache_time = None
+        service = EmailValidationService(db=mock_db)
+        return service
+
+    def test_detect_known_disposable_domain(self, email_service):
+        """Test known disposable domains are detected."""
+        # These are in DEFAULT_DISPOSABLE_DOMAINS
+        assert email_service.is_disposable_domain("user@tempmail.com") is True
+        assert email_service.is_disposable_domain("user@mailinator.com") is True
+        assert email_service.is_disposable_domain("user@guerrillamail.com") is True
+
+    def test_detect_legitimate_domain(self, email_service):
+        """Test legitimate domains are not flagged."""
+        assert email_service.is_disposable_domain("user@gmail.com") is False
+        assert email_service.is_disposable_domain("user@yahoo.com") is False
+        assert email_service.is_disposable_domain("user@company.com") is False
+
+    def test_detect_case_insensitive(self, email_service):
+        """Test domain detection is case-insensitive."""
+        assert email_service.is_disposable_domain("user@TEMPMAIL.COM") is True
+        assert email_service.is_disposable_domain("user@TempMail.Com") is True
+
+    def test_detect_invalid_email_returns_false(self, email_service):
+        """Test invalid email returns False."""
+        assert email_service.is_disposable_domain("notanemail") is False
+        assert email_service.is_disposable_domain("") is False
+
+
+class TestBlocklistManagement:
+    """Test blocklist management functionality."""
+
+    @pytest.fixture
+    def mock_db(self):
+        """Create a mock Firestore client with blocklist."""
+        mock = MagicMock()
+        mock_doc = Mock()
+        mock_doc.exists = True
+        mock_doc.to_dict.return_value = {
+            "disposable_domains": ["custom-temp.com"],
+            "blocked_emails": ["spammer@example.com"],
+            "blocked_ips": ["192.168.1.100"],
+        }
+        mock.collection.return_value.document.return_value.get.return_value = mock_doc
+        return mock
+
+    @pytest.fixture
+    def email_service(self, mock_db):
+        """Create EmailValidationService instance with mocks."""
+        from backend.services.email_validation_service import EmailValidationService
+        # Clear any cached blocklist
+        EmailValidationService._blocklist_cache = None
+        EmailValidationService._blocklist_cache_time = None
+        service = EmailValidationService(db=mock_db)
+        return service
+
+    def test_is_email_blocked(self, email_service):
+        """Test blocked email detection."""
+        assert email_service.is_email_blocked("spammer@example.com") is True
+        assert email_service.is_email_blocked("legitimate@example.com") is False
+
+    def test_is_email_blocked_case_insensitive(self, email_service):
+        """Test blocked email detection is case-insensitive."""
+        assert email_service.is_email_blocked("SPAMMER@example.com") is True
+        assert email_service.is_email_blocked("Spammer@Example.Com") is True
+
+    def test_is_ip_blocked(self, email_service):
+        """Test blocked IP detection."""
+        assert email_service.is_ip_blocked("192.168.1.100") is True
+        assert email_service.is_ip_blocked("10.0.0.1") is False
+
+    def test_custom_disposable_domain_added(self, email_service):
+        """Test custom disposable domains from Firestore are included."""
+        assert email_service.is_disposable_domain("user@custom-temp.com") is True
+
+    def test_blocklist_caching(self, email_service, mock_db):
+        """Test blocklist is cached."""
+        # First call
+        email_service.is_disposable_domain("user@test.com")
+        # Second call should use cache
+        email_service.is_disposable_domain("user@test2.com")
+
+        # Should only call Firestore once due to caching
+        assert mock_db.collection.return_value.document.return_value.get.call_count == 1
+
+
+class TestBetaEnrollmentValidation:
+    """Test beta enrollment validation."""
+
+    @pytest.fixture
+    def mock_db(self):
+        """Create a mock Firestore client."""
+        mock = MagicMock()
+        mock_doc = Mock()
+        mock_doc.exists = True
+        mock_doc.to_dict.return_value = {
+            "disposable_domains": [],
+            "blocked_emails": ["blocked@example.com"],
+            "blocked_ips": [],
+        }
+        mock.collection.return_value.document.return_value.get.return_value = mock_doc
+        return mock
+
+    @pytest.fixture
+    def email_service(self, mock_db):
+        """Create EmailValidationService instance with mocks."""
+        from backend.services.email_validation_service import EmailValidationService
+        EmailValidationService._blocklist_cache = None
+        EmailValidationService._blocklist_cache_time = None
+        service = EmailValidationService(db=mock_db)
+        return service
+
+    def test_validate_legitimate_email(self, email_service):
+        """Test legitimate email passes validation."""
+        is_valid, error = email_service.validate_email_for_beta("user@gmail.com")
+        assert is_valid is True
+        assert error == ""
+
+    def test_validate_disposable_email_rejected(self, email_service):
+        """Test disposable email is rejected."""
+        is_valid, error = email_service.validate_email_for_beta("user@tempmail.com")
+        assert is_valid is False
+        assert "Disposable email" in error
+
+    def test_validate_blocked_email_rejected(self, email_service):
+        """Test blocked email is rejected."""
+        is_valid, error = email_service.validate_email_for_beta("blocked@example.com")
+        assert is_valid is False
+        assert "not allowed" in error
+
+    def test_validate_invalid_format_rejected(self, email_service):
+        """Test invalid email format is rejected."""
+        is_valid, error = email_service.validate_email_for_beta("notanemail")
+        assert is_valid is False
+        assert "Invalid email format" in error
+
+    def test_validate_empty_email_rejected(self, email_service):
+        """Test empty email is rejected."""
+        is_valid, error = email_service.validate_email_for_beta("")
+        assert is_valid is False
+
+
+class TestIPHashing:
+    """Test IP address hashing."""
+
+    @pytest.fixture
+    def email_service(self):
+        """Create EmailValidationService instance with mocks."""
+        mock_db = MagicMock()
+        mock_doc = Mock()
+        mock_doc.exists = False
+        mock_db.collection.return_value.document.return_value.get.return_value = mock_doc
+
+        from backend.services.email_validation_service import EmailValidationService
+        return EmailValidationService(db=mock_db)
+
+    def test_hash_ip_consistent(self, email_service):
+        """Test IP hashing produces consistent results."""
+        hash1 = email_service.hash_ip("192.168.1.1")
+        hash2 = email_service.hash_ip("192.168.1.1")
+        assert hash1 == hash2
+
+    def test_hash_ip_different_for_different_ips(self, email_service):
+        """Test different IPs produce different hashes."""
+        hash1 = email_service.hash_ip("192.168.1.1")
+        hash2 = email_service.hash_ip("192.168.1.2")
+        assert hash1 != hash2
+
+    def test_hash_ip_is_sha256(self, email_service):
+        """Test IP hash is SHA-256 (64 hex chars)."""
+        hash_result = email_service.hash_ip("192.168.1.1")
+        assert len(hash_result) == 64
+        assert all(c in "0123456789abcdef" for c in hash_result)

backend/tests/test_file_upload.py

@@ -1681,17 +1681,19 @@ class TestUploadEndpointThemeSupport:
         )
 
     def test_upload_endpoint_uses_resolve_cdg_txt_defaults(self):
-        """Verify the upload endpoint uses _resolve_cdg_txt_defaults for theme-based defaults."""
+        """Verify the upload endpoint uses resolve_cdg_txt_defaults for theme-based defaults."""
+        import inspect
         from backend.api.routes import file_upload as file_upload_module
 
-        with open(file_upload_module.__file__, 'r') as f:
-            source_code = f.read()
+        source_code = inspect.getsource(file_upload_module)
 
-        has_resolve_call = '_resolve_cdg_txt_defaults(' in source_code
+        # Check for the centralized resolve_cdg_txt_defaults function (imported from job_defaults_service)
+        has_resolve_call = 'resolve_cdg_txt_defaults(' in source_code
 
         assert has_resolve_call, (
-            "file_upload.py does not call _resolve_cdg_txt_defaults(). "
-            "When theme_id is set, enable_cdg and enable_txt should default to True."
+            "file_upload.py does not call resolve_cdg_txt_defaults(). "
+            "Theme-driven CDG/TXT defaults (controlled by DEFAULT_ENABLE_CDG/DEFAULT_ENABLE_TXT "
+            "settings) must be applied via the centralized job_defaults_service."
         )
 
     def test_upload_endpoint_has_optional_cdg_txt_params(self):

backend/tests/test_made_for_you.py

@@ -1503,6 +1503,8 @@ class TestMadeForYouDistributionSettings:
         settings.default_brand_prefix = "NOMAD"
         settings.default_discord_webhook_url = None
         settings.default_youtube_description = None
+        settings.default_enable_cdg = True
+        settings.default_enable_txt = True
         return settings
 
     @pytest.mark.asyncio
@@ -1522,7 +1524,7 @@ class TestMadeForYouDistributionSettings:
              patch('backend.services.audio_search_service.get_audio_search_service') as mock_get_audio, \
              patch('backend.services.storage_service.StorageService'), \
              patch('backend.api.routes.users.get_theme_service', return_value=mock_theme_service), \
-             patch('backend.config.get_settings', return_value=mock_settings):
+             patch('backend.services.job_defaults_service.get_settings', return_value=mock_settings):
 
             from backend.services.audio_search_service import NoResultsError
             mock_audio_service = MagicMock()
@@ -1558,7 +1560,7 @@ class TestMadeForYouDistributionSettings:
              patch('backend.services.audio_search_service.get_audio_search_service') as mock_get_audio, \
              patch('backend.services.storage_service.StorageService'), \
              patch('backend.api.routes.users.get_theme_service', return_value=mock_theme_service), \
-             patch('backend.config.get_settings', return_value=mock_settings):
+             patch('backend.services.job_defaults_service.get_settings', return_value=mock_settings):
 
             from backend.services.audio_search_service import NoResultsError
             mock_audio_service = MagicMock()
@@ -1594,7 +1596,7 @@ class TestMadeForYouDistributionSettings:
              patch('backend.services.audio_search_service.get_audio_search_service') as mock_get_audio, \
              patch('backend.services.storage_service.StorageService'), \
              patch('backend.api.routes.users.get_theme_service', return_value=mock_theme_service), \
-             patch('backend.config.get_settings', return_value=mock_settings):
+             patch('backend.services.job_defaults_service.get_settings', return_value=mock_settings):
 
             from backend.services.audio_search_service import NoResultsError
             mock_audio_service = MagicMock()
@@ -1628,7 +1630,7 @@ class TestMadeForYouDistributionSettings:
              patch('backend.services.audio_search_service.get_audio_search_service') as mock_get_audio, \
              patch('backend.services.storage_service.StorageService'), \
              patch('backend.api.routes.users.get_theme_service', return_value=mock_theme_service), \
-             patch('backend.config.get_settings', return_value=mock_settings):
+             patch('backend.services.job_defaults_service.get_settings', return_value=mock_settings):
 
             from backend.services.audio_search_service import NoResultsError
             mock_audio_service = MagicMock()