refactor(cloud): redeem desktop login codes via strip-on-capture and a single install site

Author: benceruleanlu

src/composables/useUrlActionLoaders.test.ts

@@ -18,11 +18,9 @@ const mocks = vi.hoisted(() => ({
   loadInvite: vi.fn().mockResolvedValue(undefined),
   loadCreateWorkspace: vi.fn().mockResolvedValue(undefined),
   loadPricingTable: vi.fn().mockResolvedValue(undefined),
-  redeemDesktopLogin: vi.fn().mockResolvedValue(undefined),
   useInvite: vi.fn(),
   useCreateWorkspace: vi.fn(),
-  usePricingTable: vi.fn(),
-  useDesktopLoginRedemption: vi.fn()
+  usePricingTable: vi.fn()
 }))
 mocks.useInvite.mockImplementation(() => ({
   loadInviteFromUrl: mocks.loadInvite
@@ -33,9 +31,6 @@ mocks.useCreateWorkspace.mockImplementation(() => ({
 mocks.usePricingTable.mockImplementation(() => ({
   loadPricingTableFromUrl: mocks.loadPricingTable
 }))
-mocks.useDesktopLoginRedemption.mockImplementation(() => ({
-  redeemIfPresent: mocks.redeemDesktopLogin
-}))
 
 vi.mock('@/platform/workspace/composables/useInviteUrlLoader', () => ({
   useInviteUrlLoader: mocks.useInvite
@@ -47,10 +42,6 @@ vi.mock(
   '@/platform/cloud/subscription/composables/usePricingTableUrlLoader',
   () => ({ usePricingTableUrlLoader: mocks.usePricingTable })
 )
-vi.mock(
-  '@/platform/cloud/onboarding/composables/useDesktopLoginRedemption',
-  () => ({ useDesktopLoginRedemption: mocks.useDesktopLoginRedemption })
-)
 
 describe('useUrlActionLoaders', () => {
   beforeEach(() => {
@@ -68,11 +59,9 @@ describe('useUrlActionLoaders', () => {
     expect(mocks.useInvite).not.toHaveBeenCalled()
     expect(mocks.useCreateWorkspace).not.toHaveBeenCalled()
     expect(mocks.usePricingTable).not.toHaveBeenCalled()
-    expect(mocks.useDesktopLoginRedemption).not.toHaveBeenCalled()
     expect(mocks.loadInvite).not.toHaveBeenCalled()
     expect(mocks.loadCreateWorkspace).not.toHaveBeenCalled()
     expect(mocks.loadPricingTable).not.toHaveBeenCalled()
-    expect(mocks.redeemDesktopLogin).not.toHaveBeenCalled()
   })
 
   it('runs all loaders on cloud when team workspaces are enabled', async () => {
@@ -82,7 +71,6 @@ describe('useUrlActionLoaders', () => {
     expect(mocks.loadInvite).toHaveBeenCalledOnce()
     expect(mocks.loadCreateWorkspace).toHaveBeenCalledOnce()
     expect(mocks.loadPricingTable).toHaveBeenCalledOnce()
-    expect(mocks.redeemDesktopLogin).toHaveBeenCalledOnce()
   })
 
   it('runs the pricing loader but skips the flag-gated loaders when team workspaces are disabled', async () => {
@@ -105,15 +93,4 @@ describe('useUrlActionLoaders', () => {
     expect(mocks.loadInvite).toHaveBeenCalledOnce()
     expect(mocks.loadCreateWorkspace).toHaveBeenCalledOnce()
   })
-
-  it('does not let a pending desktop-login redemption block the other loaders', async () => {
-    mocks.redeemDesktopLogin.mockReturnValueOnce(new Promise(() => {}))
-
-    const { runUrlActionLoaders } = useUrlActionLoaders()
-    await expect(runUrlActionLoaders()).resolves.toBeUndefined()
-
-    expect(mocks.loadInvite).toHaveBeenCalledOnce()
-    expect(mocks.loadCreateWorkspace).toHaveBeenCalledOnce()
-    expect(mocks.loadPricingTable).toHaveBeenCalledOnce()
-  })
 })

src/composables/useUrlActionLoaders.ts

@@ -1,5 +1,4 @@
 import { useFeatureFlags } from '@/composables/useFeatureFlags'
-import { useDesktopLoginRedemption } from '@/platform/cloud/onboarding/composables/useDesktopLoginRedemption'
 import { usePricingTableUrlLoader } from '@/platform/cloud/subscription/composables/usePricingTableUrlLoader'
 import { isCloud } from '@/platform/distribution/types'
 import { useCreateWorkspaceUrlLoader } from '@/platform/workspace/composables/useCreateWorkspaceUrlLoader'
@@ -18,13 +17,8 @@ export function useUrlActionLoaders() {
     ? useCreateWorkspaceUrlLoader()
     : null
   const pricingTableUrlLoader = isCloud ? usePricingTableUrlLoader() : null
-  const desktopLoginRedemption = isCloud ? useDesktopLoginRedemption() : null
 
   async function runUrlActionLoaders() {
-    // Redeem a desktop login code (?desktop_login_code=dlc_...) in the
-    // background: it can await user approval and must not delay the others.
-    void desktopLoginRedemption?.redeemIfPresent()
-
     // Accept workspace invite from URL if present (e.g., ?invite=TOKEN).
     // WorkspaceAuthGate ensures flag state is resolved before the app mounts.
     if (inviteUrlLoader && flags.teamWorkspacesEnabled) {

src/locales/en/main.json

@@ -2421,7 +2421,9 @@
     "successSummary": "Signed in",
     "successDetail": "You can return to the ComfyUI desktop app.",
     "expiredSummary": "Desktop sign-in failed",
-    "expiredDetail": "The sign-in request expired or was already used. Start signing in again from the ComfyUI desktop app."
+    "expiredDetail": "The sign-in request expired or was already used. Start signing in again from the ComfyUI desktop app.",
+    "failedSummary": "Desktop sign-in failed",
+    "failedDetail": "Something went wrong completing the desktop sign-in. Start signing in again from the ComfyUI desktop app."
   },
   "validation": {
     "invalidEmail": "Invalid email address",

src/platform/cloud/onboarding/CloudLoginView.vue

@@ -103,7 +103,6 @@ import { useRoute, useRouter } from 'vue-router'
 import Button from '@/components/ui/button/Button.vue'
 import { useAuthActions } from '@/composables/auth/useAuthActions'
 import CloudSignInForm from '@/platform/cloud/onboarding/components/CloudSignInForm.vue'
-import { useDesktopLoginRedemption } from '@/platform/cloud/onboarding/composables/useDesktopLoginRedemption'
 import { usePostAuthRedirect } from '@/platform/cloud/onboarding/composables/usePostAuthRedirect'
 import type { SignInData } from '@/schemas/signInSchema'
 import { getGoogleSsoBlockedReason } from '@/base/webviewDetection'
@@ -122,10 +121,6 @@ const { onAuthSuccess } = usePostAuthRedirect({
   defaultRedirect: () => ({ name: 'cloud-user-check' })
 })
 
-// Strip a ?desktop_login_code=... from the visible URL immediately; pre-auth
-// the composable stashes the code and exits silently.
-void useDesktopLoginRedemption().redeemIfPresent()
-
 function switchToEmailForm() {
   showEmailForm.value = true
 }

src/platform/cloud/onboarding/CloudSignupView.vue

@@ -134,7 +134,6 @@ import { useRoute, useRouter } from 'vue-router'
 import SignUpForm from '@/components/dialog/content/signin/SignUpForm.vue'
 import Button from '@/components/ui/button/Button.vue'
 import { useAuthActions } from '@/composables/auth/useAuthActions'
-import { useDesktopLoginRedemption } from '@/platform/cloud/onboarding/composables/useDesktopLoginRedemption'
 import { useFreeTierOnboarding } from '@/platform/cloud/onboarding/composables/useFreeTierOnboarding'
 import { usePostAuthRedirect } from '@/platform/cloud/onboarding/composables/usePostAuthRedirect'
 import { useTelemetry } from '@/platform/telemetry'
@@ -163,10 +162,6 @@ const { onAuthSuccess } = usePostAuthRedirect({
   defaultRedirect: () => ({ path: '/', query: route.query })
 })
 
-// Strip a ?desktop_login_code=... from the visible URL immediately; pre-auth
-// the composable stashes the code and exits silently.
-void useDesktopLoginRedemption().redeemIfPresent()
-
 const navigateToLogin = async () => {
   await router.push({ name: 'cloud-login', query: route.query })
 }

src/platform/cloud/onboarding/CloudSurveyView.vue

@@ -18,18 +18,13 @@ import {
   getSurveyCompletedStatus,
   submitSurvey
 } from '@/platform/cloud/onboarding/auth'
-import { useDesktopLoginRedemption } from '@/platform/cloud/onboarding/composables/useDesktopLoginRedemption'
 import { remoteConfig } from '@/platform/remoteConfig/remoteConfig'
 import { useTelemetry } from '@/platform/telemetry'
 
 import DynamicSurveyForm from './survey/DynamicSurveyForm.vue'
 import { defaultOnboardingSurvey } from './survey/defaultSurveySchema'
 
 const router = useRouter()
-
-// Already-signed-in users detoured off '/' can sit on the survey for a while;
-// redeem a pending desktop login code without waiting for the survey to end.
-void useDesktopLoginRedemption().redeemIfPresent()
 const { flags } = useFeatureFlags()
 const onboardingSurveyEnabled = computed(() => flags.onboardingSurveyEnabled)
 

src/platform/cloud/onboarding/UserCheckView.vue

@@ -32,16 +32,11 @@ import {
   getSurveyCompletedStatus,
   getUserCloudStatus
 } from '@/platform/cloud/onboarding/auth'
-import { useDesktopLoginRedemption } from '@/platform/cloud/onboarding/composables/useDesktopLoginRedemption'
 
 import CloudLoginViewSkeleton from './skeletons/CloudLoginViewSkeleton.vue'
 import CloudSurveyViewSkeleton from './skeletons/CloudSurveyViewSkeleton.vue'
 
 const router = useRouter()
-
-// Already-signed-in users detoured off '/' land here before GraphView mounts;
-// redeem a pending desktop login code without waiting for that detour to end.
-void useDesktopLoginRedemption().redeemIfPresent()
 const { wrapWithErrorHandlingAsync } = useErrorHandling()
 const { flags } = useFeatureFlags()
 const onboardingSurveyEnabled = computed(