Compare commits

..

1 Commits

Author SHA1 Message Date
ي
cadcb8077d Add mode-aware pricing redirect for podcast demo flow 2026-03-30 07:48:00 +05:30
2 changed files with 45 additions and 68 deletions

View File

@@ -8,7 +8,6 @@ IMPORTANT: This is a compatibility layer. For new code, use UserAPIKeyContext di
"""
import os
import time
from fastapi import Request
from loguru import logger
from typing import Callable
@@ -21,61 +20,8 @@ class APIKeyInjectionMiddleware:
for the duration of each request.
"""
# Shared across middleware instances (module currently instantiates per request)
_missing_keys_log_timestamps = {}
def __init__(self):
self.original_keys = {}
@staticmethod
def _should_skip_missing_key_warning(request: Request) -> bool:
"""
Optionally suppress missing-key warnings for non-AI/internal routes.
Controlled by API_KEY_INJECTION_SKIP_NON_AI_WARNINGS (default: true).
"""
skip_non_ai_warnings = os.getenv('API_KEY_INJECTION_SKIP_NON_AI_WARNINGS', 'true').lower() in ('1', 'true', 'yes')
if not skip_non_ai_warnings:
return False
path_lower = (request.url.path or '').lower()
return (
path_lower.startswith('/api/subscription/')
or path_lower.startswith('/api/onboarding/')
or path_lower.endswith('/status')
or path_lower.endswith('/health')
or path_lower == '/health'
or path_lower == '/status'
)
def _log_missing_keys_non_blocking(self, request: Request, user_id: str) -> None:
"""
Log missing API keys without interrupting request flow.
- Defaults to debug-level logging.
- Optional warn once-per-user-per-interval via env:
API_KEY_INJECTION_MISSING_KEYS_LOG_MODE=warn_once
API_KEY_INJECTION_MISSING_KEYS_LOG_INTERVAL_SECONDS=900
"""
try:
if self._should_skip_missing_key_warning(request):
logger.debug(f"[API Key Injection] Missing keys for user {user_id} on non-AI route; skipping warning")
return
log_mode = os.getenv('API_KEY_INJECTION_MISSING_KEYS_LOG_MODE', 'debug').lower()
if log_mode != 'warn_once':
logger.debug(f"No API keys found for user {user_id}")
return
interval_seconds = int(os.getenv('API_KEY_INJECTION_MISSING_KEYS_LOG_INTERVAL_SECONDS', '900'))
now = time.time()
last_logged_at = self._missing_keys_log_timestamps.get(user_id, 0)
if (now - last_logged_at) >= max(interval_seconds, 1):
logger.warning(f"No API keys found for user {user_id}")
self._missing_keys_log_timestamps[user_id] = now
else:
logger.debug(f"No API keys found for user {user_id} (warning suppressed by interval)")
except Exception as log_error:
# Logging should never block request processing
logger.debug(f"[API Key Injection] Failed to log missing keys state for user {user_id}: {log_error}")
async def __call__(self, request: Request, call_next: Callable):
"""
@@ -122,7 +68,7 @@ class APIKeyInjectionMiddleware:
# Get user-specific API keys from database
with user_api_keys(user_id) as user_keys:
if not user_keys:
self._log_missing_keys_non_blocking(request, user_id)
logger.warning(f"No API keys found for user {user_id}")
return await call_next(request)
# Save original environment values
@@ -174,3 +120,4 @@ async def api_key_injection_middleware(request: Request, call_next: Callable):
"""
middleware = APIKeyInjectionMiddleware()
return await middleware(request, call_next)

View File

@@ -72,6 +72,39 @@ const PricingPage: React.FC = () => {
fetchPlans();
}, []);
const isPodcastOnlyDemoMode = () => {
const appMode = (localStorage.getItem('app_mode') || '').toLowerCase();
const demoMode = (localStorage.getItem('demo_mode') || '').toLowerCase();
const podcastOnlyDemoMode = (localStorage.getItem('podcast_only_demo_mode') || '').toLowerCase();
const envAppMode = (process.env.REACT_APP_APP_MODE || '').toLowerCase();
const envDemoMode = (process.env.REACT_APP_DEMO_MODE || '').toLowerCase();
return (
podcastOnlyDemoMode === 'true' ||
appMode === 'podcast-only' ||
demoMode === 'podcast-only' ||
envAppMode === 'podcast-only' ||
envDemoMode === 'podcast-only'
);
};
const redirectAfterSubscription = () => {
// In podcast-only demo mode, always force users into podcast flow.
// Never send demo users to onboarding.
if (isPodcastOnlyDemoMode()) {
navigate('/podcast-maker');
return;
}
// Full mode keeps existing onboarding redirect behavior.
const onboardingComplete = localStorage.getItem('onboarding_complete') === 'true';
if (onboardingComplete) {
navigate('/dashboard');
} else {
navigate('/onboarding');
}
};
const fetchPlans = async () => {
try {
setLoading(true);
@@ -133,14 +166,7 @@ const PricingPage: React.FC = () => {
// Refresh subscription status
window.dispatchEvent(new CustomEvent('subscription-updated'));
// After subscription, check if onboarding is complete
// If not complete, redirect to onboarding; otherwise to dashboard
const onboardingComplete = localStorage.getItem('onboarding_complete') === 'true';
if (onboardingComplete) {
navigate('/dashboard');
} else {
navigate('/onboarding');
}
redirectAfterSubscription();
} catch (err) {
console.error('Error subscribing:', err);
setError('Failed to process subscription');
@@ -240,10 +266,13 @@ const PricingPage: React.FC = () => {
setTimeout(() => {
clearInterval(countdownInterval);
// After subscription, check if onboarding is complete
// If not complete, redirect to onboarding; otherwise to dashboard
const onboardingComplete = localStorage.getItem('onboarding_complete') === 'true';
if (onboardingComplete) {
// In podcast-only demo mode, always route users to podcast flow.
if (isPodcastOnlyDemoMode()) {
navigate('/podcast-maker');
} else {
const onboardingComplete = localStorage.getItem('onboarding_complete') === 'true';
if (onboardingComplete) {
// Restore navigation state (path, phase, tool) if available
const navState = restoreNavigationState();
@@ -266,7 +295,8 @@ const PricingPage: React.FC = () => {
}
}
} else {
navigate('/onboarding');
navigate('/onboarding');
}
}
}, 3000);
} catch (err) {