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

Handle the case where a previous deleted alias is re-created via catch-all or directory feature

Browse source
This commit is contained in:
Son NK 2020-01-22 22:48:30 +01:00
parent 30389509c7
commit b5357d0f4e
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/dashboard/views/index.py
View file

@ -1,5 +1,6 @@
from flask import render_template, request, redirect, url_for, flash, session from flask import render_template, request, redirect, url_for, flash, session
from flask_login import login_required, current_user from flask_login import login_required, current_user
from sqlalchemy.exc import IntegrityError
from sqlalchemy.orm import joinedload from sqlalchemy.orm import joinedload
from app import email_utils from app import email_utils
@ -103,13 +104,18 @@ def index():
LOG.d("delete gen email %s", gen_email) LOG.d("delete gen email %s", gen_email)
email = gen_email.email email = gen_email.email
GenEmail.delete(gen_email.id) GenEmail.delete(gen_email.id)
# save deleted alias
DeletedAlias.create(user_id=current_user.id, email=gen_email.email)
db.session.commit() db.session.commit()
flash(f"Alias {email} has been deleted", "success") flash(f"Alias {email} has been deleted", "success")
# try to save deleted alias
try:
DeletedAlias.create(user_id=current_user.id, email=email)
db.session.commit()
# this can happen when a previously deleted alias is re-created via catch-all or directory feature
except IntegrityError:
LOG.error("alias %s has been added before to DeletedAlias", email)
db.session.rollback()
return redirect(url_for("dashboard.index", query=query)) return redirect(url_for("dashboard.index", query=query))
client_users = ( client_users = (