chahinebrini 87d6395ed2 fix(magic-mac): macOS 26 profile install via NSWorkspace + de-dup register card
Zwei Bugs:

1) 'profiles install -path' wurde mit macOS 15+ entfernt
   ('profiles tool no longer supports installs. Use System Settings
   Profiles to add configuration profiles.'). Auf macOS 26 (Tahoe)
   ist das Hard-Removal.
   -> Switch zu NSWorkspace.shared.open(profileURL): \u00f6ffnet die
   .mobileconfig in System Settings -> Profile-Pane. User best\u00e4tigt
   manuell + gibt Admin-PW. Einziger Weg ohne MDM-Enrollment.
   -> success-Text passt: 'Bitte in System Settings Installieren
   klicken'.

2) Doppelte 'Mac registriert'-Karte: successMessage-Card UND
   strukturierte Registration-Status-Card beide sichtbar nach
   register. Auto-Profile-Install nach Register war eh totes
   Verhalten (DNS jetzt optional).
   -> successMessage wird nicht mehr in handleRegistration gesetzt,
   nur noch in handleProfileInstall. Eine Karte.
2026-06-03 10:29:30 +02:00

250 lines
8.7 KiB
Swift

import SwiftUI
struct MacRegistrationView: View {
@Environment(WizardModel.self) private var model
@State private var macInfo: MacDeviceInfo?
@State private var isRegistering = false
@State private var isInstallingProfile = false
@State private var errorMessage: String?
@State private var successMessage: String?
@State private var profileInstalled = false
@State private var checkingProfile = false
var body: some View {
VStack(spacing: 24) {
Image(systemName: "desktopcomputer.and.arrow.down")
.font(.system(size: 80))
.foregroundStyle(.blue)
Text("Mac für ReBreak Magic registrieren")
.font(.title)
.bold()
Text("ReBreak Magic richtet dein iPhone/iPad ein: Supervised-Mode, MDM-Enrollment und automatische Installation der ReBreak-App. Dieser Mac dient als Setup-Brücke.")
.multilineTextAlignment(.center)
.foregroundStyle(.secondary)
.padding(.horizontal, 40)
Text("Optional: Du kannst diesen Mac zusätzlich selbst mit dem DNS-Filter schützen.")
.font(.caption)
.multilineTextAlignment(.center)
.foregroundStyle(.secondary)
.padding(.horizontal, 40)
if let info = macInfo {
macInfoCard(info)
} else {
ProgressView("Lese Mac-Informationen...")
.progressViewStyle(.circular)
}
if let error = errorMessage {
errorCard(error)
}
if let success = successMessage {
successCard(success)
}
if let registration = model.magicRegistration {
VStack(spacing: 12) {
HStack(spacing: 8) {
Image(systemName: profileInstalled ? "checkmark.shield.fill" : "checkmark.circle.fill")
.foregroundStyle(.green)
Text(profileInstalled ? "Mac geschützt + registriert" : "Mac registriert")
.font(.headline)
.foregroundStyle(.green)
}
VStack(alignment: .leading, spacing: 6) {
Text("✓ Device registriert: \(registration.deviceId.prefix(8))...")
if profileInstalled {
Text("✓ DNS-Filter-Profil installiert")
}
}
.font(.caption)
.foregroundStyle(.secondary)
.frame(maxWidth: .infinity, alignment: .leading)
}
.padding()
.background(Color.green.opacity(0.1))
.cornerRadius(8)
.frame(maxWidth: 400)
}
HStack(spacing: 12) {
if model.magicRegistration == nil {
Button("Mac registrieren") { handleRegistration() }
.buttonStyle(.borderedProminent)
.disabled(isRegistering || macInfo == nil || isInstallingProfile)
} else {
if !profileInstalled {
Button("DNS-Schutz installieren (optional)") { handleProfileInstall() }
.buttonStyle(.bordered)
.disabled(isInstallingProfile)
}
Button("Weiter → iPhone-Setup") { model.advance() }
.buttonStyle(.borderedProminent)
.disabled(isInstallingProfile)
}
if isRegistering || isInstallingProfile {
ProgressView()
.controlSize(.small)
}
}
}
.padding(40)
.onAppear {
loadMacInfo()
checkProfileStatus()
}
}
@ViewBuilder
private func macInfoCard(_ info: MacDeviceInfo) -> some View {
VStack(alignment: .leading, spacing: 8) {
HStack {
Image(systemName: "desktopcomputer")
.foregroundStyle(.blue)
Text(info.hostname)
.font(.headline)
}
Text("\(info.model) · macOS \(info.osVersion)")
.font(.callout)
.foregroundStyle(.secondary)
Text("Device-ID: \(info.deviceId.prefix(8))...\(info.deviceId.suffix(8))")
.font(.system(.caption, design: .monospaced))
.foregroundStyle(.tertiary)
}
.padding()
.frame(maxWidth: 400, alignment: .leading)
.background(Color.blue.opacity(0.08))
.cornerRadius(8)
}
@ViewBuilder
private func errorCard(_ error: String) -> some View {
VStack(spacing: 8) {
HStack(spacing: 8) {
Image(systemName: "exclamationmark.triangle.fill")
.foregroundStyle(.red)
Text(error)
.font(.callout)
.foregroundStyle(.red)
.multilineTextAlignment(.leading)
}
.frame(maxWidth: .infinity, alignment: .leading)
}
.padding()
.background(Color.red.opacity(0.1))
.cornerRadius(8)
.frame(maxWidth: 400)
}
@ViewBuilder
private func successCard(_ message: String) -> some View {
HStack(spacing: 8) {
Image(systemName: "checkmark.circle.fill")
.foregroundStyle(.green)
Text(message)
.font(.callout)
.foregroundStyle(.green)
}
.padding()
.background(Color.green.opacity(0.1))
.cornerRadius(8)
.frame(maxWidth: 400)
}
private func loadMacInfo() {
Task {
do {
let info = try MacDeviceDetector.detect()
await MainActor.run {
macInfo = info
}
} catch {
await MainActor.run {
errorMessage = "Mac-Info konnte nicht gelesen werden: \(error.localizedDescription)"
}
}
}
}
private func checkProfileStatus() {
Task {
checkingProfile = true
let installed = await MacProfileInstaller.isInstalled()
await MainActor.run {
profileInstalled = installed
checkingProfile = false
}
}
}
private func handleRegistration() {
Task {
isRegistering = true
errorMessage = nil
successMessage = nil
do {
try await model.registerMac()
await MainActor.run {
isRegistering = false
}
// KEIN Auto-Profile-Install mehr DNS-Schutz ist optional.
// User entscheidet selbst via Button.
} catch {
await MainActor.run {
isRegistering = false
errorMessage = error.localizedDescription
}
}
}
}
private func handleProfileInstall() {
guard let registration = model.magicRegistration else {
errorMessage = "Keine Registrierung vorhanden. Bitte zuerst registrieren."
return
}
Task {
isInstallingProfile = true
errorMessage = nil
do {
try await MacProfileInstaller.downloadAndInstall(registration: registration)
await MainActor.run {
isInstallingProfile = false
successMessage = "System Settings → Profile geöffnet. Bitte dort „Installieren" klicken und Admin-Passwort eingeben."
}
// Re-check profile status nach kurzer Wartezeit (User muss in UI bestätigen)
try? await Task.sleep(nanoseconds: 3_000_000_000)
await checkProfileStatus()
} catch {
await MainActor.run {
isInstallingProfile = false
errorMessage = "Profil-Installation fehlgeschlagen: \(error.localizedDescription)"
}
}
}
}
}
#Preview {
MacRegistrationView()
.environment(WizardModel())
.frame(width: 720, height: 600)
}