Update appp.py

appp.py

@@ -60,29 +60,6 @@ app.mount("/static", StaticFiles(directory="static"), name="static")
 templates = Jinja2Templates(directory="templates")
 
 # OAuth routes
-@app.get("/login/oauth")
-async def login_oauth(request: Request):
-    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)):
-    token = await oauth.google.authorize_access_token(request)
-    user_info = await oauth.google.parse_id_token(request, token)
-    request.session["user_info"] = user_info
-
-    db_user = db.query(User).filter(User.email == user_info['email']).first()
-    if not db_user:
-        db_user = User(email=user_info['email'], username=user_info['name'], is_verified=True)
-        db.add(db_user)
-        db.commit()
-        db.refresh(db_user)
-
-    access_token = create_access_token(data={"sub": db_user.email}, expires_delta=timedelta(minutes=30))
-    response = RedirectResponse(url="/protected")
-    response.set_cookie(key="access_token", value=f"Bearer {access_token}", httponly=True)
-    return response
-    
 @app.post("/login")
 async def login(
     request: Request,
@@ -111,8 +88,8 @@ async def login_get(request: Request):
     google_oauth_url = request.url_for("login_oauth")
     return templates.TemplateResponse("login.html", {"request": request, "google_oauth_url": google_oauth_url})
 
-@app.get("/register/google")
-async def register_google(request: Request):
+@app.get("/login/oauth")
+async def login_oauth(request: Request):
     redirect_uri = request.url_for('auth_callback')
     return await oauth.google.authorize_redirect(request, redirect_uri)
 
@@ -139,10 +116,14 @@ async def auth_callback(request: Request, db: Session = Depends(get_db)):
             response.set_cookie(key="access_token", value=f"Bearer {access_token}", httponly=True, secure=True, samesite='Lax')
             return response
     except Exception as e:
-        # Handle any exceptions that may occur during the OAuth process
         print(f"OAuth exception: {e}")
         raise HTTPException(status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail="An error occurred during OAuth authentication")
 
+@app.get("/register/google")
+async def register_google(request: Request):
+    redirect_uri = request.url_for('auth_callback')
+    return await oauth.google.authorize_redirect(request, redirect_uri)
+
 @app.get("/registration_successful", response_class=HTMLResponse)
 async def registration_successful(request: Request):
     return templates.TemplateResponse("registration_successful.html", {"request": request})