Skip to content

Apple MDM: require server URL confirmation before turning off #48595

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
melpike wants to merge 2 commits into
base: main
Choose a base branch
from
+22 −5
Draft

Apple MDM: require server URL confirmation before turning off #48595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d2f498
Apple MDM: require server URL confirmation before turning off
melpike Jul 1, 2026
679ce12
Restore 'modal' class in TurnOffAppleMdmModal baseClass
melpike Jul 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AppleMdmPage/AppleMdmPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ const AppleMdmPage = ({ router }: { router: InjectedRouter }) => {
)}
{showTurnOffMdmModal && (
<TurnOffAppleMdmModal
serverUrl={getMdmServerUrl(config.server_settings)}
onCancel={toggleTurnOffMdmModal}
onConfirm={turnOffMdm}
/>
Expand Down
26 changes: 21 additions & 5 deletions .../MdmSettings/AppleMdmPage/components/modals/TurnOffAppleMdmModal/TurnOffAppleMdmModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,25 @@
import React, { useCallback, useState } from "react";

import Button from "components/buttons/Button";

import InputField from "components/forms/fields/InputField";
import Modal from "components/Modal";

const baseClass = "modal turn-off-apple-mdm-modal";
const bemClass = "turn-off-apple-mdm-modal";

interface ITurnOffAppleMdmModalProps {
serverUrl: string;
onCancel: () => void;
onConfirm: () => void;
}

const TurnOffAppleMdmModal = ({
serverUrl,
onConfirm,
onCancel,
}: ITurnOffAppleMdmModalProps): JSX.Element => {
const [isDeleting, setIsDeleting] = useState(false);
const [enteredUrl, setEnteredUrl] = useState("");

const onClickConfirm = useCallback(() => {
setIsDeleting(true);
Expand All @@ -25,16 +29,28 @@ const TurnOffAppleMdmModal = ({
return (
<Modal title="Turn off MDM" onExit={onCancel} className={baseClass}>
<div className={baseClass}>
If you want to use MDM features again, you&apos;ll have to upload a new
APNs certificate and all end users will have to turn MDM off and back
on.
<p>
If you want to use MDM features again, you&apos;ll have to upload a
new APNs certificate and all end users will have to turn MDM off and
back on.
</p>
<p>
To confirm, enter your Fleet URL: <b>{serverUrl}</b>
</p>
<InputField
autofocus
inputWrapperClass={`${bemClass}__url-input`}
placeholder="https://fleet.example.com"
value={enteredUrl}
onChange={(val: string) => setEnteredUrl(val)}
/>
<div className="modal-cta-wrap">
<Button
type="button"
variant="alert"
onClick={onClickConfirm}
isLoading={isDeleting}
disabled={isDeleting}
disabled={isDeleting || enteredUrl !== serverUrl}
>
Turn off
</Button>
Expand Down
Loading