Files
ComfyUI_frontend/src/router.ts
Christian Byrne 76bd9ab43e [don't port to main] fix: Enable Playwright tests on rh-test by skipping cloud auth guard (#6283)
## Problem

All Playwright tests on rh-test were failing due to cloud-specific
initialization blocking test execution:

1. Firebase auth guard waits 16 seconds for auth initialization,
exceeding test timeout (15s)
2. Remote config fetch blocks on /api/features endpoint
3. Snapshot images outdated - rh-test has old snapshots while main UI
evolved

## Solution

**Skip cloud auth guard** (src/router.ts)
- Add `if (!isCloud) return next()` at start of router.beforeEach
- Playwright builds with DISTRIBUTION='localhost', bypassing the guard
- Safe since guard is cloud-only (Firebase, login pages, onboarding)

**Mock /api/features endpoint** (browser_tests/fixtures/ComfyPage.ts)
- Try real backend first, fallback to empty config
- Prevents initialization hang when endpoint unavailable
- Preserves explicit featureFlags.spec.ts test functionality

**Update snapshots from main**
- Pulled 33 snapshot files from main branch
- Fixes snapshot mismatches caused by UI evolution on main
- Includes 3 new snapshots (recordAudio, bypass/mute states)

## Impact

- Playwright tests can now initialize and run on rh-test
- Cloud functionality unchanged (fixes only affect
DISTRIBUTION='localhost')
- No production behavior changes
2025-10-25 21:50:27 -07:00

219 lines
6.3 KiB
TypeScript

import {
createRouter,
createWebHashHistory,
createWebHistory
} from 'vue-router'
import type { RouteLocationNormalized } from 'vue-router'
import { isCloud } from '@/platform/distribution/types'
import { useDialogService } from '@/services/dialogService'
import { useFirebaseAuthStore } from '@/stores/firebaseAuthStore'
import { useUserStore } from '@/stores/userStore'
import { isElectron } from '@/utils/envUtil'
import LayoutDefault from '@/views/layouts/LayoutDefault.vue'
import { cloudOnboardingRoutes } from './onboardingCloudRoutes'
const PUBLIC_ROUTE_NAMES = new Set([
'cloud-login',
'cloud-signup',
'cloud-forgot-password',
'cloud-sorry-contact-support'
])
const isPublicRoute = (to: RouteLocationNormalized) => {
const name = String(to.name)
if (PUBLIC_ROUTE_NAMES.has(name)) return true
const path = to.path
if (
path === '/cloud/login' ||
path === '/cloud/signup' ||
path === '/cloud/forgot-password' ||
path === '/cloud/sorry-contact-support'
)
return true
if (path.startsWith('/cloud/code')) return true
return false
}
const isFileProtocol = window.location.protocol === 'file:'
// Determine base path for the router
// - Electron: always root
// - Web: rely on Vite's BASE_URL (configured via vite.config `base`)
function getBasePath(): string {
if (isElectron()) return '/'
// Vite injects BASE_URL at build/dev time; default is '/'
const viteBase = (import.meta as any).env?.BASE_URL || '/'
return viteBase
}
const basePath = getBasePath()
const router = createRouter({
history: isFileProtocol
? createWebHashHistory()
: // Base path must be specified to ensure correct relative paths
// Example: For URL 'http://localhost:7801/ComfyBackendDirect',
// we need this base path or assets will incorrectly resolve from 'http://localhost:7801/'
createWebHistory(basePath),
routes: [
// Cloud onboarding routes
...cloudOnboardingRoutes,
{
path: '/',
component: LayoutDefault,
children: [
{
path: '',
name: 'GraphView',
component: () => import('@/views/GraphView.vue'),
beforeEnter: async (_to, _from, next) => {
// Then check user store
const userStore = useUserStore()
await userStore.initialize()
if (userStore.needsLogin) {
next('/user-select')
} else {
next()
}
}
},
{
path: 'user-select',
name: 'UserSelectView',
component: () => import('@/views/UserSelectView.vue')
}
]
},
// Catch-all: redirect unknown routes
{
path: '/:pathMatch(.*)*',
name: 'not-found-redirect',
redirect: '/'
}
],
scrollBehavior(_to, _from, savedPosition) {
if (savedPosition) {
return savedPosition
} else {
return { top: 0 }
}
}
})
// Global authentication guard
router.beforeEach(async (to, _from, next) => {
// Skip cloud-specific auth guard for non-cloud builds (e.g., Playwright tests)
if (!isCloud) return next()
const authStore = useFirebaseAuthStore()
// Wait for Firebase auth to initialize with timeout
if (!authStore.isInitialized) {
try {
await new Promise<void>((resolve, reject) => {
const timeout = setTimeout(() => {
unwatch()
reject(new Error('Authentication initialization timeout'))
}, 16000) // 16 second timeout
const unwatch = authStore.$subscribe((_, state) => {
if (state.isInitialized) {
clearTimeout(timeout)
unwatch()
resolve()
}
})
})
} catch (error) {
console.error('Auth initialization failed:', error)
// Navigate to auth timeout recovery page
return next({ name: 'cloud-auth-timeout' })
}
}
// Check if user is authenticated
const authHeader = await authStore.getAuthHeader()
const isLoggedIn = !!authHeader
// Allow public routes
if (isPublicRoute(to)) {
return next()
}
// Special handling for user-check and invite-check routes
// These routes need auth but handle their own routing logic
if (to.name === 'cloud-user-check' || to.name === 'cloud-invite-check') {
if (to.meta.requiresAuth && !isLoggedIn) {
return next({ name: 'cloud-login' })
}
return next()
}
// Prevent redirect loop when coming from user-check
if (_from.name === 'cloud-user-check' && to.path === '/') {
return next()
}
// Check if route requires authentication
if (to.meta.requiresAuth && !isLoggedIn) {
return next({ name: 'cloud-login' })
}
// Handle other protected routes
if (!isPublicRoute(to) && !isLoggedIn) {
// For Electron, use dialog
if (isElectron()) {
const dialogService = useDialogService()
const loginSuccess = await dialogService.showSignInDialog()
return loginSuccess ? next() : next(false)
}
// For web, redirect to login
return next({ name: 'cloud-login' })
}
// User is logged in - check if they need onboarding
// For root path, check actual user status to handle waitlisted users
if (!isElectron() && isLoggedIn && to.path === '/') {
try {
// Check email verification first
const authStore = useFirebaseAuthStore()
if (!authStore.isEmailVerified) {
// Don't pass fromAuth here since this is from root navigation, not auth flow
return next({ name: 'cloud-verify-email' })
}
// Import auth functions dynamically to avoid circular dependency
const { getUserCloudStatus, getSurveyCompletedStatus } = await import(
'@/api/auth'
)
// Check user's actual status
const userStatus = await getUserCloudStatus()
const surveyCompleted = await getSurveyCompletedStatus()
// If user is not active (waitlisted), redirect based on survey status
if (userStatus.status !== 'active') {
if (!surveyCompleted) {
return next({ name: 'cloud-survey' })
} else {
return next({ name: 'cloud-waitlist' })
}
}
// User is active, allow access to root
} catch (error) {
console.error('Failed to check user status:', error)
// On error, redirect to user-check as fallback
return next({ name: 'cloud-user-check' })
}
}
// User is logged in and accessing protected route
return next()
})
export default router