Update app.py

app.py

@@ -90,15 +90,35 @@ async def auth_callback(request: Request, db: Session = Depends(get_db)):
     
 @app.post("/login")
 async def login(form_data: OAuth2PasswordRequestForm = Depends(), db: Session = Depends(get_db)):
-    user = authenticate_user(db, form_data.username, form_data.password)
+    # Perform reCAPTCHA verification first
+    
+    recaptcha_secret = '6LeSJgwpAAAAAJrLrvlQYhRsOjf2wKXee_Jc4Z-k'  # Replace with your reCAPTCHA secret key
+    recaptcha_url = 'https://www.google.com/recaptcha/api/siteverify'
+    recaptcha_data = {
+        'secret': recaptcha_secret,
+        'response': recaptcha_token
+    }
+    
+    async with httpx.AsyncClient() as client:
+        recaptcha_response = await client.post(recaptcha_url, data=recaptcha_data)
+    
+    recaptcha_result = recaptcha_response.json()
+    print(recaptcha_result)  # or use proper logging
+    if not recaptcha_result.get('success', False):
+        raise HTTPException(status_code=400, detail="reCAPTCHA validation failed.")
+    if not email or not password:
+        raise HTTPException(status_code=400, detail="Invalid email or password")
+        
+    user = authenticate_user(db, form_data.email, form_data.password)
     if not user:
         raise HTTPException(
             status_code=status.HTTP_401_UNAUTHORIZED,
-            detail="Incorrect username or password",
+            detail="Incorrect email or password",
             headers={"WWW-Authenticate": "Bearer"},
         )
-    access_token = create_access_token(data={"sub": user.username})
+    access_token = create_access_token(data={"sub": user.email})
     return {"access_token": access_token, "token_type": "bearer"}
+    
 @app.get("/login", response_class=HTMLResponse)
 async def login(request: Request, db: Session = Depends(get_db)):
     access_token = request.cookies.get("access_token")
@@ -141,7 +161,42 @@ async def login(request: Request, db: Session = Depends(get_db)):
     # If not authenticated, show the login page with Google OAuth option
     google_oauth_url = request.url_for("login_oauth")  # URL to initiate Google OAuth
     return templates.TemplateResponse("login.html", {"request": request, "google_oauth_url": google_oauth_url})
-  
+
+@app.get("/register/google")
+async def register_google(request: Request):
+    # Redirect to Google OAuth
+    redirect_uri = request.url_for('auth_callback')
+    return await oauth.google.authorize_redirect(request, redirect_uri)
+
+@app.get("/auth/callback")
+async def auth_callback(request: Request, db: Session = Depends(get_db)):
+    # Handle the Google OAuth callback and user registration
+    token = await oauth.google.authorize_access_token(request)
+    user_info = await oauth.google.parse_id_token(request, token)
+    
+    # Check if user already exists
+    existing_user = db.query(User).filter(User.email == user_info['email']).first()
+    if existing_user:
+        # User already exists, handle accordingly (e.g., log in the user)
+        # ...
+        pass
+    else:
+        # Register new user
+        new_user = User(
+            email=user_info['email'],
+            username=user_info.get('name'),
+            is_verified=True  # Assuming Google users are verified by default
+        )
+        db.add(new_user)
+        db.commit()
+        db.refresh(new_user)
+        # Store user info in session or create a token as needed
+        request.session["user_info"] = {"username": new_user.username, "email": new_user.email}
+        # ...
+
+    # Redirect to a success or dashboard page
+    return RedirectResponse(url="/registration_successful")
+
 @app.get("/", response_class=HTMLResponse)
 async def landing(request: Request):
     return templates.TemplateResponse("landing.html", {"request": request})