Update main.py

main.py

@@ -3,6 +3,7 @@
 from fastapi import FastAPI, Form, Depends, HTTPException
 from fastapi.requests import Request
 from fastapi.responses import HTMLResponse, RedirectResponse
+from fastapi.security import OAuth2PasswordRequestForm
 from fastapi.templating import Jinja2Templates
 from sqlalchemy.orm import Session
 from auth import verify_token, oauth2_scheme, auth_views, register, UserCreate, authenticate_user, get_user_by_verification_token
@@ -43,52 +44,60 @@ async def login(request: Request):
 @app.post("/login", response_class=HTMLResponse)
 async def login_post(
     request: Request,
-    email: str = Form(...),
-    password: str = Form(...),
+    form_data: OAuth2PasswordRequestForm = Depends(),
     db: Session = Depends(get_db)
 ):
+    email = form_data.username
+    password = form_data.password
+
     # Validate the email and password
     if not email or not password:
         raise HTTPException(status_code=400, detail="Invalid email or password")
 
-    # Check user authentication (You should implement this function)
+    # Check user authentication using the provided email and password
     user = authenticate_user(db, email, password)
-    
+
     if user is not None:
         # Authentication succeeded
         # Create an access token and handle login success
-        # You can use your access token creation logic here
         access_token = auth_views.create_access_token(
             data={"sub": user.email},
             expires_delta=timedelta(minutes=auth_views.ACCESS_TOKEN_EXPIRE_MINUTES),
         )
-           # Set the access_token (if desired)
+
+        # Set the access_token (if desired)
         user.token = access_token
+
+        # Commit the changes to the database
         db.commit()
-        # Redirect to a protected page or handle the login success as needed
-        return RedirectResponse("/protected")
+
+        # Handle the login success as needed
+        return templates.TemplateResponse("protected.html", {"request": request, "user": user.username})
     else:
         # Authentication failed
         # Handle login failure, e.g., display an error message
-        return templates.TemplateResponse("login.html", {"request": request, "error_message": "Invalid email or password"}) 
-        #return RedirectResponse("/login?error=Authentication failed")
+        return templates.TemplateResponse("login.html", {"request": request, "error_message": "Invalid email or password"})
 
 @app.get("/register", response_class=HTMLResponse)
 async def register_get(request: Request):
     return templates.TemplateResponse("register.html", {"request": request})
 
+
 @app.post("/register", response_class=HTMLResponse)
 async def register_post(
     request: Request,
-    username: str = Form(...),
-    email: str = Form(...),
-    password: str = Form(...),
-    confirm_password: str = Form(...),
+    form_data: OAuth2PasswordRequestForm = Depends(),
     db: Session = Depends(get_db)
 ):
+    username = form_data.username
+    email = form_data.email
+    password = form_data.password
+    confirm_password = form_data.password
+
     user = UserCreate(username=username, email=email, password=password, confirm_password=confirm_password)
     registered_user = register(user, db)
     return RedirectResponse("/registration_successful")
+
     
 @app.post("/registration_successful", response_class=HTMLResponse)
 async def registration_successful(request: Request):