From 8fc111cb0aec02cb33fddf8e138b92c3f6fb3d4b Mon Sep 17 00:00:00 2001 From: andrewwallacespeckle <139135120+andrewwallacespeckle@users.noreply.github.com> Date: Thu, 28 Nov 2024 09:45:37 +0000 Subject: [PATCH] fix(fe2): Small sso bugfuxes (#3571) * Small bugfuxes * Await loading --- packages/frontend-2/middleware/requireSsoEnabled.ts | 4 +++- .../frontend-2/pages/workspaces/[slug]/sso/session-error.vue | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/frontend-2/middleware/requireSsoEnabled.ts b/packages/frontend-2/middleware/requireSsoEnabled.ts index 99560cb14..fc73c79f4 100644 --- a/packages/frontend-2/middleware/requireSsoEnabled.ts +++ b/packages/frontend-2/middleware/requireSsoEnabled.ts @@ -1,3 +1,4 @@ +import { until } from '@vueuse/core' import { workspaceRoute } from '~/lib/common/helpers/route' import { useWorkspacePublicSsoCheck } from '~/lib/workspaces/composables/sso' @@ -17,7 +18,8 @@ export default defineNuxtRouteMiddleware(async (to) => { const { workspace, loading } = useWorkspacePublicSsoCheck(workspaceSlug) - if (loading.value) return + // Wait for loading to complete + await until(loading).toBe(false) if (!workspace.value?.ssoProviderName) { return navigateTo(workspaceRoute(workspaceSlug.value)) diff --git a/packages/frontend-2/pages/workspaces/[slug]/sso/session-error.vue b/packages/frontend-2/pages/workspaces/[slug]/sso/session-error.vue index ad92edd5d..126a69a10 100644 --- a/packages/frontend-2/pages/workspaces/[slug]/sso/session-error.vue +++ b/packages/frontend-2/pages/workspaces/[slug]/sso/session-error.vue @@ -10,7 +10,9 @@ :default-logo-index="workspace.defaultLogoIndex" size="xl" /> -

SSO is required for {{ workspace?.name }}

+

+ SSO is required for {{ workspace?.name }} +