update finish

Author: ProFastCode

app/api/__init__.py

@@ -4,9 +4,8 @@
 
 from fastapi import APIRouter
 
-from .endpoints import users, tokens, admins
+from .endpoints import users, tokens
 
 api_router = APIRouter()
 api_router.include_router(users.router)
 api_router.include_router(tokens.router)
-api_router.include_router(admins.router)

app/api/depends.py renamed to app/api/deps.py

@@ -1,40 +1,37 @@
-"""
-Dependency Module
-"""
-
-from fastapi import Depends, HTTPException, status, Header
-
-from app.core import security
-from app.core.structures import Role
-from app.database import Database, new_session, models
-
-
-async def get_db() -> Database:
-    session = await new_session()
-    try:
-        yield Database(session)
-    finally:
-        await session.close()
-
-
-async def get_current_user(
-    short_token: str = Header(),
-    db: Database = Depends(get_db),
-) -> models.User:
-    payload = security.tkn_manager.decode_short_token(short_token)
-    if not (user := await db.user.get(payload.get("id"))):
-        raise HTTPException(
-            status_code=status.HTTP_401_UNAUTHORIZED, detail="User not found"
-        )
-
-    return user
-
-
-async def admins_access(
-    user: models.User = Depends(get_current_user),
-) -> None:
-    if not user.role >= Role.ADMIN:
-        raise HTTPException(
-            status_code=status.HTTP_403_FORBIDDEN,
-            detail="You do not have access to this section",
-        )
+"""
+Dependencies
+"""
+
+from fastapi import Depends, HTTPException, status, Header
+
+from app import models
+from app.core import security
+from app.core.db import SessionLocal, Database
+
+
+async def get_db() -> Database:
+    async with SessionLocal() as session:
+        yield Database(session)
+
+
+async def get_current_user(
+    short_token: str = Header(),
+    db: Database = Depends(get_db),
+) -> models.User:
+    payload = security.tkn_manager.decode_short_token(short_token)
+    if not (user := await db.user.get(payload.get("id"))):
+        raise HTTPException(
+            status_code=status.HTTP_401_UNAUTHORIZED, detail="User not found"
+        )
+
+    return user
+
+
+async def staff_access(
+    user: models.User = Depends(get_current_user),
+) -> None:
+    if not user.staff:
+        raise HTTPException(
+            status_code=status.HTTP_403_FORBIDDEN,
+            detail="You do not have access to this section",
+        )

app/api/endpoints/admins/__init__.py

@@ -1,19 +1,16 @@
-from fastapi import APIRouter, Depends, Request
+from fastapi import APIRouter, Depends
 
-from app.api import depends
+from app import models
+from app.api import deps
 from app.core import exps
+from app.core.db import Database
 from app.core.security import tkn_manager, pwd_manager
-from app.database import Database
-from app.schemas.tokens import AuthToken
-from app.schemas.users import AuthUser
 
 router = APIRouter()
 
 
-@router.post("/auth/", response_model=AuthToken)
-async def new_auth_token(
-    data: AuthUser, request: Request, db: Database = Depends(depends.get_db)
-):
+@router.post("/auth/", response_model=models.AuthToken)
+async def new_auth_token(data: models.UserCreate, db: Database = Depends(deps.get_db)):
     """
     Получить токен аутентификации:
 
@@ -27,12 +24,4 @@ async def new_auth_token(
         raise exps.USER_INCORRECT_PASSWORD
 
     auth_token = tkn_manager.create_auth_token({"id": user.id})
-    await db.user_activity.new(
-        user_id=user.id,
-        action="new_auth_token",
-        comment="Новый токен аутентификации",
-        user_agent=request.headers.get("User-Agent"),
-        ip=request.client.host,
-    )
-    await db.session.commit()
-    return AuthToken(auth_token=auth_token)
+    return models.AuthToken(auth_token=auth_token)

app/api/endpoints/admins/stats/__init__.py

@@ -1,34 +1,19 @@
-from fastapi import APIRouter, Depends, Request
+from fastapi import APIRouter
 
-from app.api import depends
-from app.core import exps
+from app import models
 from app.core.security import tkn_manager
-from app.database import Database
-from app.schemas.tokens import PairTokens, AuthToken
 
 router = APIRouter()
 
 
-@router.post("/pair/", response_model=PairTokens)
-async def new_pair_tokens(
-    data: AuthToken, request: Request, db: Database = Depends(depends.get_db)
-):
+@router.post("/pair/", response_model=models.PairTokens)
+async def new_pair_tokens(data: models.AuthToken):
     """
     Получить парные токены:
 
     - **auth_token**: Токен аутентификации
     """
     payload = tkn_manager.decode_auth_token(data.auth_token)
-    if not (user := await db.user.get(payload.get("id"))):
-        raise exps.USER_NOT_FOUND
     long_token = tkn_manager.create_long_token(payload)
     short_token = tkn_manager.create_short_token(payload)
-    await db.user_activity.new(
-        user_id=user.id,
-        action="new_pair_tokens",
-        comment="Новая пара токенов",
-        user_agent=request.headers.get("User-Agent"),
-        ip=request.client.host,
-    )
-    await db.session.commit()
-    return PairTokens(long_token=long_token, short_token=short_token)
+    return models.PairTokens(long_token=long_token, short_token=short_token)

app/api/endpoints/admins/stats/users.py

@@ -1,33 +1,25 @@
-from fastapi import APIRouter, Depends, Request
+from fastapi import APIRouter, Depends
 
-from app.api import depends
+from app import models
+from app.api import deps
 from app.core import exps
+from app.core.db import Database
 from app.core.security import tkn_manager
-from app.database import Database
-from app.schemas.tokens import LongToken, ShortToken
 
 router = APIRouter()
 
 
-@router.post("/refresh/", response_model=ShortToken)
+@router.post("/refresh/", response_model=models.ShortToken)
 async def refresh_short_token(
-    data: LongToken, request: Request, db: Database = Depends(depends.get_db)
+    data: models.LongToken, db: Database = Depends(deps.get_db)
 ):
     """
     Обновить короткий токен:
 
     - **long_token**: Длинный токен
     """
     payload = tkn_manager.decode_long_token(data.long_token)
-    if not (user := await db.user.get(payload.get("id"))):
+    if not await db.user.get(payload.get("id")):
         raise exps.USER_NOT_FOUND
     short_token = tkn_manager.create_short_token(payload)
-    await db.user_activity.new(
-        user.id,
-        "refresh_short_token",
-        "Обновлён короткий токен",
-        user_agent=request.headers.get("User-Agent"),
-        ip=request.client.host,
-    )
-    await db.session.commit()
-    return ShortToken(short_token=short_token)
+    return models.ShortToken(short_token=short_token)

app/api/endpoints/tokens/auth.py

@@ -4,9 +4,9 @@
 
 from fastapi import APIRouter
 
-from . import get, new
 from app.core.structures import Tags
+from . import create, read
 
 router = APIRouter(prefix="/users", tags=[Tags.users])
-router.include_router(new.router)
-router.include_router(get.router)
+router.include_router(create.router)
+router.include_router(read.router)

app/api/endpoints/tokens/pair.py

@@ -4,17 +4,17 @@
 
 from fastapi import APIRouter, Depends
 
-from app.api import depends
+from app import models
+from app.api import deps
 from app.core import exps
+from app.core.db import Database
 from app.core.security import pwd_manager
-from app.database import Database
-from app.schemas.users import GetUser, NewUser
 
 router = APIRouter()
 
 
-@router.post("/", response_model=GetUser)
-async def new(data: NewUser, db: Database = Depends(depends.get_db)):
+@router.post("/", response_model=models.UserRead)
+async def create(data: models.UserCreate, db: Database = Depends(deps.get_db)):
     """
     Создать нового пользователя: