From 5db7eebbb25c71d14d491b7aecd47a6cb683f623 Mon Sep 17 00:00:00 2001 From: Mariusz Klochowicz Date: Tue, 25 Nov 2025 15:35:07 +1030 Subject: [PATCH] refactor(apple): remove unsafe from Token (#10968) Convert static query dictionary to a computed property, eliminating the need for nonisolated(unsafe). Also fixes a bug where kSecAttrLabel used a hardcoded string instead of the label property (which differs between debug and release builds). --- .../Sources/FirezoneKit/Models/Token.swift | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/swift/apple/FirezoneKit/Sources/FirezoneKit/Models/Token.swift b/swift/apple/FirezoneKit/Sources/FirezoneKit/Models/Token.swift index 7dd91d430..ee26eba49 100644 --- a/swift/apple/FirezoneKit/Sources/FirezoneKit/Models/Token.swift +++ b/swift/apple/FirezoneKit/Sources/FirezoneKit/Models/Token.swift @@ -15,14 +15,14 @@ public struct Token: CustomStringConvertible { private static let label = "Firezone token" #endif - /// Thread-safe: Immutable dictionary initialised at compile time. - /// CFString keys and constant string values are both Sendable. - private nonisolated(unsafe) static let query: [CFString: Any] = [ - kSecAttrLabel: "Firezone token", - kSecAttrAccount: "1", - kSecAttrService: BundleHelper.appGroupId, - kSecAttrDescription: "Firezone access token", - ] + private static var query: [CFString: Any] { + [ + kSecAttrLabel: label, + kSecAttrAccount: "1", + kSecAttrService: BundleHelper.appGroupId, + kSecAttrDescription: "Firezone access token", + ] + } private var data: Data