diff --git a/src/platform/auth/sso/SsoRequiredDialogContent.test.ts b/src/platform/auth/sso/SsoRequiredDialogContent.test.ts
index 58578a93054..dc12dc13aca 100644
--- a/src/platform/auth/sso/SsoRequiredDialogContent.test.ts
+++ b/src/platform/auth/sso/SsoRequiredDialogContent.test.ts
@@ -12,15 +12,19 @@ import { useAuthStore } from '@/stores/authStore'
vi.mock(import('firebase/auth'))
-async function renderDialog(props: {
- email?: string
- returnTo?: string
- organizationId?: string
-}) {
+async function renderDialog(
+ props: {
+ email?: string
+ returnTo?: string
+ organizationId?: string
+ },
+ at = '/workflows?id=7'
+) {
const router = createRouter({
history: createMemoryHistory(),
routes: [
{ path: '/workflows', component: { template: '
' } },
+ { path: '/oauth/consent', component: { template: '' } },
{
path: '/cloud/login',
name: 'cloud-login',
@@ -28,7 +32,7 @@ async function renderDialog(props: {
}
]
})
- await router.push('/workflows?id=7')
+ await router.push(at)
return render(SsoRequiredDialogContent, {
props,
global: {
@@ -102,6 +106,22 @@ describe('SsoRequiredDialogContent', () => {
)
})
+ it('returns from the consent page to the consent path the server serves', async () => {
+ await renderDialog(
+ { email: 'ada@acme.com' },
+ '/oauth/consent?oauth_request_id=req-1'
+ )
+
+ await userEvent.click(
+ screen.getByRole('button', { name: 'auth.sso.continueWithSso' })
+ )
+
+ await waitFor(() => expect(assign).toHaveBeenCalledOnce())
+ expect(assigned(assign).searchParams.get('return_to')).toBe(
+ '/cloud/oauth/consent?oauth_request_id=req-1'
+ )
+ })
+
it('lets the person retry when signing the account out fails', async () => {
useAuthStore().currentUser = fromPartial({ email: 'ada@acme.com' })
vi.mocked(useAuthStore().logout)
diff --git a/src/platform/auth/sso/SsoRequiredDialogContent.vue b/src/platform/auth/sso/SsoRequiredDialogContent.vue
index 783bf782ee4..670d0d2e265 100644
--- a/src/platform/auth/sso/SsoRequiredDialogContent.vue
+++ b/src/platform/auth/sso/SsoRequiredDialogContent.vue
@@ -51,6 +51,7 @@ import { ssoStartUrl } from '@comfyorg/account-core/sso'
import Button from '@/components/ui/button/Button.vue'
import { useErrorHandling } from '@/composables/useErrorHandling'
import { SSO_REQUIRED_DIALOG_KEY } from '@/platform/auth/sso/ssoRequiredDialogKey'
+import { toSsoReturnPath } from '@/platform/auth/sso/ssoReturnPath'
import { SSO_ENTRY_OPEN_QUERY } from '@/platform/cloud/onboarding/sso/ssoEntryQuery'
import { useAuthStore } from '@/stores/authStore'
import { useDialogStore } from '@/stores/dialogStore'
@@ -75,7 +76,7 @@ function dismiss() {
function destination(): string {
const back = {
- returnTo: returnTo ?? router.currentRoute.value.fullPath,
+ returnTo: toSsoReturnPath(returnTo ?? router.currentRoute.value.fullPath),
origin: window.location.origin
}
if (organizationId) {
diff --git a/src/platform/auth/sso/ssoReturnPath.ts b/src/platform/auth/sso/ssoReturnPath.ts
new file mode 100644
index 00000000000..e7435af334a
--- /dev/null
+++ b/src/platform/auth/sso/ssoReturnPath.ts
@@ -0,0 +1,13 @@
+const SPA_ONLY_CONSENT_PATH = '/oauth/consent'
+const SERVED_CONSENT_PATH = '/cloud/oauth/consent'
+
+/**
+ * The path SSO's callback can land on with a full page load. The server
+ * serves the consent page only at `/cloud/oauth/consent`, which the SPA then
+ * redirects; a direct `/oauth/consent` load gets a 404.
+ */
+export function toSsoReturnPath(fullPath: string): string {
+ const url = new URL(fullPath, 'http://sso.invalid')
+ if (url.pathname !== SPA_ONLY_CONSENT_PATH) return fullPath
+ return `${SERVED_CONSENT_PATH}${url.search}${url.hash}`
+}
diff --git a/src/platform/cloud/onboarding/CloudLoginView.test.ts b/src/platform/cloud/onboarding/CloudLoginView.test.ts
index 425ceccb1dd..0ef4f797d18 100644
--- a/src/platform/cloud/onboarding/CloudLoginView.test.ts
+++ b/src/platform/cloud/onboarding/CloudLoginView.test.ts
@@ -93,6 +93,10 @@ async function renderLoginView(
path: '/oauth/consent',
name: 'cloud-oauth-consent',
component: { template: '' }
+ },
+ {
+ path: '/cloud/oauth/consent',
+ redirect: (to) => ({ path: '/oauth/consent', query: to.query })
}
]
})
@@ -361,7 +365,7 @@ describe('CloudLoginView SSO', () => {
await waitFor(() => expect(assign).toHaveBeenCalledOnce())
expect(startParams(assign).returnTo).toBe(
- `/oauth/consent?oauth_request_id=${OAUTH_REQUEST_ID}`
+ `/cloud/oauth/consent?oauth_request_id=${OAUTH_REQUEST_ID}`
)
})
@@ -374,7 +378,7 @@ describe('CloudLoginView SSO', () => {
await waitFor(() => expect(assign).toHaveBeenCalledOnce())
expect(startParams(assign).returnTo).toBe(
- `/oauth/consent?oauth_request_id=${OAUTH_REQUEST_ID}`
+ `/cloud/oauth/consent?oauth_request_id=${OAUTH_REQUEST_ID}`
)
})
@@ -577,7 +581,7 @@ describe('CloudLoginView Firebase sign-in refused for SSO', () => {
{
name: 'returns SSO to a pending OAuth consent before the previous page',
url: `/cloud/login?previousFullPath=%2Fworkflows&oauth_request_id=${OAUTH_REQUEST_ID}`,
- returnTo: `/oauth/consent?oauth_request_id=${OAUTH_REQUEST_ID}`
+ returnTo: `/cloud/oauth/consent?oauth_request_id=${OAUTH_REQUEST_ID}`
}
])('with the flag on, $name', async ({ url, returnTo }) => {
const flags = vi.mocked(useFeatureFlags().flags)
diff --git a/src/platform/cloud/onboarding/composables/useSsoSignIn.ts b/src/platform/cloud/onboarding/composables/useSsoSignIn.ts
index 1a9c861d94b..7dd53203350 100644
--- a/src/platform/cloud/onboarding/composables/useSsoSignIn.ts
+++ b/src/platform/cloud/onboarding/composables/useSsoSignIn.ts
@@ -5,6 +5,8 @@ import { useRoute, useRouter } from 'vue-router'
import { discoverSso, ssoStartUrl } from '@comfyorg/account-core/sso'
+import { toSsoReturnPath } from '@/platform/auth/sso/ssoReturnPath'
+
import {
captureOAuthRequestId,
getOAuthRequestId
@@ -34,10 +36,12 @@ export function resolveSsoReturnTo(
const oauthRequestId =
captureOAuthRequestId(route.query) ?? getOAuthRequestId()
if (oauthRequestId) {
- return router.resolve({
- name: 'cloud-oauth-consent',
- query: { oauth_request_id: oauthRequestId }
- }).href
+ return toSsoReturnPath(
+ router.resolve({
+ name: 'cloud-oauth-consent',
+ query: { oauth_request_id: oauthRequestId }
+ }).href
+ )
}
return getSafePreviousFullPath(route.query) ?? SSO_DEFAULT_RETURN_TO
}
diff --git a/src/platform/cloud/onboarding/onboardingCloudRoutes.ts b/src/platform/cloud/onboarding/onboardingCloudRoutes.ts
index 1930314ac1c..57dbc2bfab8 100644
--- a/src/platform/cloud/onboarding/onboardingCloudRoutes.ts
+++ b/src/platform/cloud/onboarding/onboardingCloudRoutes.ts
@@ -152,7 +152,8 @@ export const cloudOnboardingRoutes: RouteRecordRaw[] = [
// the old consent path with `?oauth_request_id=...`; the route moved to
// `/oauth/consent`. Redirect the old path (query preserved) so the browser
// authorize flow works before the backend `frontendConsentPath` is updated.
- // Remove once BE-4146 lands the backend path change.
+ // SSO's returnTo lands here too, since the server only serves this path as
+ // a page. Remove once BE-4146 serves `/oauth/consent`.
path: '/cloud/oauth/consent',
redirect: (to) => ({ path: '/oauth/consent', query: to.query })
},