From 4b7753ba1c4a1e5c8fe651cdbdafcc57104be6a2 Mon Sep 17 00:00:00 2001 From: urec56 Date: Tue, 16 Jul 2024 18:34:19 +0400 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=B4=D0=B5=D0=BB?= =?UTF-8?q?=D0=B0=D0=BB=20=D0=BF=D0=BE=D0=B4=D1=82=D0=B2=D0=B5=D1=80=D0=B6?= =?UTF-8?q?=D0=B4=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=BE=D1=87=D1=82=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/services/chat_service.py | 4 +++- app/tasks/tasks.py | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/services/chat_service.py b/app/services/chat_service.py index d231b2a..ed16520 100644 --- a/app/services/chat_service.py +++ b/app/services/chat_service.py @@ -1,3 +1,5 @@ +from urllib.parse import urljoin + from app.chat.exceptions import UserDontHavePermissionException, UserCanNotReadThisChatException from app.chat.shemas import SAllowedChats, SChangeData, SPinnedChats, SChat from app.config import settings @@ -52,7 +54,7 @@ class ChatService: def create_invitation_link(chat_id: int) -> str: invitation_data = SInvitationData.model_validate({"chat_id": chat_id}) 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 @classmethod diff --git a/app/tasks/tasks.py b/app/tasks/tasks.py index b1ec5ec..14482af 100644 --- a/app/tasks/tasks.py +++ b/app/tasks/tasks.py @@ -34,7 +34,7 @@ def send_confirmation_email(user_data: dict) -> None: user_data = SConfirmationData.model_validate(user_data) 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]( user_data.username,