diff --git a/backend/services/user_service.py b/backend/services/user_service.py index 8cdd05c3..6c41cfdf 100644 --- a/backend/services/user_service.py +++ b/backend/services/user_service.py @@ -900,12 +900,21 @@ class UserService: return False, None, "An error occurred during validation" def revoke_session(self, token: str) -> bool: - """Revoke a session (logout).""" + """Revoke a session (logout). + + Idempotent: a session document that no longer exists is already + revoked, so a missing document is treated as success rather than an + error. Firestore's ``update()`` raises NotFound when the document is + absent (e.g. already logged out, or expired/cleaned up). + """ try: doc_ref = self.db.collection(SESSIONS_COLLECTION).document(token) doc_ref.update({'is_active': False}) logger.info("Session revoked") return True + except google_exceptions.NotFound: + logger.info("Session already absent; treating revoke as success") + return True except Exception: logger.exception("Error revoking session") return False diff --git a/backend/tests/test_revoke_session.py b/backend/tests/test_revoke_session.py new file mode 100644 index 00000000..bf90dd6d --- /dev/null +++ b/backend/tests/test_revoke_session.py @@ -0,0 +1,65 @@ +""" +Tests for UserService.revoke_session idempotency. + +Revoking a session that no longer exists (already logged out, expired, or +cleaned up) should be treated as success rather than logged as an error. +Firestore's document.update() raises NotFound when the document is absent. +""" +from unittest.mock import MagicMock, patch + +# Mock Firestore before importing modules that use it +import sys + +sys.modules.setdefault('google.cloud.firestore', MagicMock()) +sys.modules.setdefault('google.cloud.firestore_v1', MagicMock()) + +from google.api_core import exceptions as google_exceptions + + +class TestRevokeSession: + @patch('backend.services.user_service.get_settings') + @patch('backend.services.user_service.firestore') + def test_revoke_existing_session_succeeds(self, mock_fs, mock_settings): + """A normal revoke updates is_active and returns True.""" + mock_settings.return_value = MagicMock(google_cloud_project='test') + mock_db = MagicMock() + mock_fs.Client.return_value = mock_db + doc_ref = mock_db.collection.return_value.document.return_value + + from backend.services.user_service import UserService + + service = UserService() + assert service.revoke_session("token-abc") is True + doc_ref.update.assert_called_once_with({'is_active': False}) + + @patch('backend.services.user_service.get_settings') + @patch('backend.services.user_service.firestore') + def test_revoke_missing_session_is_idempotent(self, mock_fs, mock_settings): + """A missing session document is already revoked → return True, no error.""" + mock_settings.return_value = MagicMock(google_cloud_project='test') + mock_db = MagicMock() + mock_fs.Client.return_value = mock_db + doc_ref = mock_db.collection.return_value.document.return_value + doc_ref.update.side_effect = google_exceptions.NotFound( + "No document to update: sessions/deadbeef" + ) + + from backend.services.user_service import UserService + + service = UserService() + assert service.revoke_session("missing-token") is True + + @patch('backend.services.user_service.get_settings') + @patch('backend.services.user_service.firestore') + def test_revoke_unexpected_error_returns_false(self, mock_fs, mock_settings): + """Genuine errors (not NotFound) are swallowed and return False.""" + mock_settings.return_value = MagicMock(google_cloud_project='test') + mock_db = MagicMock() + mock_fs.Client.return_value = mock_db + doc_ref = mock_db.collection.return_value.document.return_value + doc_ref.update.side_effect = google_exceptions.DeadlineExceeded("timeout") + + from backend.services.user_service import UserService + + service = UserService() + assert service.revoke_session("token-abc") is False diff --git a/frontend/app/[locale]/app/page.tsx b/frontend/app/[locale]/app/page.tsx index 3a86164d..3f0d4b81 100644 --- a/frontend/app/[locale]/app/page.tsx +++ b/frontend/app/[locale]/app/page.tsx @@ -256,7 +256,7 @@ function AppPageContent() { onClose={() => setShowFeedbackDialog(false)} /> -
+
{/* Push notification prompt - shows once when appropriate */} diff --git a/frontend/app/[locale]/app/referrals/page.tsx b/frontend/app/[locale]/app/referrals/page.tsx index aa9b26aa..857713b8 100644 --- a/frontend/app/[locale]/app/referrals/page.tsx +++ b/frontend/app/[locale]/app/referrals/page.tsx @@ -13,7 +13,7 @@ export default function ReferralsPage() { return (
-
+
{ setMounted(true) }, []) return ( -
+
{/* Desktop: single row (sm+) */}
diff --git a/pyproject.toml b/pyproject.toml index ac889272..ba24632b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "karaoke-gen" -version = "0.174.16" +version = "0.174.17" description = "Generate karaoke videos with synchronized lyrics. Handles the entire process from downloading audio and lyrics to creating the final video with title screens." authors = ["Andrew Beveridge "] license = "MIT" diff --git a/scripts/query-error-patterns.py b/scripts/query-error-patterns.py index 59eb56ce..90e4ac84 100755 --- a/scripts/query-error-patterns.py +++ b/scripts/query-error-patterns.py @@ -26,6 +26,32 @@ from google.cloud.firestore_v1 import FieldFilter ACTIVE_STATUSES = ["new", "acknowledged", "known"] +def _to_epoch(value: Any) -> Optional[float]: + """Convert a Firestore timestamp value to epoch seconds. + + Handles the three shapes ``last_seen``/``first_seen`` can take: + - Firestore/datetime objects (have ``.timestamp()``) + - ISO-8601 strings (the error-monitor writes these), e.g. + ``'2026-06-04T18:31:59.086317+00:00'`` + - numeric epoch seconds + + Returns None if the value is missing or unparseable. + """ + if value is None: + return None + if hasattr(value, "timestamp"): + return value.timestamp() + if isinstance(value, str): + try: + return datetime.fromisoformat(value).timestamp() + except ValueError: + return None + try: + return float(value) + except (TypeError, ValueError): + return None + + def query_error_patterns( status: Optional[str] = None, service: Optional[str] = None, @@ -71,22 +97,13 @@ def query_error_patterns( cutoff = datetime.now(timezone.utc) - timedelta(hours=hours) filtered = [] for p in patterns: - last_seen = p.get("last_seen") - if last_seen is not None: - # Firestore Timestamps have a .timestamp() method - ts = last_seen.timestamp() if hasattr(last_seen, "timestamp") else float(last_seen) - if ts >= cutoff.timestamp(): - filtered.append(p) + ts = _to_epoch(p.get("last_seen")) + if ts is not None and ts >= cutoff.timestamp(): + filtered.append(p) patterns = filtered # Sort by last_seen descending (most recent first) - def sort_key(p): - ls = p.get("last_seen") - if ls is None: - return 0.0 - return ls.timestamp() if hasattr(ls, "timestamp") else float(ls) - - patterns.sort(key=sort_key, reverse=True) + patterns.sort(key=lambda p: _to_epoch(p.get("last_seen")) or 0.0, reverse=True) if output_json: print(json.dumps(patterns, indent=2, default=str))