(20250123) Listing permitted from disabled accounts, new activity not allowed.

This commit is contained in:
2025-01-23 12:54:52 +05:30
parent fe48b79c09
commit 44ff7719f3
14 changed files with 66 additions and 54 deletions
+5 -11
View File
@@ -222,11 +222,7 @@ async def send_one_mail(
if (
kwargs.get("session_info") is None and
inbound_headers["Remote-IP"] not in current_app.whitelisted_ips
):
return ResponseModel(
status_code = StatusCodes.FAILED,
http_code = HttpCodes.UNAUTHORIZED
)
): return constants.API_RESPONSE_UNAUTHORIZED
# ┏┓ ┓ • ┏┓┓ ┓
# ┃┃┓┏┏┏┓┏┓┏┓┏┣┓┓┏┓ ┃ ┣┓┏┓┏┃┏
@@ -236,8 +232,10 @@ async def send_one_mail(
# Get the token based on the key:
auth_token = await current_app.mail_controller.get_token_from_key(
mongo_data_conn = current_app.data_mongo,
token_key = inbound_data.tokenKey
token_key = inbound_data.tokenKey,
must_be_active = True
)
if not auth_token: return constants.API_RESPONSE_NO_AUTH_TOKEN
# Get the user's info:
if inbound_headers["Remote-IP"] not in current_app.whitelisted_ips:
@@ -249,11 +247,7 @@ async def send_one_mail(
mongo_data_conn = current_app.data_mongo,
user_info = user_info,
token_ids = [auth_token.authTokenId]
): return ResponseModel(
status_code = StatusCodes.FAILED,
http_code = HttpCodes.UNAUTHORIZED,
message = "The account does not belong to this user."
)
): return constants.API_RESPONSE_UNAUTHORIZED
# ┏┓ ┓ ┳┳┓ •┓
# ┗┓┏┓┏┓┏┫ ┃┃┃┏┓┓┃