Neu:
- Geraete-Offboarding: Geraete ueber Intune, Autopilot und Entra ID
entfernen. Suche + ID-Aufloesung (via $batch), Recovery-Keys
(BitLocker/FileVault/LAPS) vor dem Loeschen, Bestaetigungs-Dialog mit
Dienst-Auswahl + 403/Multi-Admin-Approval-Handling, im Read-Only gesperrt.
Neues Modul src/Offboard.ps1, Endpoints /api/offboard/{search,keys,execute}.
Portiert aus Device Offboarding Manager (Ugur Koc, MIT).
- Offboarding-Berechtigungen dokumentiert; Setup-Skript -IncludeOffboarding.
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
+173
-1
@@ -4621,6 +4621,7 @@ function switchMainView(view) {
|
||||
const reportView = document.getElementById('appReportView');
|
||||
const devView = document.getElementById('devView');
|
||||
const polView = document.getElementById('policiesView');
|
||||
const offView = document.getElementById('offView');
|
||||
document.querySelectorAll('#topbarNav .nav-tab').forEach(t => {
|
||||
t.classList.toggle('active', t.dataset.view === view);
|
||||
t.setAttribute('aria-selected', t.dataset.view === view ? 'true' : 'false');
|
||||
@@ -4630,12 +4631,13 @@ function switchMainView(view) {
|
||||
reportView.classList.toggle('hidden', view !== 'report');
|
||||
devView .classList.toggle('hidden', view !== 'devices');
|
||||
polView .classList.toggle('hidden', view !== 'policies');
|
||||
if (offView) offView.classList.toggle('hidden', view !== 'offboard');
|
||||
}
|
||||
|
||||
document.querySelectorAll('#topbarNav .nav-tab').forEach(btn => {
|
||||
btn.addEventListener('click', () => {
|
||||
const view = btn.dataset.view;
|
||||
if ((view === 'groups' || view === 'report' || view === 'devices' || view === 'policies') && !State.connected) {
|
||||
if ((view === 'groups' || view === 'report' || view === 'devices' || view === 'policies' || view === 'offboard') && !State.connected) {
|
||||
toast('Bitte zuerst verbinden.', 'warn');
|
||||
return;
|
||||
}
|
||||
@@ -4644,6 +4646,7 @@ document.querySelectorAll('#topbarNav .nav-tab').forEach(btn => {
|
||||
if (view === 'report' && ReportState.items.length === 0) loadAppReport();
|
||||
if (view === 'devices') { devLoadAll(); setTimeout(() => document.getElementById('devSearch').focus(), 80); }
|
||||
if (view === 'policies' && PolState.items.length === 0) loadPolicies();
|
||||
if (view === 'offboard') setTimeout(() => document.getElementById('offSearch').focus(), 80);
|
||||
});
|
||||
});
|
||||
|
||||
@@ -6215,3 +6218,172 @@ document.querySelectorAll('#polTable th.sortable').forEach(th => {
|
||||
renderPolicies();
|
||||
});
|
||||
});
|
||||
|
||||
// =============================================================
|
||||
// OFFBOARDING: Geräte aus Intune / Autopilot / Entra entfernen
|
||||
// =============================================================
|
||||
const OffState = { items: [], selected: new Set() };
|
||||
function offKey(d) { return d.intuneDeviceId; }
|
||||
function offSelectedDevices() { return OffState.items.filter(d => OffState.selected.has(offKey(d))); }
|
||||
|
||||
async function offSearch() {
|
||||
const q = document.getElementById('offSearch').value.trim();
|
||||
const type = document.getElementById('offSearchType').value;
|
||||
if (q.length < 2) { toast('Mindestens 2 Zeichen.', 'warn'); return; }
|
||||
const body = document.getElementById('offBody');
|
||||
body.innerHTML = `<tr><td colspan="7" class="pol-hint"><span class="spinner" style="width:14px;height:14px;border-width:2px;"></span> Suche…</td></tr>`;
|
||||
try {
|
||||
const res = await api(`/api/offboard/search?query=${encodeURIComponent(q)}&type=${type}`, { timeoutMs: 60000 });
|
||||
OffState.items = res.items || [];
|
||||
OffState.selected = new Set();
|
||||
renderOff();
|
||||
} catch (e) {
|
||||
toast('Suche fehlgeschlagen: ' + e.message, 'err');
|
||||
body.innerHTML = `<tr><td colspan="7" class="pol-empty">Fehler bei der Suche.</td></tr>`;
|
||||
}
|
||||
}
|
||||
|
||||
function offSvcBadges(d) {
|
||||
const b = [];
|
||||
if (d.inIntune) b.push('<span class="off-badge">Intune</span>');
|
||||
if (d.inEntra) b.push('<span class="off-badge">Entra</span>');
|
||||
if (d.inAutopilot) b.push('<span class="off-badge">Autopilot</span>');
|
||||
if (d.coManaged) b.push('<span class="off-badge warn">Co-Mgmt</span>');
|
||||
return b.join(' ') || '—';
|
||||
}
|
||||
|
||||
function renderOff() {
|
||||
const body = document.getElementById('offBody');
|
||||
if (!OffState.items.length) {
|
||||
body.innerHTML = `<tr><td colspan="7" class="pol-empty">Keine Geräte gefunden.</td></tr>`;
|
||||
offUpdateSel();
|
||||
return;
|
||||
}
|
||||
body.innerHTML = OffState.items.map(d => {
|
||||
const k = offKey(d);
|
||||
const checked = OffState.selected.has(k) ? 'checked' : '';
|
||||
return `<tr data-key="${escapeHtml(k)}">
|
||||
<td><input type="checkbox" class="off-row-check" data-key="${escapeHtml(k)}" ${checked}></td>
|
||||
<td>${escapeHtml(d.deviceName || '—')}</td>
|
||||
<td>${escapeHtml(d.serialNumber || '—')}</td>
|
||||
<td>${escapeHtml(((d.operatingSystem || '') + ' ' + (d.osVersion || '')).trim() || '—')}</td>
|
||||
<td>${escapeHtml(d.primaryUser || '—')}</td>
|
||||
<td>${polFmtDate(d.lastSync)}</td>
|
||||
<td>${offSvcBadges(d)}</td>
|
||||
</tr>`;
|
||||
}).join('');
|
||||
body.querySelectorAll('.off-row-check').forEach(cb => {
|
||||
cb.addEventListener('change', () => {
|
||||
if (cb.checked) OffState.selected.add(cb.dataset.key); else OffState.selected.delete(cb.dataset.key);
|
||||
offUpdateSel();
|
||||
});
|
||||
});
|
||||
body.querySelectorAll('tr[data-key]').forEach(tr => {
|
||||
tr.addEventListener('click', e => {
|
||||
if (e.target.classList.contains('off-row-check')) return;
|
||||
const cb = tr.querySelector('.off-row-check');
|
||||
cb.checked = !cb.checked;
|
||||
cb.dispatchEvent(new Event('change'));
|
||||
});
|
||||
});
|
||||
offUpdateSel();
|
||||
}
|
||||
|
||||
function offUpdateSel() {
|
||||
const n = OffState.selected.size;
|
||||
document.getElementById('offSelCount').textContent = `${n} ausgewählt`;
|
||||
document.getElementById('offBtn').disabled = n === 0;
|
||||
}
|
||||
|
||||
function openOffboardModal() {
|
||||
const devs = offSelectedDevices();
|
||||
if (!devs.length) return;
|
||||
document.getElementById('offConfirmList').innerHTML = devs.map(d => `
|
||||
<div class="off-confirm-row"><b>${escapeHtml(d.deviceName || '—')}</b>
|
||||
— Intune: ${d.intuneDeviceId ? '✓' : '–'}, Entra: ${d.entraObjectId ? '✓' : '–'}, Autopilot: ${d.autopilotId ? '✓' : '–'}</div>
|
||||
`).join('');
|
||||
document.getElementById('offModalInfo').textContent = `${devs.length} Gerät(e)`;
|
||||
document.getElementById('offConfirmChk').checked = false;
|
||||
document.getElementById('offExecuteBtn').disabled = true;
|
||||
document.getElementById('offResults').innerHTML = '';
|
||||
document.getElementById('offKeys').innerHTML = '<div class="lbl">Recovery-Keys</div><div class="muted">Wird geladen…</div>';
|
||||
openModal('modalOffboard');
|
||||
offLoadKeys(devs);
|
||||
}
|
||||
|
||||
async function offLoadKeys(devs) {
|
||||
const box = document.getElementById('offKeys');
|
||||
const parts = [];
|
||||
for (const d of devs) {
|
||||
try {
|
||||
const res = await api('/api/offboard/keys', {
|
||||
method: 'POST',
|
||||
body: { intuneDeviceId: d.intuneDeviceId, azureADDeviceId: d.azureADDeviceId, operatingSystem: d.operatingSystem },
|
||||
timeoutMs: 60000,
|
||||
});
|
||||
const k = res.keys || {};
|
||||
let html = `<div class="off-key-dev"><b>${escapeHtml(d.deviceName || '—')}</b>`;
|
||||
(k.bitlocker || []).forEach(b => { html += `<div class="off-key">BitLocker${b.volumeType ? ' (' + escapeHtml(b.volumeType) + ')' : ''}: <code>${escapeHtml(b.key)}</code></div>`; });
|
||||
if (k.fileVault) html += `<div class="off-key">FileVault: <code>${escapeHtml(k.fileVault)}</code></div>`;
|
||||
if (k.laps) html += `<div class="off-key">LAPS${k.laps.account ? ' (' + escapeHtml(k.laps.account) + ')' : ''}: <code>${escapeHtml(k.laps.password)}</code></div>`;
|
||||
if (k.notes && k.notes.length) html += `<div class="muted">${k.notes.map(escapeHtml).join(' · ')}</div>`;
|
||||
html += '</div>';
|
||||
parts.push(html);
|
||||
} catch (e) {
|
||||
parts.push(`<div class="off-key-dev"><b>${escapeHtml(d.deviceName || '—')}</b> <span class="muted">Keys-Fehler: ${escapeHtml(e.message)}</span></div>`);
|
||||
}
|
||||
}
|
||||
box.innerHTML = `<div class="lbl">🔑 Recovery-Keys — vor dem Löschen sichern!</div>${parts.join('')}`;
|
||||
}
|
||||
|
||||
async function offExecute() {
|
||||
const devs = offSelectedDevices();
|
||||
if (!devs.length) return;
|
||||
const services = {
|
||||
entra: document.querySelector('input[name="offEntra"]:checked').value,
|
||||
intune: document.getElementById('offSvcIntune').checked,
|
||||
autopilot: document.getElementById('offSvcAutopilot').checked,
|
||||
};
|
||||
if (services.entra === 'none' && !services.intune && !services.autopilot) {
|
||||
toast('Keinen Dienst ausgewählt.', 'warn');
|
||||
return;
|
||||
}
|
||||
const payload = devs.map(d => ({
|
||||
deviceName: d.deviceName, intuneDeviceId: d.intuneDeviceId,
|
||||
entraObjectId: d.entraObjectId, autopilotId: d.autopilotId,
|
||||
}));
|
||||
document.getElementById('offExecuteBtn').disabled = true;
|
||||
setLoading('Offboarding läuft…');
|
||||
try {
|
||||
const res = await api('/api/offboard/execute', { method: 'POST', body: { devices: payload, services }, timeoutMs: 180000 });
|
||||
const results = res.results || [];
|
||||
document.getElementById('offResults').innerHTML =
|
||||
`<div class="lbl">Ergebnis (${res.successCount}/${res.total})</div>` +
|
||||
results.map(r => `<div class="off-result ${r.success ? 'ok' : 'fail'}">${r.success ? '✓' : '✗'} ${escapeHtml(r.deviceName)} — ${escapeHtml(r.service)} ${escapeHtml(r.action)}${r.error ? ': ' + escapeHtml(r.error) : ''}</div>`).join('');
|
||||
toast(`${res.successCount}/${res.total} Aktionen erfolgreich.`, res.successCount === res.total ? 'ok' : 'warn', 'Offboarding');
|
||||
// Erfolgreich vollständig offgeboardete Geräte aus der Liste nehmen.
|
||||
const doneNames = new Set(results.filter(r => r.success).map(r => r.deviceName));
|
||||
if (doneNames.size) {
|
||||
OffState.items = OffState.items.filter(d => !doneNames.has(d.deviceName) || results.some(r => r.deviceName === d.deviceName && !r.success));
|
||||
OffState.selected = new Set();
|
||||
renderOff();
|
||||
}
|
||||
} catch (e) {
|
||||
toast('Offboarding fehlgeschlagen: ' + e.message, 'err');
|
||||
document.getElementById('offExecuteBtn').disabled = false;
|
||||
} finally {
|
||||
clearLoading();
|
||||
}
|
||||
}
|
||||
|
||||
document.getElementById('offSearchBtn')?.addEventListener('click', offSearch);
|
||||
document.getElementById('offSearch')?.addEventListener('keydown', e => { if (e.key === 'Enter') offSearch(); });
|
||||
document.getElementById('offCheckAll')?.addEventListener('change', e => {
|
||||
OffState.items.forEach(d => { const k = offKey(d); if (e.target.checked) OffState.selected.add(k); else OffState.selected.delete(k); });
|
||||
renderOff();
|
||||
});
|
||||
document.getElementById('offBtn')?.addEventListener('click', openOffboardModal);
|
||||
document.getElementById('offConfirmChk')?.addEventListener('change', e => {
|
||||
document.getElementById('offExecuteBtn').disabled = !e.target.checked;
|
||||
});
|
||||
document.getElementById('offExecuteBtn')?.addEventListener('click', offExecute);
|
||||
|
||||
+104
@@ -37,6 +37,7 @@
|
||||
<button class="nav-tab" data-view="report" aria-selected="false">App Report</button>
|
||||
<button class="nav-tab" data-view="devices" aria-selected="false">Geräte</button>
|
||||
<button class="nav-tab" data-view="policies" aria-selected="false">Policies</button>
|
||||
<button class="nav-tab" data-view="offboard" aria-selected="false">Offboarding</button>
|
||||
</nav>
|
||||
|
||||
<div class="header-actions">
|
||||
@@ -611,6 +612,44 @@
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<!-- ======================= OFFBOARDING ======================= -->
|
||||
<section class="off-view hidden" id="offView">
|
||||
<div class="off-bar">
|
||||
<select id="offSearchType" class="input" style="height:34px;max-width:170px;">
|
||||
<option value="name">Gerätename</option>
|
||||
<option value="serial">Seriennummer</option>
|
||||
</select>
|
||||
<input id="offSearch" class="input" placeholder="Suchen… (Enter)" style="max-width:320px;height:34px;">
|
||||
<button class="btn btn-secondary btn-sm" id="offSearchBtn">Suchen</button>
|
||||
<span class="off-bar-spacer" style="flex:1;"></span>
|
||||
<span id="offSelCount" class="muted">0 ausgewählt</span>
|
||||
<button class="btn btn-danger btn-sm" id="offBtn" disabled>Offboarding…</button>
|
||||
</div>
|
||||
<div class="off-note muted">
|
||||
Entfernt Geräte aus <b>Intune</b>, <b>Autopilot</b> und <b>Entra ID</b>. BitLocker-/FileVault-Keys und
|
||||
LAPS-Passwörter werden vor dem Löschen angezeigt. Benötigt zusätzliche Berechtigungen & Admin-Rollen
|
||||
(siehe <code>docs/App-Registration.md</code>) — im Read-Only-Modus gesperrt.
|
||||
</div>
|
||||
<div class="off-table-wrap">
|
||||
<table class="pol-table off-table" id="offTable">
|
||||
<thead>
|
||||
<tr>
|
||||
<th style="width:34px;"><input type="checkbox" id="offCheckAll"></th>
|
||||
<th>Gerät</th>
|
||||
<th>Seriennr.</th>
|
||||
<th>OS</th>
|
||||
<th>Benutzer</th>
|
||||
<th>Letzter Sync</th>
|
||||
<th>Dienste</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody id="offBody">
|
||||
<tr><td colspan="7" class="pol-hint">Nach Geräten suchen…</td></tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<!-- MODAL: Wipe -->
|
||||
<div class="modal-backdrop hidden" id="wipeModalBackdrop">
|
||||
<div class="modal" style="max-width:420px;">
|
||||
@@ -858,6 +897,43 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- MODAL: Geräte-Offboarding -->
|
||||
<div id="modalOffboard" class="modal hidden">
|
||||
<div class="modal-backdrop" data-close></div>
|
||||
<div class="modal-box modal-lg">
|
||||
<div class="modal-head">
|
||||
<h3>Geräte offboarden</h3>
|
||||
<button class="modal-close" data-close aria-label="Schließen">×</button>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<div class="off-warn">⚠ Entfernt die Geräte aus den gewählten Diensten. Löschen ist <b>nicht umkehrbar</b>. Recovery-Keys unbedingt vorher sichern.</div>
|
||||
<div id="offConfirmList" class="off-confirm-list"></div>
|
||||
|
||||
<div class="off-services">
|
||||
<div class="lbl">Dienste</div>
|
||||
<div class="off-svc-row">
|
||||
<span class="off-svc-label">Entra ID:</span>
|
||||
<label class="off-radio"><input type="radio" name="offEntra" value="none" checked> nichts tun</label>
|
||||
<label class="off-radio"><input type="radio" name="offEntra" value="disable"> deaktivieren</label>
|
||||
<label class="off-radio"><input type="radio" name="offEntra" value="delete"> löschen</label>
|
||||
</div>
|
||||
<label class="check-chip"><input type="checkbox" id="offSvcIntune" checked><span>Aus Intune löschen</span></label>
|
||||
<label class="check-chip"><input type="checkbox" id="offSvcAutopilot"><span>Aus Autopilot löschen</span></label>
|
||||
</div>
|
||||
|
||||
<div id="offKeys" class="off-keys"></div>
|
||||
|
||||
<label class="check-chip off-confirm-chip"><input type="checkbox" id="offConfirmChk"><span>Ich verstehe, dass die Geräte gelöscht/entfernt werden.</span></label>
|
||||
<div id="offResults"></div>
|
||||
</div>
|
||||
<div class="modal-foot">
|
||||
<span id="offModalInfo" class="muted" style="margin-right:auto;"></span>
|
||||
<button class="btn btn-secondary" data-close>Abbrechen</button>
|
||||
<button class="btn btn-danger" id="offExecuteBtn" disabled>Offboarding ausführen</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<style>
|
||||
/* Nutzt die Theme-Variablen der App -> passt sich Light/Dark automatisch an. */
|
||||
.pol-assign-row { border:1px solid var(--hairline); border-radius:8px; padding:12px 14px; margin-bottom:12px; overflow-wrap:anywhere; }
|
||||
@@ -886,6 +962,34 @@
|
||||
.pol-import-row:last-child { border-bottom:none; }
|
||||
.pol-import-name { flex:1; min-width:0; }
|
||||
.pol-import-row .pol-type-badge { flex:0 0 auto; }
|
||||
/* Offboarding */
|
||||
.off-view { padding:16px 20px; }
|
||||
.off-bar { display:flex; align-items:center; gap:10px; margin-bottom:10px; flex-wrap:wrap; }
|
||||
.off-note { font-size:12.5px; margin-bottom:12px; line-height:1.5; }
|
||||
.off-table-wrap { overflow-x:auto; }
|
||||
.off-table td, .off-table th { white-space:nowrap; }
|
||||
.off-badge { display:inline-block; padding:1px 7px; border-radius:10px; font-size:11px; background:var(--surface-strong); color:var(--ink); margin-right:3px; }
|
||||
.off-badge.warn { background:rgba(245,158,11,0.22); }
|
||||
.off-warn { background:rgba(239,68,68,0.14); border:1px solid rgba(239,68,68,0.35); color:var(--ink);
|
||||
border-radius:8px; padding:10px 12px; font-size:13px; margin-bottom:12px; }
|
||||
.off-confirm-list { margin-bottom:12px; }
|
||||
.off-confirm-row { font-size:13px; padding:4px 0; border-bottom:1px solid var(--hairline); overflow-wrap:anywhere; }
|
||||
.off-confirm-row:last-child { border-bottom:none; }
|
||||
.off-services { margin:12px 0; padding:12px; border:1px solid var(--hairline); border-radius:8px; }
|
||||
.off-services .lbl { display:block; font-size:12px; color:var(--body); margin-bottom:8px; }
|
||||
.off-svc-row { display:flex; align-items:center; gap:14px; flex-wrap:wrap; margin-bottom:10px; }
|
||||
.off-svc-label { font-size:13px; color:var(--ink); font-weight:600; }
|
||||
.off-radio { display:inline-flex; align-items:center; gap:5px; font-size:13px; cursor:pointer; }
|
||||
.off-keys { margin:12px 0; }
|
||||
.off-keys .lbl { display:block; font-size:12px; color:var(--pink); margin-bottom:6px; }
|
||||
.off-key-dev { border:1px solid var(--hairline); border-radius:6px; padding:8px 10px; margin-bottom:6px; font-size:12.5px; overflow-wrap:anywhere; }
|
||||
.off-key { margin-top:3px; }
|
||||
.off-key code { background:var(--surface-strong); color:var(--ink); padding:1px 5px; border-radius:4px; user-select:all; }
|
||||
.off-confirm-chip { margin-top:8px; }
|
||||
.off-result { font-size:13px; padding:3px 0; overflow-wrap:anywhere; }
|
||||
.off-result.ok { color:var(--success); }
|
||||
.off-result.fail { color:var(--error); }
|
||||
#offResults .lbl { display:block; font-size:12px; color:var(--body); margin:10px 0 4px; }
|
||||
</style>
|
||||
|
||||
<!-- MODAL: Hilfe -->
|
||||
|
||||
Reference in New Issue
Block a user