Merge pull request #93 from QActf/feature/BCK-41_cookie_auth

Добавлена авторизация по куки

.github/workflows/main.yml

@@ -77,7 +77,6 @@ jobs:
             cd backend/
             git pull
             cd backend/infra
-            rm .env
             touch .env
             echo DATABASE_URL=${{ secrets.DATABASE_URL }} >> .env
             echo EMAIL_FROM=${{ secrets.EMAIL_FROM }} >> .env

app/api/endpoints/user.py

@@ -10,19 +10,25 @@
 )
 from app.api_docs_responses.utils_docs import USER_VALUE
 from app.core.db import get_async_session
-from app.core.user import auth_backend, fastapi_users
+from app.core.user import auth_backend_cookie, auth_backend_jwt, fastapi_users
 from app.crud.user import user_crud
 from app.schemas.user import UserCreate, UserRead, UserReadRegister, UserUpdate
 from app.services.token_generator.tokens import token_generator
 
 router = APIRouter()
 
 router.include_router(
-    fastapi_users.get_auth_router(auth_backend),
+    fastapi_users.get_auth_router(auth_backend_jwt),
     prefix='/auth/jwt',
     tags=['auth'],
 )
 
+router.include_router(
+    fastapi_users.get_auth_router(auth_backend_cookie),
+    prefix='/auth/cookie',
+    tags=['auth'],
+)
+
 router.include_router(
     register.get_register_router(
         UserReadRegister,

app/core/user.py

@@ -6,7 +6,7 @@
     BaseUserManager, FastAPIUsers, IntegerIDMixin, InvalidPasswordException,
 )
 from fastapi_users.authentication import (
-    AuthenticationBackend, BearerTransport, JWTStrategy,
+    AuthenticationBackend, BearerTransport, CookieTransport, JWTStrategy,
 )
 from fastapi_users_db_sqlalchemy import SQLAlchemyUserDatabase
 from sqlalchemy.ext.asyncio import AsyncSession
@@ -27,19 +27,27 @@ async def get_user_db(session: AsyncSession = Depends(get_async_session)):
 
 bearer_transport = BearerTransport(tokenUrl='auth/jwt/login')
 
+cookie_transport = CookieTransport()
+
 
 def get_jwt_strategy() -> JWTStrategy:
     return JWTStrategy(
         secret=settings.secret, lifetime_seconds=settings.lifetime_seconds
     )
 
 
-auth_backend = AuthenticationBackend(
+auth_backend_jwt = AuthenticationBackend(
     name='jwt_auth',
     transport=bearer_transport,
     get_strategy=get_jwt_strategy,
 )
 
+auth_backend_cookie = AuthenticationBackend(
+    name='cookie_auth',
+    transport=cookie_transport,
+    get_strategy=get_jwt_strategy
+)
+
 
 class UserManager(IntegerIDMixin, BaseUserManager[User, int]):
     async def validate_password(
@@ -76,7 +84,7 @@ async def get_user_manager(user_db=Depends(get_user_db)):
 
 fastapi_users = FastAPIUsers[User, int](
     get_user_manager,
-    [auth_backend],
+    [auth_backend_jwt, auth_backend_cookie],
 )
 
 current_user = fastapi_users.current_user(active=True)

app/schemas/profile.py

@@ -1,11 +1,11 @@
 import datetime
 from typing import Optional
-from typing_extensions import Annotated
 
 from pydantic import (
-    BaseModel, Field, WithJsonSchema, field_serializer, field_validator
+    BaseModel, Field, WithJsonSchema, field_serializer, field_validator,
 )
 from sqlalchemy_utils import Choice
+from typing_extensions import Annotated
 
 from app.core.constants import Gender
 

infra/docker-compose.yml

@@ -41,4 +41,4 @@ services:
 
 volumes:
   db_volume_qactf:
-  backend_static:
+  backend_static: