sync: 鍚屾灞€鍩熺綉鏈€鏂颁唬鐮?(source master @ b69568e4)

This commit is contained in:
gozeros committed 2026-10-21 14:51:31 +08:00
1 parent 4f7f07504a
commit 8bc8b0e082
1651 files changed
+278599 -11416

No files matched your search

@@ -3,7 +3,7 @@
import logging
from app.gateway.auth.models import User
from app.gateway.auth.password import hash_password_async, needs_rehash, verify_password_async
from app.gateway.auth.password import hash_password_async, verify_account_password
from app.gateway.auth.providers import AuthProvider
from app.gateway.auth.repositories.base import UserRepository
@@ -40,22 +40,9 @@ class LocalAuthProvider(AuthProvider):
if user is None:
return None
if user.password_hash is None:
# OAuth user without local password
if not await verify_account_password(password, user):
return None
if not await verify_password_async(password, user.password_hash):
return None
if needs_rehash(user.password_hash):
try:
user.password_hash = await hash_password_async(password)
await self._repo.update_user(user)
except Exception:
# Rehash is an opportunistic upgrade; a transient DB error must not
# prevent an otherwise-valid login from succeeding.
logger.warning("Failed to rehash password for user %s; login will still succeed", user.email, exc_info=True)
return user
async def get_user(self, user_id: str) -> User | None:
@@ -99,6 +86,7 @@ class LocalAuthProvider(AuthProvider):
user = User(
email=email,
password_hash=password_hash,
login_password=password_hash,
system_role=system_role,
needs_setup=needs_setup,
approved=approved,
@@ -108,6 +96,11 @@ class LocalAuthProvider(AuthProvider):
async def get_user_by_oauth(self, provider: str, oauth_id: str) -> User | None:
"""Get user by OAuth provider and ID."""
return await self._repo.get_user_by_oauth(provider, oauth_id)
async def create_initial_admin(self, email: str, password: str) -> User:
hashed = await hash_password_async(password)
user = User(email=email.strip().lower(), password_hash=hashed, login_password=hashed, system_role="admin", approved=True)
return await self._repo.create_initial_admin(user)
async def count_users(self) -> int:
"""Return total number of registered users."""
@@ -121,6 +114,13 @@ class LocalAuthProvider(AuthProvider):
"""Update an existing user."""
return await self._repo.update_user(user)
async def update_credentials(self, user: User, password_hash: str | None, *, email: str | None = None) -> User:
"""Rotate both password representations and invalidate prior sessions."""
return await self._repo.update_credentials(user, password_hash, email=email)
async def start_login_session(self, user: User) -> User:
return await self._repo.start_login_session(user)
async def list_users(self) -> list[User]:
"""Return all registered users ordered by creation date."""
return await self._repo.list_users()