4.55.1

app/tests/test_account_linking.py

@@ -94,10 +94,12 @@ def test_login_case_from_partner():
     )
     assert res.user.activated is True
 
-    audit_logs: List[UserAuditLog] = UserAuditLog.filter_by(user_id=res.user.id).all()
+    audit_logs: List[UserAuditLog] = UserAuditLog.filter_by(
+        user_id=res.user.id,
+        action=UserAuditLogAction.LinkAccount.value,
+    ).all()
     assert len(audit_logs) == 1
     assert audit_logs[0].user_id == res.user.id
-    assert audit_logs[0].action == UserAuditLogAction.LinkAccount.value
 
 
 def test_login_case_from_partner_with_uppercase_email():
@@ -133,7 +135,10 @@ def test_login_case_from_web():
     assert 0 == (res.user.flags & User.FLAG_CREATED_FROM_PARTNER)
     assert res.user.activated is True
 
-    audit_logs: List[UserAuditLog] = UserAuditLog.filter_by(user_id=res.user.id).all()
+    audit_logs: List[UserAuditLog] = UserAuditLog.filter_by(
+        user_id=res.user.id,
+        action=UserAuditLogAction.LinkAccount.value,
+    ).all()
     assert len(audit_logs) == 1
     assert audit_logs[0].user_id == res.user.id
     assert audit_logs[0].action == UserAuditLogAction.LinkAccount.value
@@ -218,7 +223,10 @@ def test_link_account_with_proton_account_same_address(flask_client):
     )
     assert partner_user.partner_id == get_proton_partner().id
     assert partner_user.external_user_id == partner_user_id
-    audit_logs: List[UserAuditLog] = UserAuditLog.filter_by(user_id=res.user.id).all()
+    audit_logs: List[UserAuditLog] = UserAuditLog.filter_by(
+        user_id=res.user.id,
+        action=UserAuditLogAction.LinkAccount.value,
+    ).all()
     assert len(audit_logs) == 1
     assert audit_logs[0].user_id == res.user.id
     assert audit_logs[0].action == UserAuditLogAction.LinkAccount.value
@@ -246,7 +254,10 @@ def test_link_account_with_proton_account_different_address(flask_client):
     assert partner_user.partner_id == get_proton_partner().id
     assert partner_user.external_user_id == partner_user_id
 
-    audit_logs: List[UserAuditLog] = UserAuditLog.filter_by(user_id=res.user.id).all()
+    audit_logs: List[UserAuditLog] = UserAuditLog.filter_by(
+        user_id=res.user.id,
+        action=UserAuditLogAction.LinkAccount.value,
+    ).all()
     assert len(audit_logs) == 1
     assert audit_logs[0].user_id == res.user.id
     assert audit_logs[0].action == UserAuditLogAction.LinkAccount.value
@@ -304,19 +315,19 @@ def test_link_account_with_proton_account_same_address_but_linked_to_other_user(
 
     # Ensure audit logs for sl_user_1 show the link action
     sl_user_1_audit_logs: List[UserAuditLog] = UserAuditLog.filter_by(
-        user_id=sl_user_1.id
+        user_id=sl_user_1.id,
+        action=UserAuditLogAction.LinkAccount.value,
     ).all()
     assert len(sl_user_1_audit_logs) == 1
     assert sl_user_1_audit_logs[0].user_id == sl_user_1.id
-    assert sl_user_1_audit_logs[0].action == UserAuditLogAction.LinkAccount.value
 
     # Ensure audit logs for sl_user_2 show the unlink action
     sl_user_2_audit_logs: List[UserAuditLog] = UserAuditLog.filter_by(
-        user_id=sl_user_2.id
+        user_id=sl_user_2.id,
+        action=UserAuditLogAction.UnlinkAccount.value,
     ).all()
     assert len(sl_user_2_audit_logs) == 1
     assert sl_user_2_audit_logs[0].user_id == sl_user_2.id
-    assert sl_user_2_audit_logs[0].action == UserAuditLogAction.UnlinkAccount.value
 
 
 def test_link_account_with_proton_account_different_address_and_linked_to_other_user(
@@ -356,19 +367,19 @@ def test_link_account_with_proton_account_different_address_and_linked_to_other_
 
     # Ensure audit logs for sl_user_1 show the link action
     sl_user_1_audit_logs: List[UserAuditLog] = UserAuditLog.filter_by(
-        user_id=sl_user_1.id
+        user_id=sl_user_1.id,
+        action=UserAuditLogAction.LinkAccount.value,
     ).all()
     assert len(sl_user_1_audit_logs) == 1
     assert sl_user_1_audit_logs[0].user_id == sl_user_1.id
-    assert sl_user_1_audit_logs[0].action == UserAuditLogAction.LinkAccount.value
 
     # Ensure audit logs for sl_user_2 show the unlink action
     sl_user_2_audit_logs: List[UserAuditLog] = UserAuditLog.filter_by(
-        user_id=sl_user_2.id
+        user_id=sl_user_2.id,
+        action=UserAuditLogAction.UnlinkAccount.value,
     ).all()
     assert len(sl_user_2_audit_logs) == 1
     assert sl_user_2_audit_logs[0].user_id == sl_user_2.id
-    assert sl_user_2_audit_logs[0].action == UserAuditLogAction.UnlinkAccount.value
 
 
 def test_cannot_create_instance_of_base_strategy():

app/tests/test_mailbox_utils.py

@@ -351,7 +351,9 @@ def test_perform_mailbox_email_change_valid_id_not_new_email():
     res = mailbox_utils.perform_mailbox_email_change(mb.id)
     assert res.error == MailboxEmailChangeError.InvalidId
     assert res.message_category == "error"
-    audit_log_entries = UserAuditLog.filter_by(user_id=user.id).count()
+    audit_log_entries = UserAuditLog.filter_by(
+        user_id=user.id, action=UserAuditLogAction.UpdateMailbox.value
+    ).count()
     assert audit_log_entries == 0
 
 
@@ -374,7 +376,9 @@ def test_perform_mailbox_email_change_valid_id_email_already_used():
     res = mailbox_utils.perform_mailbox_email_change(mb_to_change.id)
     assert res.error == MailboxEmailChangeError.EmailAlreadyUsed
     assert res.message_category == "error"
-    audit_log_entries = UserAuditLog.filter_by(user_id=user.id).count()
+    audit_log_entries = UserAuditLog.filter_by(
+        user_id=user.id, action=UserAuditLogAction.UpdateMailbox.value
+    ).count()
     assert audit_log_entries == 0
 
 
@@ -398,6 +402,7 @@ def test_perform_mailbox_email_change_success():
     assert db_mailbox.email == new_email
     assert db_mailbox.new_email is None
 
-    audit_log_entries = UserAuditLog.filter_by(user_id=user.id).all()
-    assert len(audit_log_entries) == 1
-    assert audit_log_entries[0].action == UserAuditLogAction.UpdateMailbox.value
+    audit_log_entries = UserAuditLog.filter_by(
+        user_id=user.id, action=UserAuditLogAction.UpdateMailbox.value
+    ).count()
+    assert audit_log_entries == 1

app/tests/test_user_audit_log_utils.py

@@ -27,7 +27,9 @@ def test_emit_alias_audit_log_for_random_data():
         commit=True,
     )
 
-    logs_for_user: List[UserAuditLog] = UserAuditLog.filter_by(user_id=user.id).all()
+    logs_for_user: List[UserAuditLog] = UserAuditLog.filter_by(
+        user_id=user.id, action=action.value
+    ).all()
     assert len(logs_for_user) == 1
     assert logs_for_user[0].user_id == user.id
     assert logs_for_user[0].user_email == user.email
@@ -41,7 +43,10 @@ def test_emit_audit_log_on_mailbox_creation():
         user=user, email=random_email(), verified=True
     )
 
-    logs_for_user: List[UserAuditLog] = UserAuditLog.filter_by(user_id=user.id).all()
+    logs_for_user: List[UserAuditLog] = UserAuditLog.filter_by(
+        user_id=user.id,
+        action=UserAuditLogAction.CreateMailbox.value,
+    ).all()
     assert len(logs_for_user) == 1
     assert logs_for_user[0].user_id == user.id
     assert logs_for_user[0].user_email == user.email