Commit `8a1dc95b82`

8a1dc95b82c8a3b37e5d80164f5535a3301a8510

parent: 3d6141f15c

Verified · cmc

cmc <hello@cleberg.net> · 2026-10-14 08:07 UTC

Delete your account: remembered on return; refusals in view

The server has no read for a pending request, so the screen remembers
one for the link's 24 hours and offers to withdraw it on a later visit;
withdrawing one already gone clears the note. A refusal, such as being
the only admin, comes up in an alert beside the control rather than in
the banner far above it, and the export command is selectable.

Ref #35

Layout: unified · split

gitbay/Account/AccountViewModel.swift +33 −2

     private let client: GitbayClient
-    init(client: GitbayClient) {
+    /// Where a deletion request is remembered across visits: the server
+    /// has no read that says one is pending.
+    private let defaults: UserDefaults
+    init(client: GitbayClient, defaults: UserDefaults = .standard) {
         self.client = client
+        self.defaults = defaults
     }
     func load() async {
         let mailed: String
     }
+    /// The link works for a day; after that the request is as good as gone.
+    nonisolated static let deletionLinkLife: TimeInterval = 24 * 60 * 60
+    private func deletionKey(_ username: String) -> String {
+        "gb.deletionRequest.\(client.instance.baseURL.absoluteString).\(username)"
+    }
+    /// A request made on an earlier visit whose link still works.
+    func loadPendingDeletion(username: String, now: Date = .now) {
+        guard let saved = defaults.dictionary(forKey: deletionKey(username)),
+              let address = saved["mailed"] as? String,
+              let at = saved["at"] as? Date, now.timeIntervalSince(at) < Self.deletionLinkLife else {
+            defaults.removeObject(forKey: deletionKey(username))
+            return
+        }
+        deletionMailedTo = address
+    }
     /// `account delete --confirm <username>`: the server mails a link;
     /// opening it disables the account, and seven days later it is purged.
     func requestDeletion(username: String) async {
             let requested = try await client.run(["account", "delete", "--confirm", username],
                                                  as: DeletionRequested.self)
             deletionMailedTo = requested?.mailed
+            if let address = requested?.mailed {
+                defaults.set(["mailed": address, "at": Date.now], forKey: deletionKey(username))
+            }
         } catch let error as GitbayError {
             actionError = error.userFacingMessage
         } catch {
     /// `account delete --cancel`: withdraws a request whose link has not
     /// been opened.
-    func cancelDeletion() async {
+    func cancelDeletion(username: String) async {
         working = true
         actionError = nil
         defer { working = false }
         do {
             try await client.run(["account", "delete", "--cancel"])
             deletionMailedTo = nil
+            defaults.removeObject(forKey: deletionKey(username))
+        } catch GitbayError.notFound {
+            // Nothing pending: the link was opened, or it lapsed.
+            deletionMailedTo = nil
+            defaults.removeObject(forKey: deletionKey(username))
         } catch let error as GitbayError {
             actionError = error.userFacingMessage
         } catch {

gitbay/Views/Account/AccountView.swift +19 −3

     @State private var model: AccountViewModel
     @State private var deletingAccount = false
     @State private var deleteConfirm = ""
+    @State private var deletionRefusal: String?
     @State private var addingSSH = false
     @State private var addingPGP = false
     @State private var emailAddress = ""
         .task { await model.load() }
         .task { await model.loadNotificationPreferences() }
         .task { await model.loadEmails() }
+        .task { model.loadPendingDeletion(username: username) }
+        .alert("Not deleted", isPresented: Binding(get: { deletionRefusal != nil }, set: { if !$0 { deletionRefusal = nil } })) {
+            Button("OK", role: .cancel) {}
+        } message: {
+            Text(deletionRefusal ?? "")
+        }
         .alert("Delete your account", isPresented: $deletingAccount) {
             TextField("type \(username) to confirm", text: $deleteConfirm)
                 .autocorrectionDisabled()
                 .textInputAutocapitalization(.never)
             Button("Mail the link", role: .destructive) {
-                Task { await model.requestDeletion(username: username) }
+                Task {
+                    await model.requestDeletion(username: username)
+                    // The list's banner is far above this last row.
+                    if model.deletionMailedTo == nil { deletionRefusal = model.actionError }
+                }
             }
             .disabled(deleteConfirm != username)
             Button("Cancel", role: .cancel) {}
                     .font(.gbSans(.subheadline))
                     .accessibilityIdentifier("account-delete-mailed")
                 Button("Withdraw the request") {
-                    Task { await model.cancelDeletion() }
+                    Task { await model.cancelDeletion(username: username) }
                 }
                 .disabled(model.working)
                 .accessibilityIdentifier("account-delete-cancel")
                 .accessibilityIdentifier("account-delete-button")
             }
         } footer: {
-            Text("Keep a copy first: ssh git@\(session.current?.instance.baseURL.host() ?? "the instance") account export > bundle.json")
+            VStack(alignment: .leading, spacing: 4) {
+                Text("Keep a copy first:")
+                Text(verbatim: "ssh git@\(session.current?.instance.baseURL.host() ?? "the instance") account export > bundle.json")
+                    .font(.gbMono(.caption))
+                    .textSelection(.enabled)
+            }
         }
     }

gitbayTests/AccountDeleteTests.swift +34 −4

     }
 }
+private func scratchDefaults() -> UserDefaults {
+    UserDefaults(suiteName: "gb-test-\(UUID().uuidString)")!
+}
 @MainActor
 struct AccountDeleteTests {
+    @Test func aRequestIsRememberedForTheLinksDayAndNoLonger() async throws {
+        let (client, stub) = try makeClient()
+        stub.enqueue(.init(status: 200, json: #"{"protocol_version":1,"data":{"user":"sim","mailed":"sim@example.test"},"exit_code":0}"#, match: "cmd"))
+        let defaults = scratchDefaults()
+        await AccountViewModel(client: client, defaults: defaults).requestDeletion(username: "sim")
+        let later = AccountViewModel(client: client, defaults: defaults)
+        later.loadPendingDeletion(username: "sim", now: .now.addingTimeInterval(60 * 60))
+        #expect(later.deletionMailedTo == "sim@example.test")
+        let tooLate = AccountViewModel(client: client, defaults: defaults)
+        tooLate.loadPendingDeletion(username: "sim", now: .now.addingTimeInterval(25 * 60 * 60))
+        #expect(tooLate.deletionMailedTo == nil)
+    }
+    @Test func withdrawingWhenNothingIsPendingClearsTheNotice() async throws {
+        let (client, stub) = try makeClient()
+        stub.enqueue(.init(status: 404, json: #"{"protocol_version":1,"error":"no deletion is pending for sim","exit_code":3}"#, match: "cmd"))
+        let model = AccountViewModel(client: client, defaults: scratchDefaults())
+        await model.cancelDeletion(username: "sim")
+        #expect(model.deletionMailedTo == nil)
+        #expect(model.actionError == nil)
+    }
     @Test func askingMailsALinkToTheAddressTheServerNames() async throws {
         let (client, stub) = try makeClient()
         stub.enqueue(.init(status: 200, json: #"{"protocol_version":1,"data":{"user":"sim","mailed":"sim@example.test"},"exit_code":0}"#, match: "cmd"))
-        let model = AccountViewModel(client: client)
+        let model = AccountViewModel(client: client, defaults: scratchDefaults())
         await model.requestDeletion(username: "sim")
     @Test func aRefusalSaysWhyAndNothingIsPending() async throws {
         let (client, stub) = try makeClient()
         stub.enqueue(.init(status: 403, json: #"{"protocol_version":1,"error":"you are the instance's only admin; promote another account first","exit_code":4}"#, match: "cmd"))
-        let model = AccountViewModel(client: client)
+        let model = AccountViewModel(client: client, defaults: scratchDefaults())
         await model.requestDeletion(username: "sim")
         let (client, stub) = try makeClient()
         stub.enqueue(.init(status: 200, json: #"{"protocol_version":1,"data":{"user":"sim","mailed":"sim@example.test"},"exit_code":0}"#, match: "cmd"))
         stub.enqueue(.init(status: 200, json: #"{"protocol_version":1,"data":{"user":"sim","cancelled":true},"exit_code":0}"#, match: "cmd"))
-        let model = AccountViewModel(client: client)
+        let model = AccountViewModel(client: client, defaults: scratchDefaults())
         await model.requestDeletion(username: "sim")
-        await model.cancelDeletion()
+        await model.cancelDeletion(username: "sim")
         #expect(try posted(stub).last == ["account", "delete", "--cancel"])
         #expect(model.deletionMailedTo == nil)

Commit 8a1dc95b82

Commit `8a1dc95b82`