From 9f2d1d760174d268f670e31133b70b5e82aea643 Mon Sep 17 00:00:00 2001 From: Dante Date: Mon, 10 Aug 2026 20:57:12 -0400 Subject: [PATCH 1/4] fix: redirect legacy cloud login route --- .../onboarding/onboardingCloudRoutes.test.ts | 34 +++++++++++++++++++ .../cloud/onboarding/onboardingCloudRoutes.ts | 4 +++ 2 files changed, 38 insertions(+) diff --git a/src/platform/cloud/onboarding/onboardingCloudRoutes.test.ts b/src/platform/cloud/onboarding/onboardingCloudRoutes.test.ts index 702a0e9e1fd..19c16db26c5 100644 --- a/src/platform/cloud/onboarding/onboardingCloudRoutes.test.ts +++ b/src/platform/cloud/onboarding/onboardingCloudRoutes.test.ts @@ -1,4 +1,5 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' +import { createMemoryHistory, createRouter } from 'vue-router' import { cloudOnboardingRoutes, @@ -46,6 +47,39 @@ const resolvedComponents = await Promise.all( ) describe('cloudOnboardingRoutes', () => { + it('redirects the legacy login path to Cloud login with its query', async () => { + const legacyLoginRoute = cloudOnboardingRoutes.find( + (route) => route.path === '/login' + ) + expect(legacyLoginRoute).toBeDefined() + if (!legacyLoginRoute) return + + const router = createRouter({ + history: createMemoryHistory(), + routes: [ + legacyLoginRoute, + { + path: '/cloud/login', + name: 'cloud-login', + component: { template: '
' } + } + ] + }) + const guardedRouteNames = vi.fn() + router.beforeEach((to) => guardedRouteNames(to.name)) + + await router.push('/login?source=legacy&campaign=one&campaign=two') + + expect(guardedRouteNames).toHaveBeenCalledOnce() + expect(guardedRouteNames).toHaveBeenCalledWith('cloud-login') + expect(router.currentRoute.value.name).toBe('cloud-login') + expect(router.currentRoute.value.path).toBe('/cloud/login') + expect(router.currentRoute.value.query).toEqual({ + source: 'legacy', + campaign: ['one', 'two'] + }) + }) + it('consent route is not a child of the /cloud layout', () => { const cloudLayout = cloudOnboardingRoutes.find((r) => r.path === '/cloud') const childPaths = (cloudLayout?.children ?? []).map((c) => c.path) diff --git a/src/platform/cloud/onboarding/onboardingCloudRoutes.ts b/src/platform/cloud/onboarding/onboardingCloudRoutes.ts index dbee2617a80..fcc148efd0e 100644 --- a/src/platform/cloud/onboarding/onboardingCloudRoutes.ts +++ b/src/platform/cloud/onboarding/onboardingCloudRoutes.ts @@ -41,6 +41,10 @@ export async function oauthConsentRedirect() { } export const cloudOnboardingRoutes: RouteRecordRaw[] = [ + { + path: '/login', + redirect: (to) => ({ name: 'cloud-login', query: to.query }) + }, { path: '/cloud', component: () => From 0715d380f0d60dddb1b5d31a5181a73162a522da Mon Sep 17 00:00:00 2001 From: dante01yoon Date: Tue, 11 Aug 2026 02:10:34 +0000 Subject: [PATCH 2/4] test: use production cloud login route Amp-Thread-ID: https://ampcode.com/threads/T-019fee3a-1afc-7464-a79f-2017006f4ffd Co-authored-by: Amp --- .../onboarding/onboardingCloudRoutes.test.ts | 22 +++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/src/platform/cloud/onboarding/onboardingCloudRoutes.test.ts b/src/platform/cloud/onboarding/onboardingCloudRoutes.test.ts index 19c16db26c5..03561434dad 100644 --- a/src/platform/cloud/onboarding/onboardingCloudRoutes.test.ts +++ b/src/platform/cloud/onboarding/onboardingCloudRoutes.test.ts @@ -51,17 +51,31 @@ describe('cloudOnboardingRoutes', () => { const legacyLoginRoute = cloudOnboardingRoutes.find( (route) => route.path === '/login' ) + const cloudLayoutRoute = cloudOnboardingRoutes.find( + (route) => route.path === '/cloud' + ) + const cloudLoginRoute = cloudLayoutRoute?.children?.find( + (route) => route.name === 'cloud-login' + ) expect(legacyLoginRoute).toBeDefined() - if (!legacyLoginRoute) return + expect(cloudLayoutRoute).toBeDefined() + expect(cloudLoginRoute).toBeDefined() + if (!legacyLoginRoute || !cloudLayoutRoute || !cloudLoginRoute) return const router = createRouter({ history: createMemoryHistory(), routes: [ legacyLoginRoute, { - path: '/cloud/login', - name: 'cloud-login', - component: { template: '
' } + ...cloudLayoutRoute, + component: { template: '
' }, + children: [ + { + ...cloudLoginRoute, + component: { template: '
' }, + beforeEnter: undefined + } + ] } ] }) From cc246963ed64c53f667517b60dcc5382b4a796e8 Mon Sep 17 00:00:00 2001 From: dante01yoon Date: Tue, 11 Aug 2026 14:04:09 +0000 Subject: [PATCH 3/4] test: narrow production route records Amp-Thread-ID: https://ampcode.com/threads/T-019fee3a-1afc-7464-a79f-2017006f4ffd Co-authored-by: Amp --- .../onboarding/onboardingCloudRoutes.test.ts | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/platform/cloud/onboarding/onboardingCloudRoutes.test.ts b/src/platform/cloud/onboarding/onboardingCloudRoutes.test.ts index 03561434dad..2c1530f509d 100644 --- a/src/platform/cloud/onboarding/onboardingCloudRoutes.test.ts +++ b/src/platform/cloud/onboarding/onboardingCloudRoutes.test.ts @@ -1,4 +1,8 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' +import type { + RouteRecordSingleView, + RouteRecordSingleViewWithChildren +} from 'vue-router' import { createMemoryHistory, createRouter } from 'vue-router' import { @@ -52,10 +56,18 @@ describe('cloudOnboardingRoutes', () => { (route) => route.path === '/login' ) const cloudLayoutRoute = cloudOnboardingRoutes.find( - (route) => route.path === '/cloud' + (route): route is RouteRecordSingleViewWithChildren => + route.path === '/cloud' && + 'component' in route && + 'children' in route && + !('components' in route) ) const cloudLoginRoute = cloudLayoutRoute?.children?.find( - (route) => route.name === 'cloud-login' + (route): route is RouteRecordSingleView => + route.name === 'cloud-login' && + 'component' in route && + !('children' in route) && + !('components' in route) ) expect(legacyLoginRoute).toBeDefined() expect(cloudLayoutRoute).toBeDefined() From f82f7b885114a1e4d884755ea462205caf40102e Mon Sep 17 00:00:00 2001 From: dante01yoon Date: Tue, 11 Aug 2026 15:31:04 +0000 Subject: [PATCH 4/4] test: exercise cloud login route guard Amp-Thread-ID: https://ampcode.com/threads/T-019fee3a-1afc-7464-a79f-2017006f4ffd Co-authored-by: Amp --- .../cloud/onboarding/onboardingCloudRoutes.test.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/platform/cloud/onboarding/onboardingCloudRoutes.test.ts b/src/platform/cloud/onboarding/onboardingCloudRoutes.test.ts index 2c1530f509d..5081ec4ed5e 100644 --- a/src/platform/cloud/onboarding/onboardingCloudRoutes.test.ts +++ b/src/platform/cloud/onboarding/onboardingCloudRoutes.test.ts @@ -17,11 +17,14 @@ import { const VALID_REQUEST_ID = '550e8400-e29b-41d4-a716-446655440000' const createSessionOrThrow = vi.fn().mockResolvedValue(undefined) +const useCurrentUser = vi.fn(() => ({ isLoggedIn: { value: false } })) vi.mock('@/platform/auth/session/useSessionCookie', () => ({ useSessionCookie: () => ({ createSessionOrThrow }) })) +vi.mock('@/composables/auth/useCurrentUser', () => ({ useCurrentUser })) + const oauthLayout = cloudOnboardingRoutes.find((r) => r.path === '/oauth') const consentRoute = oauthLayout?.children?.find( (c) => c.name === 'cloud-oauth-consent' @@ -84,8 +87,7 @@ describe('cloudOnboardingRoutes', () => { children: [ { ...cloudLoginRoute, - component: { template: '
' }, - beforeEnter: undefined + component: { template: '
' } } ] } @@ -98,6 +100,7 @@ describe('cloudOnboardingRoutes', () => { expect(guardedRouteNames).toHaveBeenCalledOnce() expect(guardedRouteNames).toHaveBeenCalledWith('cloud-login') + expect(useCurrentUser).toHaveBeenCalledOnce() expect(router.currentRoute.value.name).toBe('cloud-login') expect(router.currentRoute.value.path).toBe('/cloud/login') expect(router.currentRoute.value.query).toEqual({