Update app.py

app.py

@@ -1,20 +1,36 @@
-from fastapi import Depends, HTTPException, Form, status
 from fastapi.security import OAuth2PasswordBearer
 from pydantic import BaseModel
 from sqlalchemy.orm import Session
-from database import get_user_by_email, get_user_by_verification_token
+from database import get_db, get_user_by_email, get_user_by_verification_token
 from models import User
 from passlib.context import CryptContext
 from datetime import datetime, timedelta
 import jwt
-import os
 from emailx import send_verification_email, generate_verification_token
+from fastapi import FastAPI, Depends, HTTPException, Request, Form, status
+from fastapi.responses import RedirectResponse, HTMLResponse
+from fastapi.templating import Jinja2Templates
+from starlette.middleware.sessions import SessionMiddleware
+from fastapi.staticfiles import StaticFiles
+from authlib.integrations.starlette_client import OAuth
+from typing import Optional
+import httpx
+import os
+
 
-# Configuration
+
+# Environment variables
+SECRET_KEY1 = os.getenv('SECRET_KEY', 'default_secret')
+GOOGLE_CLIENT_ID = os.getenv('GOOGLE_CLIENT_ID')
+GOOGLE_CLIENT_SECRET = os.getenv('GOOGLE_CLIENT_SECRET')
 SECRET_KEY = os.environ['my_secret_key']
 ALGORITHM = "HS256"
 ACCESS_TOKEN_EXPIRE_MINUTES = 30
 
+# FastAPI and OAuth setup
+app = FastAPI()
+app.add_middleware(SessionMiddleware, secret_key=SECRET_KEY1)
+oauth = OAuth(app)
 # Password context
 pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto")
 
@@ -29,6 +45,45 @@ class UserCreate(BaseModel):
     email: str
     password: str
     confirm_password: str
+# OAuth Configuration
+oauth.register(
+    name='google',
+    client_id=GOOGLE_CLIENT_ID,
+    client_secret=GOOGLE_CLIENT_SECRET,
+    access_token_url='https://accounts.google.com/o/oauth2/token',
+    authorize_url='https://accounts.google.com/o/oauth2/auth',
+    api_base_url='https://www.googleapis.com/oauth2/v1/',
+    client_kwargs={'scope': 'openid email profile'}
+)
+
+# Static and template configurations
+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
+
 
 def create_access_token(data: dict, expires_delta: timedelta = timedelta(minutes=ACCESS_TOKEN_EXPIRE_MINUTES)):
     to_encode = data.copy()
@@ -58,7 +113,7 @@ def register_user(user_data: UserCreate, db: Session):
 
     hashed_password = pwd_context.hash(user_data.password)
     verification_token = generate_verification_token(user_data.email)
-    reset_link = f"https://yourdomain.com/verify?token={verification_token}"
+    reset_link = f"http://gregniuki-loginauth.hf.space/verify?token={verification_token}"
     send_verification_email(user_data.email, reset_link)
 
     new_user = User(
@@ -74,7 +129,7 @@ def register_user(user_data: UserCreate, db: Session):
 
 def reset_password(user: User, db: Session):
     verification_token = generate_verification_token(user.email)
-    reset_link = f"https://yourdomain.com/reset-password?token={verification_token}"
+    reset_link = f"http://gregniuki-loginauth.hf.space/reset-password?token={verification_token}"
     send_verification_email(user.email, reset_link)
 
     user.email_verification_token = verification_token