From 709b87b0fa36ba236ceed77fd6cabc181fa0666b Mon Sep 17 00:00:00 2001
From: andrewwallacespeckle
 <139135120+andrewwallacespeckle@users.noreply.github.com>
Date: Wed, 5 Mar 2025 15:45:33 +0000
Subject: [PATCH] Ensure no middleware for sso (#4118)

---
 packages/frontend-2/middleware/004-emailVerification.global.ts | 3 ++-
 packages/frontend-2/middleware/005-onboarding.global.ts        | 3 ++-
 packages/frontend-2/middleware/006-workspace.global.ts         | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/frontend-2/middleware/004-emailVerification.global.ts b/packages/frontend-2/middleware/004-emailVerification.global.ts
index 754cf4f5e..9a495c60c 100644
--- a/packages/frontend-2/middleware/004-emailVerification.global.ts
+++ b/packages/frontend-2/middleware/004-emailVerification.global.ts
@@ -9,7 +9,8 @@ import { convertThrowIntoFetchResult } from '~~/lib/common/helpers/graphql'
  */
 export default defineNuxtRouteMiddleware(async (to) => {
   const isAuthPage = to.path.startsWith('/authn/')
-  if (isAuthPage) return
+  const isSSOPath = to.path.includes('/sso/')
+  if (isAuthPage || isSSOPath) return
 
   const client = useApolloClientFromNuxt()
   const { data: emailData } = await client
diff --git a/packages/frontend-2/middleware/005-onboarding.global.ts b/packages/frontend-2/middleware/005-onboarding.global.ts
index 8aebd548f..578cf4813 100644
--- a/packages/frontend-2/middleware/005-onboarding.global.ts
+++ b/packages/frontend-2/middleware/005-onboarding.global.ts
@@ -9,7 +9,8 @@ import { homeRoute, onboardingRoute } from '~~/lib/common/helpers/route'
  */
 export default defineNuxtRouteMiddleware(async (to) => {
   const isAuthPage = to.path.startsWith('/authn/')
-  if (isAuthPage) return
+  const isSSOPath = to.path.includes('/sso/')
+  if (isAuthPage || isSSOPath) return
 
   const client = useApolloClientFromNuxt()
   const { data } = await client
diff --git a/packages/frontend-2/middleware/006-workspace.global.ts b/packages/frontend-2/middleware/006-workspace.global.ts
index d2a176c93..0c26c8ed4 100644
--- a/packages/frontend-2/middleware/006-workspace.global.ts
+++ b/packages/frontend-2/middleware/006-workspace.global.ts
@@ -9,7 +9,8 @@ import { workspaceCreateRoute, workspaceJoinRoute } from '~~/lib/common/helpers/
  */
 export default defineNuxtRouteMiddleware(async (to) => {
   const isAuthPage = to.path.startsWith('/authn/')
-  if (isAuthPage) return
+  const isSSOPath = to.path.includes('/sso/')
+  if (isAuthPage || isSSOPath) return
 
   const isOnboardingForced = useIsOnboardingForced()
   const isWorkspaceNewPlansEnabled = useWorkspaceNewPlansEnabled()