Commit `42a9918acf`

42a9918acf2b0949061115c3d667ebf375b51c78

parent: 3958f6060f

Verified · cmc

cmc <hello@cleberg.net> · 2026-10-16 03:24 UTC

Secrets and deploy keys: reload after a refusal, a multi-line value, the sheet's own errors

A refused write reloads the list, so a row removed elsewhere goes. A secret can be entered on several lines, for a private key. A sheet shows only the error from its own attempt.

Ref #42
Ref #43

Layout: unified · split

gitbay/Repos/RepoCredentials.swift +6

         } catch {
             actionError = GitbayError.transport(error).userFacingMessage
         }
+        // A refusal may mean the list changed elsewhere, e.g. a row
+        // removed from another device.
+        await load()
         return false
     }
 }
         } catch {
             actionError = GitbayError.transport(error).userFacingMessage
         }
+        // A refusal may mean the list changed elsewhere, e.g. a row
+        // removed from another device.
+        await load()
         return false
     }
 }

gitbay/Views/Repos/RepoCredentialViews.swift +28 −8

     @State private var name = ""
     @State private var value = ""
+    @State private var multiLine = false
+    /// Errors shown here are this sheet's own, not an earlier list action's.
+    @State private var attempted = false
     var body: some View {
         NavigationStack {
                         .autocorrectionDisabled()
                         .textInputAutocapitalization(.characters)
                         .accessibilityIdentifier("secret-name")
-                    SecureField("Value", text: $value)
+                    if multiLine {
-                        .autocorrectionDisabled()
+                        TextEditor(text: $value)
-                        .textInputAutocapitalization(.never)
+                            .frame(minHeight: 120)
-                        .accessibilityIdentifier("secret-value")
+                            .font(.gbMono(.caption))
+                            .autocorrectionDisabled()
+                            .textInputAutocapitalization(.never)
+                            .accessibilityIdentifier("secret-value-multiline")
+                    } else {
+                        SecureField("Value", text: $value)
+                            .autocorrectionDisabled()
+                            .textInputAutocapitalization(.never)
+                            .accessibilityIdentifier("secret-value")
+                    }
+                    Toggle("Multi-line value", isOn: $multiLine)
                 } footer: {
-                    Text("Uppercase letters, digits and underscores. The value is sent once and cannot be read back.")
+                    Text(multiLine
+                        ? "Shown while you type, for a value with line breaks such as a private key. It is sent once and cannot be read back."
+                        : "Uppercase letters, digits and underscores. The value is sent once and cannot be read back.")
                 }
-                if let error = model.actionError {
+                if attempted, let error = model.actionError {
                     Section { GBNotice(error, .gbWarn) }
                 }
             }
                     } else {
                         Button("Set") {
                             Task {
+                                attempted = true
                                 guard await model.set(name: name, value: value) else { return }
                                 // A secure field that still holds text as the sheet
                                 // goes makes iOS offer to save it as a password.
     @State private var text = ""
     @State private var canPush = false
     @State private var ttl: String?
+    @State private var attempted = false
     var body: some View {
         NavigationStack {
                         Text("In a year").tag(String?.some("365d"))
                     }
                 }
-                if let error = model.actionError {
+                if attempted, let error = model.actionError {
                     Section { GBNotice(error, .gbWarn) }
                 }
             }
                         ProgressView()
                     } else {
                         Button("Add") {
-                            Task { if await model.add(publicKey: text, canPush: canPush, ttl: ttl) { onDone() } }
+                            Task {
+                                attempted = true
+                                if await model.add(publicKey: text, canPush: canPush, ttl: ttl) { onDone() }
+                            }
                         }
                         .disabled(text.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty)
                         .accessibilityIdentifier("deploy-key-submit")

gitbayTests/RepoCredentialTests.swift +24

	@@ -71,6 +71,30 @@ struct BuildSecretsViewModelTests {
71	#expect(model.actionError == "secret names are env-var shaped: uppercase letters, digits, _")	71	#expect(model.actionError == "secret names are env-var shaped: uppercase letters, digits, _")
72	}	72	}
73		73
		74	@Test func aFailedWriteStillRefreshesTheList() async throws {
		75	let (client, stub) = try makeClient()
		76	stub.enqueue(.init(status: 404, json: #"{"protocol_version":1,"error":"no secret NPM_TOKEN on krz/gitbay","exit_code":3}"#, match: "cmd"))
		77	stub.enqueue(.init(status: 200, json: #"{"protocol_version":1,"data":["DEPLOY_TOKEN"],"exit_code":0}"#, match: "argv=list"))
		78	let model = BuildSecretsViewModel(client: client, repoPath: "krz/gitbay")
		79
		80	await model.remove("NPM_TOKEN")
		81
		82	#expect(model.actionError == "no secret NPM_TOKEN on krz/gitbay")
		83	#expect(model.state.value == ["DEPLOY_TOKEN"])
		84	}
		85
		86	@Test func aMultiLineValueKeepsItsNewlines() async throws {
		87	let (client, stub) = try makeClient()
		88	stub.enqueue(.init(status: 200, json: okJSON, match: "cmd"))
		89	stub.enqueue(.init(status: 200, json: secretsJSON, match: "argv=list"))
		90	let model = BuildSecretsViewModel(client: client, repoPath: "krz/gitbay")
		91	let key = "-----BEGIN KEY-----\nabc\n-----END KEY-----\n"
		92
		93	#expect(await model.set(name: "BOT_SSH_KEY", value: key))
		94
		95	#expect(try body(try #require(stub.seen.first))["stdin"] as? String == key)
		96	}
		97
74	@Test func removeNamesTheSecret() async throws {	98	@Test func removeNamesTheSecret() async throws {
75	let (client, stub) = try makeClient()	99	let (client, stub) = try makeClient()
76	stub.enqueue(.init(status: 200, json: okJSON, match: "cmd"))	100	stub.enqueue(.init(status: 200, json: okJSON, match: "cmd"))

Commit 42a9918acf

Commit `42a9918acf`