Audit log fixes

project delete, login failed target, invitation events, spurious project.updated

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: varmar05

server/mergin/auth/controller.py

@@ -173,10 +173,11 @@ def login_public():  # noqa: E501
             )
             return data
         else:
+            audit_user = user or User.get_by_login(form.login.data)
             emit(
                 AuthEventType.USER_LOGIN_FAILED,
                 **request_context(),
-                target_user_id=user.id if user else None,
+                target_user_id=audit_user.id if audit_user else None,
                 login=form.login.data,
                 reason="account_inactive" if user else "invalid_credentials",
                 login_method="password",
@@ -267,10 +268,11 @@ def login():  # pylint: disable=W0613,W0612
             )
             return "", 200
         else:
+            audit_user = user or User.get_by_login(form.login.data)
             emit(
                 AuthEventType.USER_LOGIN_FAILED,
                 **request_context(),
-                target_user_id=user.id if user else None,
+                target_user_id=audit_user.id if audit_user else None,
                 login=form.login.data,
                 reason="account_inactive" if user else "invalid_credentials",
                 login_method="password",
@@ -310,10 +312,11 @@ def admin_login():  # pylint: disable=W0613,W0612
             )
             abort(403, "You do not have permissions")
     else:
+        audit_user = User.get_by_login(form.login.data)
         emit(
             AuthEventType.USER_LOGIN_FAILED,
             **request_context(),
-            target_user_id=None,
+            target_user_id=audit_user.id if audit_user else None,
             login=form.login.data,
             reason="invalid_credentials",
             login_method="password",

server/mergin/sync/models.py

@@ -366,7 +366,6 @@ def delete(self, removed_by: int = None):
             target_workspace_id=self.workspace_id,
             workspace_name=self.workspace.name,
             project_name=project_name,
-            triggered_by=db.session.info.get("audit_project_deletion_source"),
         )
         project_deleted.send(self)
 

server/mergin/sync/private_api_controller.py

@@ -344,7 +344,9 @@ def unsubscribe_project(id):  # pylint: disable=W0612
 
     project.unset_role(current_user.id)
     db.session.add(project)
+    db.session.info["project_member_delete_reason"] = "left"
     db.session.commit()
+    db.session.info.pop("project_member_delete_reason", None)
     return NoContent, 200
 
 

server/mergin/sync/public_api_controller.py

@@ -36,7 +36,7 @@
 from .interfaces import WorkspaceRole
 from ..app import db
 from ..audit import emit
-from ..audit.listeners import actor_context
+from ..audit.listeners import actor_context, audit_session_flags
 from ..auth import auth_required
 from ..auth.models import User
 from .events import SyncEventType
@@ -309,7 +309,19 @@ def delete_project(namespace, project_name):  # noqa: E501
     :rtype: None
     """
     project = require_project(namespace, project_name, ProjectPermissions.Delete)
-    project.schedule_deletion(removed_by=current_user.id)
+    with audit_session_flags(db.session, audit_skip_project_update=True):
+        project.schedule_deletion(removed_by=current_user.id)
+    emit(
+        SyncEventType.PROJECT_MARKED_FOR_DELETION,
+        **actor_context(),
+        target_project_id=project.id,
+        target_workspace_id=project.workspace_id,
+        workspace_name=project.workspace.name,
+        project_name=f"{project.workspace.name}/{project.name}",
+        scheduled_for_deletion_at=(
+            project.removed_at.isoformat() if project.removed_at else None
+        ),
+    )
     return NoContent, 200
 
 

server/mergin/sync/tasks.py

@@ -70,7 +70,6 @@ def remove_projects_backups():
         with audit_session_flags(
             db.session,
             audit_skip_project_update=True,
-            audit_project_deletion_source="system",
         ):
             for p in projects:
                 p.delete()

server/mergin/tests/test_audit_events.py

@@ -293,6 +293,20 @@ def test_project_marked_for_deletion(client, audit_capture):
     assert e.target_workspace_id == project.workspace_id
 
 
+def test_project_marked_for_deletion_via_v1_api(client, audit_capture):
+    """Deleting a project via the legacy v1 API (used by QGIS plugin) emits PROJECT_MARKED_FOR_DELETION."""
+    project = Project.query.filter_by(
+        workspace_id=test_workspace_id, name=test_project
+    ).first()
+    workspace_name = project.workspace.name
+
+    client.delete(f"/v1/project/{workspace_name}/{project.name}")
+
+    e = audit_capture.one(SyncEventType.PROJECT_MARKED_FOR_DELETION)
+    assert e.target_project_id == project.id
+    assert e.target_workspace_id == project.workspace_id
+
+
 def test_project_restored(client, audit_capture):
     project = Project.query.filter_by(
         workspace_id=test_workspace_id, name=test_project
@@ -370,6 +384,22 @@ def test_project_member_deleted(client, audit_capture):
     assert e.metadata["reason"] == "removed"
 
 
+def test_project_member_left(client, audit_capture):
+    project = Project.query.filter_by(
+        workspace_id=test_workspace_id, name=test_project
+    ).first()
+    user = add_user("leavemember", "pass123")
+    project.set_role(user.id, ProjectRole.READER)
+    db.session.commit()
+    login(client, user.username, "pass123")
+
+    client.post(f"/app/project/unsubscribe/{project.id}")
+
+    e = audit_capture.one(SyncEventType.PROJECT_MEMBER_DELETED)
+    assert e.metadata["target_email"] == user.email
+    assert e.metadata["reason"] == "left"
+
+
 def test_project_access_request_created(client, audit_capture):
     project = Project.query.filter_by(
         workspace_id=test_workspace_id, name=test_project