Ensure subscription router is always mounted without duplicates

backend/alwrity_utils/router_manager.py

@@ -16,15 +16,22 @@ class RouterManager:
         self.app = app
         self.included_routers = []
         self.failed_routers = []
+        self._included_router_names = set()
     
     def include_router_safely(self, router, router_name: str = None) -> bool:
         """Include a router safely with error handling."""
         verbose = os.getenv("ALWRITY_VERBOSE", "false").lower() == "true"
+        router_name = router_name or getattr(router, 'prefix', 'unknown')
+
+        if router_name in self._included_router_names:
+            if verbose:
+                logger.info(f"↩️ Router already included, skipping duplicate: {router_name}")
+            return True
 
         try:
             self.app.include_router(router)
-            router_name = router_name or getattr(router, 'prefix', 'unknown')
             self.included_routers.append(router_name)
+            self._included_router_names.add(router_name)
             if verbose:
                 logger.info(f"✅ Router included successfully: {router_name}")
             return True
@@ -40,19 +47,21 @@ class RouterManager:
         # Import os locally to avoid UnboundLocalError if it's shadowed
         import os
         verbose = os.getenv("ALWRITY_VERBOSE", "false").lower() == "true"
+        demo_mode = os.getenv("ALWRITY_DEMO_MODE", "false").lower() == "true"
 
         try:
             if verbose:
-                logger.info("Including core routers...")
+                logger.info(f"Including core routers (demo_mode={demo_mode})...")
+
+            # Subscription router MUST always be included (including demo mode) so
+            # payment/preflight/subscription endpoints remain available.
+            from api.subscription import router as subscription_router
+            self.include_router_safely(subscription_router, "subscription")
 
             # Component logic router
             from api.component_logic import router as component_logic_router
             self.include_router_safely(component_logic_router, "component_logic")
             
-            # Subscription router
-            from api.subscription import router as subscription_router
-            self.include_router_safely(subscription_router, "subscription")
-            
             # Step 3 Research router (core onboarding functionality)
             from api.onboarding_utils.step3_routes import router as step3_research_router
             self.include_router_safely(step3_research_router, "step3_research")

backend/app.py

@@ -260,6 +260,9 @@ async def onboarding_status():
 
 # Include routers using modular utilities
 router_manager.include_core_routers()
+# Safety net: keep subscription routes available even if core inclusion flow changes
+# in special modes (e.g., demo mode). De-dup is handled by RouterManager.
+router_manager.include_router_safely(subscription_router, "subscription")
 router_manager.include_optional_routers()
 
 # Include assets serving router (must be mounted to serve generated images)

backend/main.py

@@ -244,6 +244,9 @@ async def onboarding_status():
 
 # Include routers using modular utilities
 router_manager.include_core_routers()
+# Safety net: keep subscription routes available even if core inclusion flow changes
+# in special modes (e.g., demo mode). De-dup is handled by RouterManager.
+router_manager.include_router_safely(subscription_router, "subscription")
 router_manager.include_optional_routers()
 
 # SEO Dashboard endpoints

frontend/src/components/Pricing/PricingPage.tsx

@@ -72,39 +72,6 @@ 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);
@@ -166,7 +133,14 @@ const PricingPage: React.FC = () => {
         // Refresh subscription status
         window.dispatchEvent(new CustomEvent('subscription-updated'));
 
-        redirectAfterSubscription();
+        // 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');
+        }
       } catch (err) {
         console.error('Error subscribing:', err);
         setError('Failed to process subscription');
@@ -266,13 +240,10 @@ const PricingPage: React.FC = () => {
       setTimeout(() => {
         clearInterval(countdownInterval);
         
-        // 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) {
+        // 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) {
           // Restore navigation state (path, phase, tool) if available
           const navState = restoreNavigationState();
           
@@ -295,8 +266,7 @@ const PricingPage: React.FC = () => {
             }
           }
         } else {
-            navigate('/onboarding');
-          }
+          navigate('/onboarding');
         }
       }, 3000);
     } catch (err) {