Clean up OAuth: simplify username detection to use session only

app.py

@@ -225,86 +225,34 @@ def check_user_access(request: gr.Request) -> Tuple[str, bool]:
         return "", False
     
     # 获取登录用户名
-    # 在 Hugging Face Space 中，OAuth 登录后用户名可能在多个地方
+    # 在 Hugging Face Space 中，OAuth 登录后用户信息存储在 Starlette Request 的 session 中
     username = None
     
-    # 方法1: 从 Starlette Request 的 session 中获取（OAuth 信息存在这里）
+    # 从 Starlette Request 的 session 中获取 OAuth 用户信息
     if hasattr(request, 'request') and hasattr(request.request, 'session'):
         session = request.request.session
-        # OAuth 用户信息可能在 session 的 'oauth_info' 或 'user' 中
+        
+        # OAuth 用户信息在 session['oauth_info'] 中
         if 'oauth_info' in session:
             oauth_info = session.get('oauth_info', {})
             username = oauth_info.get('preferred_username') or oauth_info.get('name') or oauth_info.get('sub')
             if username:
                 logger.info(f"从 session['oauth_info'] 获取用户名: {username}")
+        
+        # 或者在 session['user'] 中
         elif 'user' in session:
             user_info = session.get('user', {})
             username = user_info.get('preferred_username') or user_info.get('name') or user_info.get('username')
             if username:
                 logger.info(f"从 session['user'] 获取用户名: {username}")
-        elif session:
-            # 打印 session 内容用于调试
-            logger.info(f"Session keys: {list(session.keys())}")
-            logger.info(f"Session content: {session}")
-    
-    # 方法2: 直接从 request.username 获取（Gradio 可能已经解析）
-    if not username and hasattr(request, 'username') and request.username:
-        username = request.username
-        logger.info(f"从 request.username 获取用户名: {username}")
-    
-    # 方法3: 从 Starlette Request 的 state 中获取
-    if not username and hasattr(request, 'request') and hasattr(request.request, 'state'):
-        state = request.request.state
-        if hasattr(state, 'user'):
-            user_info = state.user
-            if isinstance(user_info, dict):
-                username = user_info.get('preferred_username') or user_info.get('name')
-            else:
-                username = str(user_info)
-            if username:
-                logger.info(f"从 request.request.state.user 获取用户名: {username}")
-    
-    # 方法4: 从 cookies 中获取
-    if not username and hasattr(request, 'request') and hasattr(request.request, 'cookies'):
-        cookies = request.request.cookies
-        for cookie_name in ['hf_user', 'username', 'user', 'hf_username', 'oauth_profile']:
-            if cookie_name in cookies:
-                username = cookies[cookie_name]
-                logger.info(f"从 cookie {cookie_name} 获取用户名: {username}")
-                break
-    
-    # 方法5: 从 headers 中获取
-    if not username and hasattr(request, 'request') and hasattr(request.request, 'headers'):
-        headers = request.request.headers
-        for header_name in ['x-user', 'x-hf-user', 'x-username']:
-            if header_name in headers:
-                username = headers[header_name]
-                logger.info(f"从 header {header_name} 获取用户名: {username}")
-                break
-    
-    # 调试：打印 request 对象的所有属性
+    
+    # 如果 session 中没有用户信息，打印调试信息
     if not username:
-        logger.warning("无法获取用户名，正在调试...")
-        if hasattr(request, 'request'):
-            starlette_request = request.request
-            logger.warning(f"Starlette Request type: {type(starlette_request)}")
-            
-            # 打印 session
-            if hasattr(starlette_request, 'session'):
-                logger.warning(f"Session keys: {list(starlette_request.session.keys())}")
-                logger.warning(f"Session: {dict(starlette_request.session)}")
-            
-            # 打印 state
-            if hasattr(starlette_request, 'state'):
-                logger.warning(f"State: {starlette_request.state.__dict__}")
-            
-            # 打印 cookies
-            if hasattr(starlette_request, 'cookies'):
-                logger.warning(f"Cookies: {dict(starlette_request.cookies)}")
-            
-            # 打印 headers
-            if hasattr(starlette_request, 'headers'):
-                logger.warning(f"Headers: {dict(starlette_request.headers)}")
+        logger.warning("无法获取用户名，请确保：")
+        logger.warning("1. 已在 Space Settings 中启用 OAuth (hf_oauth: true)")
+        logger.warning("2. 用户已通过 'Login with Hugging Face' 按钮登录")
+        if hasattr(request, 'request') and hasattr(request.request, 'session'):
+            logger.warning(f"Session keys: {list(request.request.session.keys())}")
     
     if not username:
         return "", False