urec/chat_back
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Переделал подтверждение почты

Browse source
This commit is contained in:
urec56 2024-07-16 18:34:19 +04:00
parent 5a149b9ca6
commit 4b7753ba1c
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/services/chat_service.py
View file

@ -1,3 +1,5 @@
from urllib.parse import urljoin
from app.chat.exceptions import UserDontHavePermissionException, UserCanNotReadThisChatException from app.chat.exceptions import UserDontHavePermissionException, UserCanNotReadThisChatException
from app.chat.shemas import SAllowedChats, SChangeData, SPinnedChats, SChat from app.chat.shemas import SAllowedChats, SChangeData, SPinnedChats, SChat
from app.config import settings from app.config import settings
@ -52,7 +54,7 @@ class ChatService:
def create_invitation_link(chat_id: int) -> str: def create_invitation_link(chat_id: int) -> str:
invitation_data = SInvitationData.model_validate({"chat_id": chat_id}) invitation_data = SInvitationData.model_validate({"chat_id": chat_id})
invitation_token = encode_invitation_token(invitation_data) invitation_token = encode_invitation_token(invitation_data)
invitation_link = settings.INVITATION_LINK_HOST + "/api/chat/invite_to_chat/" + invitation_token invitation_link = urljoin(settings.INVITATION_LINK_HOST, f"/submit#code={invitation_token}")
return invitation_link return invitation_link
@classmethod @classmethod

2
app/tasks/tasks.py
View file

@ -34,7 +34,7 @@ def send_confirmation_email(user_data: dict) -> None:
user_data = SConfirmationData.model_validate(user_data) user_data = SConfirmationData.model_validate(user_data)
invitation_token = encode_confirmation_token(user_data.confirmation_code) invitation_token = encode_confirmation_token(user_data.confirmation_code)
confirmation_link = urljoin(settings.INVITATION_LINK_HOST, "/api/users/email_verification/link/") + invitation_token confirmation_link = urljoin(settings.INVITATION_LINK_HOST, f"/submit#code={invitation_token}")
msg_content = confirmation_mail_templates[user_data.type]( msg_content = confirmation_mail_templates[user_data.type](
user_data.username, user_data.username,