Merge branch 'feature/passkey-login' into feature/ui-redesign

# Conflicts:
#	webui/src/components/ab-bangumi-card.vue
#	webui/src/components/ab-container.vue
#	webui/src/components/ab-fold-panel.vue
#	webui/src/components/ab-search-bar.vue
#	webui/src/components/basic/ab-search.vue
#	webui/src/components/basic/ab-tag.vue
#	webui/src/components/layout/ab-topbar.vue
#	webui/src/pages/index.vue
#	webui/src/pages/index/bangumi.vue
#	webui/src/pages/index/config.vue
#	webui/src/pages/index/player.vue
#	webui/src/pages/login.vue
#	webui/types/dts/auto-imports.d.ts
#	webui/vite.config.ts

Author: EstrellaXD

backend/pyproject.toml

@@ -1,15 +1,64 @@
+[project]
+name = "auto-bangumi"
+version = "3.1.0"
+description = "AutoBangumi - Automated anime download manager"
+requires-python = ">=3.10"
+dependencies = [
+    "anyio>=4.0.0",
+    "beautifulsoup4>=4.12.0",
+    "certifi>=2023.5.7",
+    "charset-normalizer>=3.1.0",
+    "click>=8.1.3",
+    "fastapi>=0.109.0",
+    "h11>=0.14.0",
+    "idna>=3.4",
+    "pydantic>=2.0.0",
+    "sniffio>=1.3.0",
+    "soupsieve>=2.4.1",
+    "typing_extensions>=4.0.0",
+    "urllib3>=2.0.3",
+    "uvicorn>=0.27.0",
+    "Jinja2>=3.1.2",
+    "python-dotenv>=1.0.0",
+    "python-jose>=3.3.0",
+    "passlib>=1.7.4",
+    "bcrypt>=4.0.1,<4.1",
+    "python-multipart>=0.0.6",
+    "sqlmodel>=0.0.14",
+    "sse-starlette>=1.6.5",
+    "semver>=3.0.1",
+    "openai>=1.54.3",
+    "httpx>=0.25.0",
+    "httpx-socks>=0.9.0",
+    "aiosqlite>=0.19.0",
+    "sqlalchemy[asyncio]>=2.0.0",
+    "webauthn>=2.0.0",
+]
+
+[project.optional-dependencies]
+dev = [
+    "pytest>=8.0.0",
+    "pytest-asyncio>=0.23.0",
+    "ruff>=0.1.0",
+    "black>=24.0.0",
+]
+
+[tool.pytest.ini_options]
+testpaths = ["src/test"]
+asyncio_mode = "auto"
+
 [tool.ruff]
 select = [
     # pycodestyle(E): https://beta.ruff.rs/docs/rules/#pycodestyle-e-w
-    "E", 
+    "E",
     # Pyflakes(F): https://beta.ruff.rs/docs/rules/#pyflakes-f
-    "F", 
+    "F",
     # isort(I): https://beta.ruff.rs/docs/rules/#isort-i
     "I"
 ]
 ignore = [
     # E501: https://beta.ruff.rs/docs/rules/line-too-long/
-    'E501', 
+    'E501',
     # F401: https://beta.ruff.rs/docs/rules/unused-import/
     # avoid unused imports lint in `__init__.py`
     'F401',

backend/requirements.txt

@@ -1,29 +1,30 @@
-anyio==3.7.0
+anyio>=4.0.0
 bs4==0.0.1
-certifi==2023.5.7
-charset-normalizer==3.1.0
-click==8.1.3
-fastapi==0.97.0
-h11==0.14.0
-idna==3.4
-pydantic~=1.10
-PySocks==1.7.1
-qbittorrent-api==2023.9.53
-requests==2.31.0
-six==1.16.0
-sniffio==1.3.0
-soupsieve==2.4.1
-typing_extensions==4.6.3
-urllib3==2.0.3
-uvicorn==0.22.0
-attrdict==2.0.1
-Jinja2==3.1.2
-python-dotenv==1.0.0
-python-jose==3.3.0
-passlib==1.7.4
-bcrypt==4.0.1
-python-multipart==0.0.6
-sqlmodel==0.0.8
-sse-starlette==1.6.5
-semver==3.0.1
-openai==0.28.1
+certifi>=2023.5.7
+charset-normalizer>=3.1.0
+click>=8.1.3
+fastapi>=0.109.0
+h11>=0.14.0
+idna>=3.4
+pydantic>=2.0.0
+six>=1.16.0
+sniffio>=1.3.0
+soupsieve>=2.4.1
+typing_extensions>=4.0.0
+urllib3>=2.0.3
+uvicorn>=0.27.0
+Jinja2>=3.1.2
+python-dotenv>=1.0.0
+python-jose>=3.3.0
+passlib>=1.7.4
+bcrypt>=4.0.1
+python-multipart>=0.0.6
+sqlmodel>=0.0.14
+sse-starlette>=1.6.5
+semver>=3.0.1
+openai>=1.54.3
+httpx>=0.25.0
+httpx-socks>=0.9.0
+aiosqlite>=0.19.0
+sqlalchemy[asyncio]>=2.0.0
+webauthn>=2.0.0

backend/src/main.py

@@ -40,6 +40,9 @@ def create_app() -> FastAPI:
 
 @app.get("/posters/{path:path}", tags=["posters"])
 def posters(path: str):
+    # only allow access to files in the posters directory
+    if not path.startswith("posters/"):
+        return HTMLResponse(status_code=403)
     return FileResponse(f"data/posters/{path}")
 
 

backend/src/module/api/__init__.py

@@ -4,6 +4,7 @@
 from .bangumi import router as bangumi_router
 from .config import router as config_router
 from .log import router as log_router
+from .passkey import router as passkey_router
 from .program import router as program_router
 from .rss import router as rss_router
 from .search import router as search_router
@@ -13,6 +14,7 @@
 # API 1.0
 v1 = APIRouter(prefix="/v1")
 v1.include_router(auth_router)
+v1.include_router(passkey_router)
 v1.include_router(log_router)
 v1.include_router(program_router)
 v1.include_router(bangumi_router)

backend/src/module/api/auth.py

@@ -22,7 +22,7 @@
 @router.post("/login", response_model=dict)
 async def login(response: Response, form_data=Depends(OAuth2PasswordRequestForm)):
     user = User(username=form_data.username, password=form_data.password)
-    resp = auth_user(user)
+    resp = await auth_user(user)
     if resp.status:
         token = create_access_token(
             data={"sub": user.username}, expires_delta=timedelta(days=1)
@@ -58,7 +58,7 @@ async def logout(response: Response):
 @router.post("/update", response_model=dict, dependencies=[Depends(get_current_user)])
 async def update_user(user_data: UserUpdate, response: Response):
     old_user = active_user[0]
-    if update_user_info(user_data, old_user):
+    if await update_user_info(user_data, old_user):
         token = create_access_token(
             data={"sub": old_user}, expires_delta=timedelta(days=1)
         )