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

return the default sender format (AT) in case user uses a non-supported sender format

Browse source
This commit is contained in:
Son 2022-01-12 10:19:25 +01:00
parent db24ed8739
commit 6cd8e45d21
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/api/views/setting.py
View file

@ -21,7 +21,9 @@ def setting_to_dict(user: User):
if user.alias_generator == AliasGeneratorEnum.word.value if user.alias_generator == AliasGeneratorEnum.word.value
else "uuid", else "uuid",
"random_alias_default_domain": user.default_random_alias_domain(), "random_alias_default_domain": user.default_random_alias_domain(),
"sender_format": SenderFormatEnum.get_name(user.sender_format), # return the default sender format (AT) in case user uses a non-supported sender format
"sender_format": SenderFormatEnum.get_name(user.sender_format)
or SenderFormatEnum.AT.name,
"random_alias_suffix": AliasSuffixEnum.get_name(user.random_alias_suffix), "random_alias_suffix": AliasSuffixEnum.get_name(user.random_alias_suffix),
} }

5
app/models.py
View file

@ -329,10 +329,7 @@ class User(Base, ModelMixin, UserMixin, PasswordOracle):
profile_picture = orm.relationship(File, foreign_keys=[profile_picture_id]) profile_picture = orm.relationship(File, foreign_keys=[profile_picture_id])
# Specify the format for sender address # Specify the format for sender address
# John Wick - john at wick.com -> 0 # for the full list, see SenderFormatEnum
# john@wick.com via SimpleLogin -> 1
# John Wick - john(a)wick.com -> 2
# John Wick - john@wick.com -> 3
sender_format = sa.Column( sender_format = sa.Column(
sa.Integer, default="0", nullable=False, server_default="0" sa.Integer, default="0", nullable=False, server_default="0"
) )