mirror of
https://github.com/simple-login/app.git
synced 2024-09-30 05:31:30 +02:00
Allow the same mailbox used by different user
This commit is contained in:
parent
f8e896541d
commit
c85ea1538e
@ -64,7 +64,7 @@ def custom_alias():
|
|||||||
|
|
||||||
# check if mailbox is not tempered with
|
# check if mailbox is not tempered with
|
||||||
if mailbox_email != current_user.email:
|
if mailbox_email != current_user.email:
|
||||||
mailbox = Mailbox.get_by(email=mailbox_email)
|
mailbox = Mailbox.get_by(email=mailbox_email, user_id=current_user.id)
|
||||||
if not mailbox or mailbox.user_id != current_user.id:
|
if not mailbox or mailbox.user_id != current_user.id:
|
||||||
flash("Something went wrong, please retry", "warning")
|
flash("Something went wrong, please retry", "warning")
|
||||||
return redirect(url_for("dashboard.custom_alias"))
|
return redirect(url_for("dashboard.custom_alias"))
|
||||||
@ -91,7 +91,7 @@ def custom_alias():
|
|||||||
"warning",
|
"warning",
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
mailbox = Mailbox.get_by(email=mailbox_email)
|
mailbox = Mailbox.get_by(email=mailbox_email, user_id=current_user.id)
|
||||||
|
|
||||||
alias = Alias.create(
|
alias = Alias.create(
|
||||||
user_id=current_user.id,
|
user_id=current_user.id,
|
||||||
|
@ -376,7 +376,7 @@ def email_already_used(email: str) -> bool:
|
|||||||
|
|
||||||
|
|
||||||
def mailbox_already_used(email: str, user) -> bool:
|
def mailbox_already_used(email: str, user) -> bool:
|
||||||
if Mailbox.get_by(email=email):
|
if Mailbox.get_by(email=email, user_id=user.id):
|
||||||
return True
|
return True
|
||||||
|
|
||||||
# support the case user wants to re-add their real email as mailbox
|
# support the case user wants to re-add their real email as mailbox
|
||||||
|
Loading…
Reference in New Issue
Block a user