Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

user_settings: Send event on commit in do_change_full_name. 

Earlier, we were using 'send_event' in 'do_change_full_name'
which can lead to a situation, if any db operation is added after
the 'send_event' in future, where we enqueue events but the action
function fails at a later stage.

Events should not be sent until we know we're not rolling back.

Fixes part of #30489.
This commit is contained in:
Prakhar Pratyush 2024-08-22 12:36:13 +05:30 committed by Tim Abbott
parent d2c7e7e94c
commit 7e03569495
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
zerver/actions/user_settings.py
View File

@ -213,6 +213,7 @@ def do_change_password(user_profile: UserProfile, password: str, commit: bool =
) )
@transaction.atomic(savepoint=False)
def do_change_full_name( def do_change_full_name(
user_profile: UserProfile, full_name: str, acting_user: UserProfile | None user_profile: UserProfile, full_name: str, acting_user: UserProfile | None
) -> None: ) -> None:
@ -232,13 +233,13 @@ def do_change_full_name(
extra_data={RealmAuditLog.OLD_VALUE: old_name, RealmAuditLog.NEW_VALUE: full_name}, extra_data={RealmAuditLog.OLD_VALUE: old_name, RealmAuditLog.NEW_VALUE: full_name},
) )
payload = dict(user_id=user_profile.id, full_name=user_profile.full_name) payload = dict(user_id=user_profile.id, full_name=user_profile.full_name)
send_event( send_event_on_commit(
user_profile.realm, user_profile.realm,
dict(type="realm_user", op="update", person=payload), dict(type="realm_user", op="update", person=payload),
get_user_ids_who_can_access_user(user_profile), get_user_ids_who_can_access_user(user_profile),
) )
if user_profile.is_bot: if user_profile.is_bot:
send_event( send_event_on_commit(
user_profile.realm, user_profile.realm,
dict(type="realm_bot", op="update", bot=payload), dict(type="realm_bot", op="update", bot=payload),
bot_owner_user_ids(user_profile), bot_owner_user_ids(user_profile),