fakz9/Fulfillment-Backend
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: data loading after login fixed

Browse Source
This commit is contained in:
AlexSserb
2025-07-04 21:12:21 +04:00
parent 0caf1f3f42
commit d96a3b0512
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
backend/dependecies.py
View File

@@ -6,6 +6,7 @@ from sqlalchemy.ext.asyncio import AsyncSession
from backend.session import get_session from backend.session import get_session
from backend.wms_session import get_wms_session from backend.wms_session import get_wms_session
from models import User from models import User
from schemas.auth import UserUnion
from schemas.base import PaginationSchema from schemas.base import PaginationSchema
from services.auth import get_current_user, authorized_user, guest_user from services.auth import get_current_user, authorized_user, guest_user
from utils.dependecies import pagination_parameters from utils.dependecies import pagination_parameters
@@ -13,6 +14,6 @@ from utils.dependecies import pagination_parameters
SessionDependency = Annotated[AsyncSession, Depends(get_session)] SessionDependency = Annotated[AsyncSession, Depends(get_session)]
WmsSessionDependency = Annotated[AsyncSession, Depends(get_wms_session)] WmsSessionDependency = Annotated[AsyncSession, Depends(get_wms_session)]
PaginationDependency = Annotated[PaginationSchema, Depends(pagination_parameters)] PaginationDependency = Annotated[PaginationSchema, Depends(pagination_parameters)]
CurrentUserDependency = Annotated[User, Depends(get_current_user)] CurrentUserDependency = Annotated[UserUnion, Depends(get_current_user)]
AuthorizedUserDependency = Annotated[User, Depends(authorized_user)] AuthorizedUserDependency = Annotated[User, Depends(authorized_user)]
GuestUserDependency = Annotated[User, Depends(guest_user)] GuestUserDependency = Annotated[User, Depends(guest_user)]

1
routers/card.py
View File

@@ -123,7 +123,6 @@ async def get_all(
'/get/{card_id}', '/get/{card_id}',
response_model=CardSchema, response_model=CardSchema,
operation_id='getCardById', operation_id='getCardById',
dependencies=[Depends(guest_user)]
) )
async def get_card_by_id( async def get_card_by_id(
card_id: int, card_id: int,

7
services/auth.py
View File

@@ -1,5 +1,5 @@
from datetime import datetime from datetime import datetime
from typing import Union, Annotated from typing import Annotated
from fastapi import Depends, HTTPException from fastapi import Depends, HTTPException
from fastapi.security import HTTPBearer, HTTPAuthorizationCredentials from fastapi.security import HTTPBearer, HTTPAuthorizationCredentials
@@ -12,8 +12,7 @@ import backend.config
import constants import constants
from backend.session import get_session from backend.session import get_session
from constants import DEALS_VIEWER, DEAL_EDITOR from constants import DEALS_VIEWER, DEAL_EDITOR
from enums.user import UserRole from models import InviteCode
from models import User, InviteCode
from schemas.auth import * from schemas.auth import *
from services.base import BaseService from services.base import BaseService
@@ -24,7 +23,7 @@ algorithm = 'HS256'
async def get_current_user( async def get_current_user(
session: Annotated[AsyncSession, Depends(get_session)], session: Annotated[AsyncSession, Depends(get_session)],
token: Annotated[HTTPAuthorizationCredentials, Depends(oauth2_schema)] token: Annotated[HTTPAuthorizationCredentials, Depends(oauth2_schema)]
) -> Optional[UserUnion]: ) -> UserUnion:
if not token.credentials: if not token.credentials:
raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail='Invalid token') raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail='Invalid token')
try: try: