Mirror/app-MAIL-temp
1
0
Fork 0
mirror of https://github.com/simple-login/app.git synced 2024-11-10 21:27:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: add missing commits on event sending (#2192)

Browse Source
This commit is contained in:
Carlos Quintana 2024-08-23 13:32:32 +02:00 committed by GitHub
parent 737c561227
commit 35a950da04
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/alias_utils.py
View File

@ -330,7 +330,10 @@ def try_auto_create_via_domain(address: str) -> Optional[Alias]:
def delete_alias( def delete_alias(
alias: Alias, user: User, reason: AliasDeleteReason = AliasDeleteReason.Unspecified alias: Alias,
user: User,
reason: AliasDeleteReason = AliasDeleteReason.Unspecified,
commit: bool = False,
): ):
""" """
Delete an alias and add it to either global or domain trash Delete an alias and add it to either global or domain trash
@ -366,6 +369,8 @@ def delete_alias(
EventDispatcher.send_event( EventDispatcher.send_event(
user, EventContent(alias_deleted=AliasDeleted(alias_id=alias.id)) user, EventContent(alias_deleted=AliasDeleted(alias_id=alias.id))
) )
if commit:
Session.commit()
def aliases_for_mailbox(mailbox: Mailbox) -> [Alias]: def aliases_for_mailbox(mailbox: Mailbox) -> [Alias]:

2
app/dashboard/views/index.py
View File

@ -145,7 +145,7 @@ def index():
LOG.i(f"User {current_user} requested deletion of alias {alias}") LOG.i(f"User {current_user} requested deletion of alias {alias}")
email = alias.email email = alias.email
alias_utils.delete_alias( alias_utils.delete_alias(
alias, current_user, AliasDeleteReason.ManualAction alias, current_user, AliasDeleteReason.ManualAction, commit=True
) )
flash(f"Alias {email} has been deleted", "success") flash(f"Alias {email} has been deleted", "success")
elif request.form.get("form-name") == "disable-alias": elif request.form.get("form-name") == "disable-alias":

4
app/subscription_webhook.py
View File

@ -2,6 +2,7 @@ import requests
from requests import RequestException from requests import RequestException
from app import config from app import config
from app.db import Session
from app.events.event_dispatcher import EventDispatcher from app.events.event_dispatcher import EventDispatcher
from app.events.generated.event_pb2 import EventContent, UserPlanChanged from app.events.generated.event_pb2 import EventContent, UserPlanChanged
from app.log import LOG from app.log import LOG
@ -29,10 +30,11 @@ def execute_subscription_webhook(user: User):
LOG.i("Sent request to subscription update webhook successfully") LOG.i("Sent request to subscription update webhook successfully")
else: else:
LOG.i( LOG.i(
f"Request to webhook failed with statue {response.status_code}: {response.text}" f"Request to webhook failed with status {response.status_code}: {response.text}"
) )
except RequestException as e: except RequestException as e:
LOG.error(f"Subscription request exception: {e}") LOG.error(f"Subscription request exception: {e}")
event = UserPlanChanged(plan_end_time=sl_subscription_end) event = UserPlanChanged(plan_end_time=sl_subscription_end)
EventDispatcher.send_event(user, EventContent(user_plan_change=event)) EventDispatcher.send_event(user, EventContent(user_plan_change=event))
Session.commit()