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:54:36 +04:00
parent 4b7753ba1c
commit 26ed666855
1 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
app/utils/auth.py
View file

@ -1,12 +1,13 @@
from datetime import datetime, timedelta, UTC from datetime import datetime, timedelta, UTC
from cryptography.fernet import Fernet from cryptography.fernet import Fernet, InvalidToken
from jose import jwt from jose import jwt
from passlib.context import CryptContext from passlib.context import CryptContext
from app.config import settings from app.config import settings
from app.users.exceptions import IncorrectAuthDataException, UserNotFoundException, UserMustConfirmEmailException from app.users.exceptions import IncorrectAuthDataException, UserNotFoundException, UserMustConfirmEmailException, \
from app.chat.exceptions import UserDontHavePermissionException, ChatNotFoundException, UserCanNotReadThisChatException WrongCodeException
from app.chat.exceptions import ChatNotFoundException, UserCanNotReadThisChatException
from app.utils.unit_of_work import UnitOfWork from app.utils.unit_of_work import UnitOfWork
from app.users.schemas import SUser, SInvitationData from app.users.schemas import SUser, SInvitationData
@ -37,9 +38,12 @@ def encode_invitation_token(user_data: SInvitationData) -> str:
def decode_invitation_token(invitation_token: str) -> SInvitationData: def decode_invitation_token(invitation_token: str) -> SInvitationData:
user_code = invitation_token.encode() try:
user_data = cipher_suite.decrypt(user_code) user_code = invitation_token.encode()
return SInvitationData.model_validate_json(user_data) user_data = cipher_suite.decrypt(user_code)
return SInvitationData.model_validate_json(user_data)
except InvalidToken:
raise WrongCodeException
def encode_confirmation_token(confirmation_code: str) -> str: def encode_confirmation_token(confirmation_code: str) -> str:
@ -48,17 +52,16 @@ def encode_confirmation_token(confirmation_code: str) -> str:
def decode_confirmation_token(invitation_token: str) -> str: def decode_confirmation_token(invitation_token: str) -> str:
user_code = invitation_token.encode() try:
confirmation_code = cipher_suite.decrypt(user_code).decode() user_code = invitation_token.encode()
return confirmation_code confirmation_code = cipher_suite.decrypt(user_code).decode()
return confirmation_code
except InvalidToken:
raise WrongCodeException
def get_confirmation_code(user_code: str) -> str: def get_confirmation_code(user_code: str) -> str:
if len(user_code) == 6: return user_code if len(user_code) == 6 else decode_confirmation_token(user_code)
confirmation_code = user_code
else:
confirmation_code = decode_confirmation_token(user_code)
return confirmation_code
class AuthService: class AuthService: