From 0aec72aed2b0ac1f251d816e8e7e0cc7d395c863 Mon Sep 17 00:00:00 2001 From: Ian Littman Date: Thu, 6 Nov 2025 17:38:11 -0600 Subject: [PATCH] Bring back SSO routes in a way that doesn't break other integration sub-routes, always show EUA SSO settings (#35321) More fixes for #34525. Found another bug while clicking around, which I'll file as an unreleased. # Checklist for submitter ## Testing - [x] QA'd all new/changed functionality manually --- frontend/pages/admin/IntegrationsPage/IntegrationsPage.tsx | 6 +++++- .../components/EndUserAuthSection/EndUserAuthSection.tsx | 4 ---- frontend/router/index.tsx | 4 ++++ 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/frontend/pages/admin/IntegrationsPage/IntegrationsPage.tsx b/frontend/pages/admin/IntegrationsPage/IntegrationsPage.tsx index bc757eec74..942ebb4996 100644 --- a/frontend/pages/admin/IntegrationsPage/IntegrationsPage.tsx +++ b/frontend/pages/admin/IntegrationsPage/IntegrationsPage.tsx @@ -33,7 +33,11 @@ const IntegrationsPage = ({ const { renderFlash } = useContext(NotificationContext); const { isPremiumTier } = useContext(AppContext); - const { section, subsection } = params; + let { section } = params; + const { subsection } = params; + if (!section && !!subsection) { + section = "sso"; + } const [isUpdatingSettings, setIsUpdatingSettings] = useState(false); // // // settings that live under the integrations page diff --git a/frontend/pages/admin/IntegrationsPage/cards/IdentityProviders/components/EndUserAuthSection/EndUserAuthSection.tsx b/frontend/pages/admin/IntegrationsPage/cards/IdentityProviders/components/EndUserAuthSection/EndUserAuthSection.tsx index 65c8012df2..601b39e923 100644 --- a/frontend/pages/admin/IntegrationsPage/cards/IdentityProviders/components/EndUserAuthSection/EndUserAuthSection.tsx +++ b/frontend/pages/admin/IntegrationsPage/cards/IdentityProviders/components/EndUserAuthSection/EndUserAuthSection.tsx @@ -202,10 +202,6 @@ const EndUserAuthSection = ({ ); }; - if (!config?.mdm.apple_bm_enabled_and_configured) { - return null; - } - return
{renderContent()}
; }; diff --git a/frontend/router/index.tsx b/frontend/router/index.tsx index 2ddd5aee4a..176493d95b 100644 --- a/frontend/router/index.tsx +++ b/frontend/router/index.tsx @@ -202,6 +202,10 @@ const routes = ( path="integrations/:section" component={AdminIntegrationsPage} /> +