Mirror
/
app-MAIL-temp
mirror of https://github.com/simple-login/app.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

handle the case alias is in trash

This commit is contained in:
Son 2021-11-17 10:56:43 +01:00
parent 9c27f94e8e
commit 6eb702870c
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/api/views/new_random_alias.py
View File

@ -10,6 +10,7 @@ from app.api.serializer import (
from app.config import MAX_NB_EMAIL_FREE_PLAN, ALIAS_LIMIT from app.config import MAX_NB_EMAIL_FREE_PLAN, ALIAS_LIMIT
from app.dashboard.views.custom_alias import get_available_suffixes from app.dashboard.views.custom_alias import get_available_suffixes
from app.db import Session from app.db import Session
from app.errors import AliasInTrashError
from app.extensions import limiter from app.extensions import limiter
from app.log import LOG from app.log import LOG
from app.models import Alias, AliasUsedOn, AliasGeneratorEnum from app.models import Alias, AliasUsedOn, AliasGeneratorEnum
@ -77,13 +78,17 @@ def new_random_alias():
alias = None alias = None
elif not alias: elif not alias:
LOG.d("create new alias %s", suggested_alias) LOG.d("create new alias %s", suggested_alias)
alias = Alias.create( try:
user_id=user.id, alias = Alias.create(
email=suggested_alias, user_id=user.id,
note=note, email=suggested_alias,
mailbox_id=user.default_mailbox_id, note=note,
commit=True, mailbox_id=user.default_mailbox_id,
) commit=True,
)
except AliasInTrashError:
LOG.i("Alias %s is in trash", suggested_alias)
alias = None
if not alias: if not alias:
scheme = user.alias_generator scheme = user.alias_generator