From c846345a1c5ae03a3c677303dd4f9d0c265142f7 Mon Sep 17 00:00:00 2001
From: Daniel Redetzke <dan@redetzke.aero>
Date: Mon, 5 Oct 2026 08:51:19 +0300
Subject: [PATCH] Send adminUsername in /settings again

iOS app builds before Companion 2c9cc1c cannot decode /settings without
it, and App Review still tests such builds. A test keeps it in place.
---
 api.go       | 3 +++
 main_test.go | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/api.go b/api.go
index 9d0686f..ed30478 100644
--- a/api.go
+++ b/api.go
@@ -1001,6 +1001,9 @@ func (a *App) getSettings(w http.ResponseWriter, r *http.Request) {
 		"geo":         a.geoStatus(),
 		"fingerprint": a.tls.Fingerprint(),
 		"logPath":     a.logPath,
+		// Required by iOS app builds before 2c9cc1c, which App Review
+		// still tests.
+		"adminUsername": a.username(cfg, who(r).UserID),
 	})
 }
 
diff --git a/main_test.go b/main_test.go
index 94f653c..5443b7a 100644
--- a/main_test.go
+++ b/main_test.go
@@ -350,6 +350,10 @@ func TestAPI(t *testing.T) {
 	bearer("POST", "/tokens", 403, map[string]string{"name": "more", "scope": "rw"})
 	bearer("DELETE", "/tokens/"+tok["id"].(string), 403)
 	bearer("GET", "/backup", 403)
+	// Older iOS app builds cannot decode /settings without it.
+	if call("GET", "/settings", nil, 200)["adminUsername"] != "admin" {
+		t.Fatal("/settings lacks adminUsername")
+	}
 
 	call("DELETE", "/peers/"+id, nil, 200)
 	if len(store.Get().Peers) != 0 {