refactor: Introduce utility functions for exception handling and database operations; update auth and playlist services to use new exception methods
All checks were successful
Backend CI / test (push) Successful in 3m58s
All checks were successful
Backend CI / test (push) Successful in 3m58s
This commit is contained in:
@@ -18,6 +18,7 @@ from app.models.plan import Plan
|
||||
from app.models.user import User
|
||||
from app.models.user_oauth import UserOauth # Ensure model is imported for SQLAlchemy
|
||||
from app.utils.auth import JWTUtils, PasswordUtils
|
||||
from app.utils.test_helpers import create_access_token_for_user
|
||||
|
||||
|
||||
@pytest.fixture(scope="session")
|
||||
@@ -277,28 +278,14 @@ def test_login_data() -> dict[str, str]:
|
||||
@pytest_asyncio.fixture
|
||||
async def auth_headers(test_user: User) -> dict[str, str]:
|
||||
"""Create authentication headers with JWT token."""
|
||||
token_data = {
|
||||
"sub": str(test_user.id),
|
||||
"email": test_user.email,
|
||||
"role": test_user.role,
|
||||
}
|
||||
|
||||
access_token = JWTUtils.create_access_token(token_data)
|
||||
|
||||
access_token = create_access_token_for_user(test_user)
|
||||
return {"Authorization": f"Bearer {access_token}"}
|
||||
|
||||
|
||||
@pytest_asyncio.fixture
|
||||
async def admin_headers(admin_user: User) -> dict[str, str]:
|
||||
"""Create admin authentication headers with JWT token."""
|
||||
token_data = {
|
||||
"sub": str(admin_user.id),
|
||||
"email": admin_user.email,
|
||||
"role": admin_user.role,
|
||||
}
|
||||
|
||||
access_token = JWTUtils.create_access_token(token_data)
|
||||
|
||||
access_token = create_access_token_for_user(admin_user)
|
||||
return {"Authorization": f"Bearer {access_token}"}
|
||||
|
||||
|
||||
@@ -317,26 +304,12 @@ def authenticated_user(test_user: User) -> User:
|
||||
@pytest_asyncio.fixture
|
||||
async def auth_cookies(test_user: User) -> dict[str, str]:
|
||||
"""Create authentication cookies with JWT token."""
|
||||
token_data = {
|
||||
"sub": str(test_user.id),
|
||||
"email": test_user.email,
|
||||
"role": test_user.role,
|
||||
}
|
||||
|
||||
access_token = JWTUtils.create_access_token(token_data)
|
||||
|
||||
access_token = create_access_token_for_user(test_user)
|
||||
return {"access_token": access_token}
|
||||
|
||||
|
||||
@pytest_asyncio.fixture
|
||||
async def admin_cookies(admin_user: User) -> dict[str, str]:
|
||||
"""Create admin authentication cookies with JWT token."""
|
||||
token_data = {
|
||||
"sub": str(admin_user.id),
|
||||
"email": admin_user.email,
|
||||
"role": admin_user.role,
|
||||
}
|
||||
|
||||
access_token = JWTUtils.create_access_token(token_data)
|
||||
|
||||
access_token = create_access_token_for_user(admin_user)
|
||||
return {"access_token": access_token}
|
||||
|
||||
Reference in New Issue
Block a user