From 17ae4cbf534b2b8f3d5a4f9a02b1e11fb34965c3 Mon Sep 17 00:00:00 2001
From: Christian Byrne <cbyrne@comfy.org>
Date: Wed, 29 Oct 2025 08:45:21 -0700
Subject: [PATCH] Fix subscription dialog appearing during onboarding (#6367)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes subscription dialog incorrectly appearing on cloud onboarding
pages (email verification, survey, waitlist). Root cause: logout uses
SPA routing leaving extensions with stale auth state. Solution: (1) use
full page navigation for logout to reset app state, (2) add defensive
route guard to skip subscription checks on /cloud/* paths. Prevents
subscription modal from showing during account switching and onboarding
flows.

┆Issue is synchronized with this [Notion
page](https://www.notion.so/PR-6367-Fix-subscription-dialog-appearing-during-onboarding-29b6d73d3650818d88e0d59ade7de02e)
by [Unito](https://www.unito.io)
---
 src/composables/auth/useFirebaseAuthActions.ts           | 9 ++++++---
 .../cloud/subscription/composables/useSubscription.ts    | 9 +++++++++
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/composables/auth/useFirebaseAuthActions.ts b/src/composables/auth/useFirebaseAuthActions.ts
index 04cc2dd09..81dde3016 100644
--- a/src/composables/auth/useFirebaseAuthActions.ts
+++ b/src/composables/auth/useFirebaseAuthActions.ts
@@ -55,14 +55,17 @@ export const useFirebaseAuthActions = () => {
       life: 5000
     })
 
-    // Redirect to login page if we're on cloud domain
+    // CRITICAL: Use full page navigation for logout to prevent stale app state
+    // Issue: SPA routing during logout can leave extensions loaded with stale auth state
+    // This causes subscription dialogs to appear incorrectly during re-login onboarding
+    // Full page reload ensures complete app state reset and proper onboarding flow
     const hostname = window.location.hostname
     if (hostname.includes('cloud.comfy.org')) {
       if (route.query.inviteCode) {
         const inviteCode = route.query.inviteCode
-        await router.push({ name: 'cloud-login', query: { inviteCode } })
+        window.location.href = `/cloud/login?inviteCode=${encodeURIComponent(inviteCode)}`
       } else {
-        await router.push({ name: 'cloud-login' })
+        window.location.href = '/cloud/login'
       }
     }
   }, reportError)
diff --git a/src/platform/cloud/subscription/composables/useSubscription.ts b/src/platform/cloud/subscription/composables/useSubscription.ts
index 061e0bf45..c330723cb 100644
--- a/src/platform/cloud/subscription/composables/useSubscription.ts
+++ b/src/platform/cloud/subscription/composables/useSubscription.ts
@@ -1,4 +1,5 @@
 import { computed, ref, watch } from 'vue'
+import { useRoute } from 'vue-router'
 
 import { useCurrentUser } from '@/composables/auth/useCurrentUser'
 import { useFirebaseAuthActions } from '@/composables/auth/useFirebaseAuthActions'
@@ -108,6 +109,14 @@ export function useSubscription() {
   }
 
   const requireActiveSubscription = async (): Promise<void> => {
+    // DEFENSIVE: Never show subscription dialogs during onboarding flows
+    // All cloud onboarding routes start with '/cloud/' (login, signup, survey, waitlist, etc.)
+    // This prevents subscription enforcement from interfering with user onboarding
+    const route = useRoute()
+    if (route.path.startsWith('/cloud/')) {
+      return
+    }
+
     await fetchSubscriptionStatus()
 
     if (!isActiveSubscription.value) {