fix stripe redirect

config.py

@@ -14,5 +14,7 @@ GOOGLE_CLIENT_SECRET = os.getenv("GOOGLE_CLIENT_SECRET")
 STRIPE_API_KEY = os.getenv("STRIPE_API_KEY")
 STRIPE_WEBHOOK_SECRET = os.getenv("STRIPE_WEBHOOK_SECRET")
 
+DOMAIN = 'http://127.0.0.1:7000' # 'http://127.0.0.1:7000' FOR LOCAL DEV
+
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)

main.py

@@ -18,7 +18,7 @@ static_dir = Path("./static")
 app.mount("/static", StaticFiles(directory=static_dir, html=True), name="static")
 #app.mount("/assets", StaticFiles(directory="assets", html=True), name="assets")
 
-app.add_middleware(SessionMiddleware, secret_key=SECRET_KEY)
+app.add_middleware(SessionMiddleware, secret_key=SECRET_KEY, max_age=3600)
 
 app.include_router(router)
 

routes.py

@@ -6,12 +6,18 @@ from database import get_or_create_user, update_user_credits, get_user_by_id
 from authlib.integrations.starlette_client import OAuthError
 import gradio as gr
 from utils.stripe_utils import create_checkout_session, verify_webhook, retrieve_stripe_session
+from config import DOMAIN
 
 router = APIRouter()
 
 def get_user(request: Request):
-    user = request.session.get('user')
-    return user['name'] if user else None
+    user_data = request.session.get('user')
+    if user_data:
+        # Refresh user data from the database
+        user = get_user_by_id(user_data['id'])
+        request.session['user'] = user  # Update session with fresh data
+        return user['name']
+    return None
 
 @router.get('/')
 def public(request: Request, user = Depends(get_user)):
@@ -61,7 +67,7 @@ async def buy_credits(request: Request):
     user = request.session.get('user')
     if not user:
         return {"error": "User not authenticated"}
-    session = create_checkout_session(100, 50, user['id'])  # $1 for 50 credits
+    session = create_checkout_session(100, 50, user['id'], request)  # $1 for 50 credits
     
     # Store the session ID and user ID in the session
     request.session['stripe_session_id'] = session['id']
@@ -120,30 +126,29 @@ async def payment_cancel(request: Request):
         return RedirectResponse(url='/gradio', status_code=303)
     return RedirectResponse(url='/login', status_code=303)
 
-@router.get("/success")
+@router.get('/success')
 async def payment_success(request: Request):
-    print("Payment successful")
+    print('Payment Sucess')
     stripe_session_id = request.session.get('stripe_session_id')
     user_id = request.session.get('user_id')
-    
-    print(f"Session data: stripe_session_id={stripe_session_id}, user_id={user_id}")
-    
+    print(user_id)
     if stripe_session_id and user_id:
         # Retrieve the Stripe session
         stripe_session = retrieve_stripe_session(stripe_session_id)
-        
+
         if stripe_session.get('payment_status') == 'paid':
             user = get_user_by_id(user_id)
             if user:
                 # Update the session with the latest user data
                 request.session['user'] = user
-                print(f"User session updated: {user}")
-                
+                print(f"\nUser session updated: {user}\n")
+
                 # Clear the stripe_session_id and user_id from the session
                 request.session.pop('stripe_session_id', None)
                 request.session.pop('user_id', None)
-                
-                return RedirectResponse(url='/gradio', status_code=303)
+
+                root_url = DOMAIN
+                return RedirectResponse(url=f'{root_url}/gradio/', status_code=303)
             else:
                 print(f"User not found for ID: {user_id}")
         else:

utils/stripe_utils.py

@@ -1,10 +1,11 @@
 import stripe
-from config import STRIPE_API_KEY, STRIPE_WEBHOOK_SECRET
-
+from config import STRIPE_API_KEY, STRIPE_WEBHOOK_SECRET, DOMAIN
+import gradio as gr
 stripe.api_key = STRIPE_API_KEY
 
 
-def create_checkout_session(amount, quantity, user_id):
+def create_checkout_session(amount, quantity, user_id, request):
+    root_url = gr.route_utils.get_root_url(request, "/", None)
     session = stripe.checkout.Session.create(
         payment_method_types=['card'],
         line_items=[{
@@ -18,8 +19,8 @@ def create_checkout_session(amount, quantity, user_id):
             'quantity': 1,
         }],
         mode='payment',
-        success_url='http://localhost:8000/success?session_id={CHECKOUT_SESSION_ID}&user_id=' + str(user_id),
-        cancel_url='http://localhost:8000/cancel?user_id=' + str(user_id),
+        success_url=DOMAIN + '/success?session_id={CHECKOUT_SESSION_ID}&user_id=' + str(user_id),
+        cancel_url=DOMAIN + '/cancel?user_id=' + str(user_id),
 
         client_reference_id=str(user_id),  # Add this line
     )