feat(auth): 新增ws登录认证、区分http和ws认证
This commit is contained in:
@@ -19,7 +19,7 @@ from core.db.crud import CRUD
|
||||
from core.db.engine import get_async_session, get_cache
|
||||
from core.db.models import Card, SearchCardCache, UserCollection
|
||||
from core.routers.auth.schema import LoginUser
|
||||
from core.routers.auth.services import get_current_user
|
||||
from core.routers.auth.services import get_current_user_form_http
|
||||
from core.utils.helper import generate_keyname, check_picture_for_empty
|
||||
|
||||
from . import schema
|
||||
@@ -85,7 +85,7 @@ async def get_card_search(
|
||||
],
|
||||
)
|
||||
async def get_me_all_card(
|
||||
login_user: LoginUser = Depends(get_current_user),
|
||||
login_user: LoginUser = Depends(get_current_user_form_http),
|
||||
page: int = Query(default=1, gt=0),
|
||||
page_size: int = Query(default=15, gt=0, le=200),
|
||||
category: Literal['all', 'anime', 'sports', 'other', 'displayed'] = Query(default='all'),
|
||||
@@ -143,7 +143,7 @@ async def get_me_all_card(
|
||||
)
|
||||
async def get_visit_user_all_card(
|
||||
user_id: int,
|
||||
login_user: LoginUser = Depends(get_current_user),
|
||||
login_user: LoginUser = Depends(get_current_user_form_http),
|
||||
page: int = Query(default=1, gt=0),
|
||||
page_size: int = Query(default=15, gt=0, le=200),
|
||||
db_session: AsyncSession = Depends(get_async_session)
|
||||
@@ -186,7 +186,7 @@ async def get_visit_user_all_card(
|
||||
@card_router.post('/create', summary='新增卡片', response_model=base_schema.BaseResponse[schema.CardOut])
|
||||
async def created_card(
|
||||
payload: schema.CardIn,
|
||||
login_user: LoginUser = Depends(get_current_user),
|
||||
login_user: LoginUser = Depends(get_current_user_form_http),
|
||||
db_session: AsyncSession = Depends(get_async_session)
|
||||
):
|
||||
card_crud = CRUD(db_session, Card)
|
||||
@@ -264,7 +264,7 @@ async def created_card(
|
||||
async def update_card_price_info(
|
||||
card_id: int,
|
||||
payload: schema.UpdateCard,
|
||||
login_user: LoginUser = Depends(get_current_user),
|
||||
login_user: LoginUser = Depends(get_current_user_form_http),
|
||||
db_session: AsyncSession = Depends(get_async_session),
|
||||
):
|
||||
db_crud = CRUD(db_session, UserCollection)
|
||||
@@ -279,7 +279,7 @@ async def update_card_price_info(
|
||||
async def display_card_status(
|
||||
card_id: int,
|
||||
action: Literal['displayed', 'undisplayed'],
|
||||
login_user: LoginUser = Depends(get_current_user),
|
||||
login_user: LoginUser = Depends(get_current_user_form_http),
|
||||
db_session: AsyncSession = Depends(get_async_session)
|
||||
):
|
||||
db_crud = CRUD(db_session, UserCollection)
|
||||
@@ -295,7 +295,7 @@ async def display_card_status(
|
||||
@card_router.delete('/delete/', summary='卡片删除(批量)', response_model=base_schema.BaseResponse)
|
||||
async def delete_card(
|
||||
payload: schema.DeleteCardIn,
|
||||
login_user: LoginUser = Depends(get_current_user),
|
||||
login_user: LoginUser = Depends(get_current_user_form_http),
|
||||
db_session: AsyncSession = Depends(get_async_session)
|
||||
):
|
||||
# 删除关联关系
|
||||
|
||||
Reference in New Issue
Block a user