火山引擎SMS API|celery容灾优化|生成模型引擎积分列表API

video-gen-api/app/services/auth.py

@@ -2,7 +2,7 @@ from datetime import datetime, timedelta, timezone
 
 import bcrypt
 import jwt
-from sqlalchemy import select
+from sqlalchemy import or_, select
 from sqlalchemy.ext.asyncio import AsyncSession
 
 from app.config import settings
@@ -13,8 +13,13 @@ def hash_password(plain: str) -> str:
     return bcrypt.hashpw(plain.encode(), bcrypt.gensalt()).decode()
 
 
-def verify_password(plain: str, hashed: str) -> bool:
-    return bcrypt.checkpw(plain.encode(), hashed.encode())
+def verify_password(plain: str, hashed: str | None) -> bool:
+    if not hashed:
+        return False
+    try:
+        return bcrypt.checkpw(plain.encode(), hashed.encode())
+    except Exception:
+        return False
 
 
 def create_access_token(user_id: str, remember_me: bool = False) -> str:
@@ -35,17 +40,36 @@ def decode_access_token(token: str) -> str | None:
         return None
 
 
+async def get_user_by_username_or_phone(
+    db: AsyncSession, username_or_phone: str
+) -> User | None:
+    value = (username_or_phone or "").strip()
+    if not value:
+        return None
+
+    result = await db.execute(
+        select(User)
+        .where(or_(User.username == value, User.phone == value))
+        .limit(1)
+    )
+    return result.scalar_one_or_none()
+
+
+async def get_user_by_phone(db: AsyncSession, phone: str) -> User | None:
+    result = await db.execute(select(User).where(User.phone == phone).limit(1))
+    return result.scalar_one_or_none()
+
+
 async def authenticate_user(
     db: AsyncSession, username: str, password: str
 ) -> User | None:
-    result = await db.execute(select(User).where(User.username == username).limit(1))
-    user = result.scalar_one_or_none()
-    if not user:
-        # Try phone number lookup for frontend users
-        result = await db.execute(select(User).where(User.phone == username).limit(1))
-        user = result.scalar_one_or_none()
+    user = await get_user_by_username_or_phone(db, username)
     if not user or not verify_password(password, user.hashed_password):
         return None
     if not user.is_active:
         return None
     return user
+
+
+def user_must_set_password(user: User | None) -> bool:
+    return bool(user and user.user_type == "frontend" and not user.hashed_password)