simple-login/app
1
1
Fork 0
mirror of https://github.com/simple-login/app.git synced 2025-02-24 15:53:22 +08:00
Code Issues Projects Releases Packages Wiki Activity

fix Mailbox.delete: use alias_utils.delete_alias

Browse source
This commit is contained in:
Son NK 2020-08-14 12:03:41 +02:00
parent b4eb110971
commit 6bc0c5ada4
1 changed files with 15 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/models.py
View file

@ -1509,8 +1509,10 @@ class Mailbox(db.Model, ModelMixin):
@classmethod @classmethod
def delete(cls, obj_id): def delete(cls, obj_id):
# Put all aliases belonging to this mailbox to global trash mailbox: Mailbox = cls.get(obj_id)
try: user = mailbox.user
# Put all aliases belonging to this mailbox to global or domain trash
for alias in Alias.query.filter_by(mailbox_id=obj_id): for alias in Alias.query.filter_by(mailbox_id=obj_id):
# special handling for alias that has several mailboxes and has mailbox_id=obj_id # special handling for alias that has several mailboxes and has mailbox_id=obj_id
if len(alias.mailboxes) > 1: if len(alias.mailboxes) > 1:
@ -1520,12 +1522,8 @@ class Mailbox(db.Model, ModelMixin):
alias._mailboxes.remove(first_mb) alias._mailboxes.remove(first_mb)
else: else:
# only put aliases that have mailbox as a single mailbox into trash # only put aliases that have mailbox as a single mailbox into trash
DeletedAlias.create(email=alias.email) alias_utils.delete_alias(alias, user)
db.session.commit() db.session.commit()
# this can happen when a previously deleted alias is re-created via catch-all or directory feature
except IntegrityError:
LOG.exception("Some aliases have been added before to DeletedAlias")
db.session.rollback()
cls.query.filter(cls.id == obj_id).delete() cls.query.filter(cls.id == obj_id).delete()
db.session.commit() db.session.commit()