update main.py

api/auth.py

@@ -17,7 +17,7 @@ import os
 import logging
 import secrets
 
-from api.database import User, OAuthAccount, CustomSQLAlchemyUserDatabase, get_user_db
+from api.database import User, OAuthAccount, CustomSQLAlchemyUserDatabase, get_user_db  # استيراد من database.py
 from api.models import UserRead, UserCreate, UserUpdate
 
 # إعداد اللوقينج
@@ -110,10 +110,6 @@ class UserManager(IntegerIDMixin, BaseUserManager[User, int]):
             if user:
                 logger.info(f"User found: {user.email}, proceeding with on_after_login")
                 await self.on_after_login(user, request)
-                if request:
-                    request.session["user_id"] = str(user.id)
-                    response = RedirectResponse(url="/chat", status_code=302)
-                    return response
                 return user
             else:
                 logger.error(f"No user found for OAuth account with user_id: {existing_oauth_account.user_id}")
@@ -127,10 +123,6 @@ class UserManager(IntegerIDMixin, BaseUserManager[User, int]):
                 await self.add_oauth_account(oauth_account)
                 logger.info(f"User associated: {user.email}, proceeding with on_after_login")
                 await self.on_after_login(user, request)
-                if request:
-                    request.session["user_id"] = str(user.id)
-                    response = RedirectResponse(url="/chat", status_code=302)
-                    return response
                 return user
 
         logger.info(f"Creating new user for email: {account_email}")
@@ -146,15 +138,13 @@ class UserManager(IntegerIDMixin, BaseUserManager[User, int]):
         await self.add_oauth_account(oauth_account)
         logger.info(f"New user created: {user.email}, proceeding with on_after_login")
         await self.on_after_login(user, request)
-        if request:
-            request.session["user_id"] = str(user.id)
-            response = RedirectResponse(url="/chat", status_code=302)
-            return response
         return user
 
+# استدعاء user manager من get_user_db
 async def get_user_manager(user_db: CustomSQLAlchemyUserDatabase = Depends(get_user_db)):
     yield UserManager(user_db)
 
+# OAuth Routers مع معالجة مخصصة لـ GitHub
 google_oauth_router = get_oauth_router(
     google_oauth_client,
     auth_backend,
@@ -182,6 +172,7 @@ fastapi_users = FastAPIUsers[User, int](
 
 current_active_user = fastapi_users.current_user(active=True, optional=True)
 
+# تضمين الراوترات داخل التطبيق
 def get_auth_router(app: FastAPI):
     app.include_router(google_oauth_router, prefix="/auth/google", tags=["auth"])
     app.include_router(github_oauth_router, prefix="/auth/github", tags=["auth"])
@@ -189,4 +180,4 @@ def get_auth_router(app: FastAPI):
     app.include_router(fastapi_users.get_register_router(UserRead, UserCreate), prefix="/auth", tags=["auth"])
     app.include_router(fastapi_users.get_reset_password_router(), prefix="/auth", tags=["auth"])
     app.include_router(fastapi_users.get_verify_router(UserRead), prefix="/auth", tags=["auth"])
-    app.include_router(fastapi_users.get_users_router(UserRead, UserUpdate), prefix="/users", tags=["users"])
+    app.include_router(fastapi_users.get_users_router(UserRead, UserUpdate), prefix="/users", tags=["users"])

main.py

@@ -133,12 +133,6 @@ app.include_router(api_router)
 get_auth_router(app)
 logger.debug("API and auth routers included")
 
-# Add check-auth endpoint
-@app.get("/api/check-auth")
-async def check_auth(user: User = Depends(current_active_user)):
-    logger.debug(f"Checking auth for user: {user.email if user else 'Anonymous'}")
-    return {"is_authenticated": user is not None, "email": user.email if user else None}
-
 # Add logout endpoint
 @app.get("/logout")
 async def logout(request: Request):
@@ -409,4 +403,4 @@ async def health_check():
 
 if __name__ == "__main__":
     logger.info(f"Starting uvicorn server on port {os.getenv('PORT', 7860)}")
-    uvicorn.run(app, host="0.0.0.0", port=int(os.getenv("PORT", 7860)))
+    uvicorn.run(app, host="0.0.0.0", port=int(os.getenv("PORT", 7860)))