Merge pull request 'feature/oauth' (#54) from feature/oauth into master

Reviewed-on: #54

app/dependencies/users_token.py

@@ -10,13 +10,76 @@ 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):
+    to_encode = data.copy()
+    expire = datetime.utcnow() + (expires_delta or timedelta(minutes=ACCESS_TOKEN_EXPIRE_MINUTES))
+    to_encode.update({"exp": expire})
+    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)
 

app/routers/password.py

@@ -4,7 +4,7 @@ from ..dependencies import users_token, database, mail
 from ..models import users, email
 from fastapi.responses import JSONResponse, HTMLResponse
 from fastapi_mail import MessageSchema, MessageType, FastMail
-import random, os
+import random, os, bcrypt
 
 router = APIRouter()
 
@@ -68,26 +68,52 @@ async def reset_password(request: Request, key: str | None = None, email: str |
             detail="Parameters 'key' and 'email' are required"
         )
 
-    # Vérifier que la clé correspond à celle stockée dans Redis
+    # Récupérer la clé hachée depuis Redis
     key_hashed = database.connect_redis.get(email)
     
-    if key_hashed is None or key_hashed.decode() != key:
+    if key_hashed is None:
         raise HTTPException(
             status_code=status.HTTP_400_BAD_REQUEST,
-            detail="Key is invalid or expired"
+            detail="Invalid or expired reset key"
         )
 
+    # Redis stocke les valeurs en `bytes`, donc il faut décoder si nécessaire
+    if isinstance(key_hashed, bytes):
+        key_hashed = key_hashed.decode()
+
+
+    # Vérifier que la clé en clair correspond au hash stocké
+    if not bcrypt.checkpw(key.encode(), key_hashed.encode()):
+        raise HTTPException(
+            status_code=status.HTTP_400_BAD_REQUEST,
+            detail="Invalid reset key"
+        )
+
+
     # Afficher la page HTML de réinitialisation du mot de passe
     return templates.TemplateResponse("reset_password.html", {"request": request, "email": email, "key": key})
 
 @router.post("/password/update", tags=["password"])
 async def update_password(request: Request, email: str = Form(...), key: str = Form(...), new_password: str = Form(...)):    # Vérification du token dans Redis
+    # Récupérer la clé hachée depuis Redis
     key_hashed = database.connect_redis.get(email)
     
-    if key_hashed is None or key_hashed.decode() != key:
+    if key_hashed is None:
         raise HTTPException(
             status_code=status.HTTP_400_BAD_REQUEST,
-            detail="Key is invalid or expired"
+            detail="Invalid or expired reset key"
+        )
+
+    # Redis stocke les valeurs en `bytes`, donc il faut décoder si nécessaire
+    if isinstance(key_hashed, bytes):
+        key_hashed = key_hashed.decode()
+
+
+    # Vérifier que la clé en clair correspond au hash stocké
+    if not bcrypt.checkpw(key.encode(), key_hashed.encode()):
+        raise HTTPException(
+            status_code=status.HTTP_400_BAD_REQUEST,
+            detail="Invalid reset key"
         )
     
     # Recherche de l'utilisateur dans la base de données

app/routers/token.py

@@ -11,6 +11,27 @@ 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()]):

requierements.txt

@@ -6,3 +6,5 @@ passlib[bcrypt]
 python-multipart
 fastapi-mail
 redis
+authlib
+httpx