diff --git a/app/dependencies/users_token.py b/app/dependencies/users_token.py index 6254432..fd1685f 100644 --- a/app/dependencies/users_token.py +++ b/app/dependencies/users_token.py @@ -10,34 +10,12 @@ from passlib.context import CryptContext from ..models import users, token from ..dependencies import database, cookie -from authlib.integrations.starlette_client import OAuth -import httpx, os - SECRET_KEY = "09d25e094faa6ca2556c818166b7a9563b93f7099f6f0f4caa6cf63b88e8d3e7" ALGORITHM = "HS256" ACCESS_TOKEN_EXPIRE_MINUTES = 30 pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto") -oauth = OAuth() -oauth.register( - name="google", - client_id=os.environ["GOOGLE_CLIENT_ID"], - client_secret=os.environ["GOOGLE_CLIENT_SECRET"], - authorize_url="https://accounts.google.com/o/oauth2/auth", - access_token_url="https://oauth2.googleapis.com/token", - client_kwargs={"scope": "openid email profile"}, -) - -oauth.register( - name="facebook", - client_id=os.environ["FACEBOOK_CLIENT_ID"], - client_secret=os.environ["FACEBOOK_CLIENT_SECRET"], - authorize_url="https://www.facebook.com/v12.0/dialog/oauth", - access_token_url="https://graph.facebook.com/v12.0/oauth/access_token", - client_kwargs={"scope": "email public_profile"}, -) - oauth2_scheme = cookie.OAuth2PasswordBearerWithCookie(tokenUrl="token") def create_access_token(data: dict, expires_delta: timedelta | None = None): @@ -47,38 +25,6 @@ def create_access_token(data: dict, expires_delta: timedelta | None = None): encoded_jwt = jwt.encode(to_encode, SECRET_KEY, algorithm=ALGORITHM) return encoded_jwt -async def authenticate_oauth(provider: str, token: str): - """Validate OAuth token and get user info.""" - if provider == "google": - url = f"https://www.googleapis.com/oauth2/v3/userinfo?access_token={token}" - elif provider == "facebook": - url = f"https://graph.facebook.com/me?fields=id,name,email,picture&access_token={token}" - else: - raise HTTPException(status_code=400, detail="Unsupported provider") - - async with httpx.AsyncClient() as client: - response = await client.get(url) - if response.status_code != 200: - raise HTTPException(status_code=400, detail="Invalid OAuth token") - - user_info = response.json() - email = user_info.get("email") - if not email: - raise HTTPException(status_code=400, detail="Email not provided by provider") - - user_repository = users.UserRepository(database=database.database) - user = user_repository.find_one_by({'email': email}) - - if not user: - user = users.User( - username=email, - email=email, - profile_picture=user_info.get("picture", {}).get("data", {}).get("url", ""), - status=1, - ) - user_repository.save(user) - - return user def verify_password(plain_password, hashed_password): return pwd_context.verify(plain_password, hashed_password) diff --git a/app/routers/token.py b/app/routers/token.py index bb0adaf..037f6e6 100644 --- a/app/routers/token.py +++ b/app/routers/token.py @@ -11,27 +11,6 @@ from ..models import token, users router = APIRouter() ACCESS_TOKEN_EXPIRE_MINUTES = 30 -@router.post("/oauth/{provider}", tags=["token"]) -async def oauth_login(provider: str, token: str): - """Handles OAuth login via Google/Facebook.""" - user = await users_token.authenticate_oauth(provider, token) - if not user: - raise HTTPException( - status_code=status.HTTP_401_UNAUTHORIZED, - detail="Invalid authentication" - ) - - access_token_expires = timedelta(minutes=ACCESS_TOKEN_EXPIRE_MINUTES) - access_token = users_token.create_access_token( - data={"sub": user.username}, expires_delta=access_token_expires - ) - - content = {"roles": user.roles, "message": "OAuth login successful"} - response = JSONResponse(content=content) - response.set_cookie(key="access_token", value=f"Bearer {access_token}", httponly=True) - return response - - @router.post("/token", tags=["token"]) async def login_for_access_token( form_data: Annotated[OAuth2PasswordRequestForm, Depends()]): diff --git a/requierements.txt b/requierements.txt index 6dffde1..2645894 100644 --- a/requierements.txt +++ b/requierements.txt @@ -5,6 +5,4 @@ python-jose[cryptography] passlib[bcrypt] python-multipart fastapi-mail -redis -authlib -httpx \ No newline at end of file +redis \ No newline at end of file