mirror of
https://github.com/fleetdm/fleet
synced 2026-05-23 08:58:41 +00:00
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
This commit is contained in:
parent
8bb68bf938
commit
0aec72aed2
3 changed files with 9 additions and 5 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -202,10 +202,6 @@ const EndUserAuthSection = ({
|
|||
);
|
||||
};
|
||||
|
||||
if (!config?.mdm.apple_bm_enabled_and_configured) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return <div className={baseClass}>{renderContent()}</div>;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -202,6 +202,10 @@ const routes = (
|
|||
path="integrations/:section"
|
||||
component={AdminIntegrationsPage}
|
||||
/>
|
||||
<Route
|
||||
path="integrations/sso/:subsection"
|
||||
component={AdminIntegrationsPage}
|
||||
/>
|
||||
<Route component={ExcludeInSandboxRoutes}>
|
||||
<Route path="users" component={AdminUserManagementPage} />
|
||||
</Route>
|
||||
|
|
|
|||
Loading…
Reference in a new issue