mirror of
https://github.com/lorsanstand/Aether.git
synced 2026-06-19 12:05:16 +03:00
refractor structure project and add user endpoint
This commit is contained in:
@@ -1,110 +1,25 @@
|
||||
import logging
|
||||
import uuid
|
||||
from datetime import datetime, timedelta
|
||||
from typing import Optional
|
||||
from datetime import timedelta
|
||||
from typing import List
|
||||
|
||||
from fastapi import HTTPException, status
|
||||
from jose import jwt
|
||||
from sqlalchemy import or_
|
||||
|
||||
from app.utils.hash_password import hash_password, verify_password
|
||||
from app.services.redis_service import RefreshTokenStorage, EmailTokenStorage
|
||||
from app.utils.redis import get_redis
|
||||
from app.exceptions import InvalidTokenException, TokenExpiredException
|
||||
from app.utils.hash_password import hash_password
|
||||
from app.services.redis_service import EmailTokenStorage
|
||||
from app.core.redis import get_redis
|
||||
from app.core.exceptions import InvalidTokenException, TokenExpiredException
|
||||
from app.users.models import UserModel
|
||||
from app.users.dao import UserDAO
|
||||
from app.database import async_session_maker
|
||||
from app.users.schemas import Token, UserCreate, UserCreateDB, User
|
||||
from app.core.database import async_session_maker
|
||||
from app.users.schemas import UserCreate, UserCreateDB, User, UserUpdate, UserUpdateDB
|
||||
from app.tasks.email_tasks import EmailTasks
|
||||
from app.config import settings
|
||||
from app.core.config import settings
|
||||
|
||||
log = logging.getLogger(__name__)
|
||||
|
||||
|
||||
class AuthService:
|
||||
@classmethod
|
||||
async def create_token(cls, user_id: int) -> Token:
|
||||
|
||||
access_token = cls._create_access_token(user_id)
|
||||
refresh_token_expires = timedelta(
|
||||
days=settings.REFRESH_TOKEN_EXPIRE_DAYS)
|
||||
refresh_token = cls._create_refresh_token()
|
||||
|
||||
await RefreshTokenStorage.save_token(refresh_token, user_id, int(refresh_token_expires.total_seconds()))
|
||||
|
||||
log.info("Token created has user", extra={"user_id": user_id})
|
||||
return Token(access_token=access_token, refresh_token=refresh_token, token_type="bearer")
|
||||
|
||||
@classmethod
|
||||
async def logout(cls, token: uuid.UUID) -> None:
|
||||
user_id = await RefreshTokenStorage.getdel_token(token)
|
||||
log.info("User logged out", extra={"user_id": user_id})
|
||||
|
||||
@classmethod
|
||||
async def refresh_token(cls, token: uuid.UUID) -> Token:
|
||||
async with async_session_maker() as session:
|
||||
refresh_session = await RefreshTokenStorage.getdel_token(token)
|
||||
|
||||
if refresh_session is None:
|
||||
log.warning("Refresh token not found")
|
||||
raise InvalidTokenException
|
||||
|
||||
user = await UserDAO.find_one_or_none(session, id=int(refresh_session))
|
||||
if user is None:
|
||||
log.error("User not found during token refresh", extra={"user_id": str(refresh_session.user_id)})
|
||||
raise InvalidTokenException
|
||||
|
||||
access_token = cls._create_access_token(user.id)
|
||||
refresh_token_expires = timedelta(
|
||||
days=settings.REFRESH_TOKEN_EXPIRE_DAYS)
|
||||
refresh_token = cls._create_refresh_token()
|
||||
|
||||
await RefreshTokenStorage.save_token(
|
||||
refresh_token,
|
||||
user.id,
|
||||
int(refresh_token_expires.total_seconds())
|
||||
)
|
||||
|
||||
await session.commit()
|
||||
log.info("Token refreshed for user", extra={"user_id": str(user.id)})
|
||||
return Token(access_token=access_token, refresh_token=refresh_token, token_type="bearer")
|
||||
|
||||
@classmethod
|
||||
async def authenticate_user(cls, email_or_username: str, password: str) -> Optional[UserModel]:
|
||||
async with async_session_maker() as session:
|
||||
db_user = await UserDAO.find_one_or_none(
|
||||
session,
|
||||
or_(
|
||||
UserModel.email==email_or_username,
|
||||
UserModel.username==email_or_username
|
||||
)
|
||||
)
|
||||
if db_user and verify_password(password, db_user.hashed_password):
|
||||
log.info("User authenticated successfully", extra={"username": db_user.username})
|
||||
return db_user
|
||||
log.warning("Authentication failed", extra={"email": email_or_username})
|
||||
return None
|
||||
|
||||
@classmethod
|
||||
async def abort_all_sessions(cls, user_id: int):
|
||||
await RefreshTokenStorage.abort_all_tokens(user_id)
|
||||
|
||||
@classmethod
|
||||
def _create_access_token(cls, user_id: int) -> str:
|
||||
to_encode = {
|
||||
"sub": str(user_id),
|
||||
"exp": datetime.utcnow() + timedelta(
|
||||
minutes=settings.ACCESS_TOKEN_EXPIRE_MINUTES)
|
||||
}
|
||||
encoded_jwt = jwt.encode(
|
||||
to_encode, settings.SECRET_KEY, algorithm=settings.ALGORITHM)
|
||||
return f'Bearer {encoded_jwt}'
|
||||
|
||||
@classmethod
|
||||
def _create_refresh_token(cls) -> uuid.UUID:
|
||||
return uuid.uuid4()
|
||||
|
||||
|
||||
class UserService:
|
||||
@classmethod
|
||||
async def get_user(cls, user_id: int) -> User:
|
||||
@@ -120,8 +35,6 @@ class UserService:
|
||||
|
||||
@classmethod
|
||||
async def register_new_user(cls, user: UserCreate) -> User:
|
||||
redis_client = await get_redis()
|
||||
|
||||
async with async_session_maker() as session:
|
||||
user_exist = await UserDAO.find_one_or_none(session, or_(
|
||||
UserModel.email==user.email,
|
||||
@@ -172,7 +85,6 @@ class UserService:
|
||||
|
||||
@classmethod
|
||||
async def verify_email(cls, token: uuid.UUID):
|
||||
redis_client = await get_redis()
|
||||
async with async_session_maker() as session:
|
||||
user_id = await EmailTokenStorage.getdel_token(token)
|
||||
|
||||
@@ -192,3 +104,61 @@ class UserService:
|
||||
)
|
||||
|
||||
await session.commit()
|
||||
|
||||
|
||||
@classmethod
|
||||
async def get_users_list(cls, offset: int = 0, limit: int = 10) -> List[UserModel]:
|
||||
async with async_session_maker() as session:
|
||||
users = await UserDAO.find_all(session, offset, limit)
|
||||
|
||||
if users is None:
|
||||
log.warning("Users not found")
|
||||
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Users not found")
|
||||
log.debug("Users fetched", extra={"count": len(users), "offset": offset, "limit": limit})
|
||||
return users
|
||||
|
||||
|
||||
@classmethod
|
||||
async def update_user(cls, user_id: int, update_user: UserUpdate):
|
||||
async with async_session_maker() as session:
|
||||
|
||||
user_exist = await UserDAO.find_one_or_none(session, id=user_id)
|
||||
|
||||
if user_exist is None:
|
||||
log.warning("User not found", extra={"user_id": user_id})
|
||||
raise HTTPException(status.HTTP_404_NOT_FOUND, detail="User not found")
|
||||
|
||||
if user_exist.username != update_user.username:
|
||||
username_exist = await UserDAO.find_one_or_none(session, username=update_user.username)
|
||||
if username_exist:
|
||||
log.warning("Username is taken", extra={"user_id": user_id})
|
||||
raise HTTPException(status.HTTP_409_CONFLICT, detail="Username is taken")
|
||||
|
||||
update_user_db = await UserDAO.update(
|
||||
session,
|
||||
UserModel.id==user_id,
|
||||
obj_in=UserUpdateDB(
|
||||
**update_user.model_dump()
|
||||
)
|
||||
)
|
||||
await session.commit()
|
||||
log.info("User updated", extra={"user_id": user_id})
|
||||
return update_user_db
|
||||
|
||||
|
||||
@classmethod
|
||||
async def delete_user(cls, user_id):
|
||||
async with async_session_maker() as session:
|
||||
user_exist = await UserDAO.find_one_or_none(session, id=user_id)
|
||||
|
||||
if user_exist is None:
|
||||
log.warning("User not found", extra={"user_id": user_id})
|
||||
raise HTTPException(status.HTTP_404_NOT_FOUND, detail="User not found")
|
||||
|
||||
await UserDAO.update(
|
||||
session,
|
||||
UserModel.id==user_id,
|
||||
obj_in={"is_active": False}
|
||||
)
|
||||
await session.commit()
|
||||
log.info("User is inactive", extra={"user_id": user_id})
|
||||
Reference in New Issue
Block a user