update auth.py

api/auth.py

@@ -19,7 +19,7 @@ import secrets
 
 from api.database import User, OAuthAccount, CustomSQLAlchemyUserDatabase, get_user_db  # استيراد من database.py
 from api.models import UserRead, UserCreate, UserUpdate
-from fastapi.responses import RedirectResponse
+
 # إعداد اللوقينج
 logger = logging.getLogger(__name__)
 
@@ -76,69 +76,69 @@ class UserManager(IntegerIDMixin, BaseUserManager[User, int]):
         await self.user_db.session.commit()
         await self.user_db.session.refresh(oauth_account)
 
-async def oauth_callback(
-    self,
-    oauth_name: str,
-    access_token: str,
-    account_id: str,
-    account_email: str,
-    expires_at: Optional[int] = None,
-    refresh_token: Optional[str] = None,
-    request: Optional[Request] = None,
-    *,
-    associate_by_email: bool = False,
-    is_verified_by_default: bool = False,
-) -> UP:
-    logger.info(f"OAuth callback for {oauth_name} account {account_id}")
-
-    oauth_account = OAuthAccount(
-        oauth_name=oauth_name,
-        access_token=access_token,
-        account_id=account_id,
-        account_email=account_email,
-        expires_at=expires_at,
-        refresh_token=refresh_token,
-    )
-
-    existing_oauth_account = await self.get_by_oauth_account(oauth_name, account_id)
-    if existing_oauth_account:
-        logger.info(f"Fetching user for OAuth account with user_id: {existing_oauth_account.user_id}")
-        statement = select(User).where(User.id == existing_oauth_account.user_id)
-        result = await self.user_db.session.execute(statement)
-        user = result.scalar_one_or_none()
-
-        if user:
-            logger.info(f"User found: {user.email}, proceeding with on_after_login")
-            await self.on_after_login(user, request)
-            return RedirectResponse(url="/chat", status_code=302)
-        else:
-            logger.error(f"No user found for OAuth account with user_id: {existing_oauth_account.user_id}")
-            raise ValueError("User not found for existing OAuth account")
-
-    if associate_by_email:
-        logger.info(f"Associating OAuth account by email: {account_email}")
-        user = await self.user_db.get_by_email(account_email)
-        if user:
-            oauth_account.user_id = user.id
-            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)
-            return RedirectResponse(url="/chat", status_code=302)
-
-    logger.info(f"Creating new user for email: {account_email}")
-    user_dict = {
-        "email": account_email,
-        "hashed_password": self.password_helper.hash(secrets.token_hex(32)),
-        "is_active": True,
-        "is_verified": is_verified_by_default,
-    }
-
-    user = await self.user_db.create(user_dict)
-    oauth_account.user_id = user.id
-    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)
-    return RedirectResponse(url="/chat", status_code=302)
+    async def oauth_callback(
+        self,
+        oauth_name: str,
+        access_token: str,
+        account_id: str,
+        account_email: str,
+        expires_at: Optional[int] = None,
+        refresh_token: Optional[str] = None,
+        request: Optional[Request] = None,
+        *,
+        associate_by_email: bool = False,
+        is_verified_by_default: bool = False,
+    ) -> UP:
+        logger.info(f"OAuth callback for {oauth_name} account {account_id}")
+
+        oauth_account = OAuthAccount(
+            oauth_name=oauth_name,
+            access_token=access_token,
+            account_id=account_id,
+            account_email=account_email,
+            expires_at=expires_at,
+            refresh_token=refresh_token,
+        )
+
+        existing_oauth_account = await self.get_by_oauth_account(oauth_name, account_id)
+        if existing_oauth_account:
+            logger.info(f"Fetching user for OAuth account with user_id: {existing_oauth_account.user_id}")
+            statement = select(User).where(User.id == existing_oauth_account.user_id)
+            result = await self.user_db.session.execute(statement)
+            user = result.scalar_one_or_none()
+
+            if user:
+                logger.info(f"User found: {user.email}, proceeding with on_after_login")
+                await self.on_after_login(user, request)
+                return user
+            else:
+                logger.error(f"No user found for OAuth account with user_id: {existing_oauth_account.user_id}")
+                raise ValueError("User not found for existing OAuth account")
+
+        if associate_by_email:
+            logger.info(f"Associating OAuth account by email: {account_email}")
+            user = await self.user_db.get_by_email(account_email)
+            if user:
+                oauth_account.user_id = user.id
+                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)
+                return user
+
+        logger.info(f"Creating new user for email: {account_email}")
+        user_dict = {
+            "email": account_email,
+            "hashed_password": self.password_helper.hash(secrets.token_hex(32)),
+            "is_active": True,
+            "is_verified": is_verified_by_default,
+        }
+
+        user = await self.user_db.create(user_dict)
+        oauth_account.user_id = user.id
+        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)
+        return user
 
 # استدعاء user manager من get_user_db
 async def get_user_manager(user_db: CustomSQLAlchemyUserDatabase = Depends(get_user_db)):