Provide more flexible Account Service interactions

Package.swift

@@ -33,11 +33,12 @@ let package = Package(
         .library(name: "SpeziFirebaseAccountStorage", targets: ["SpeziFirebaseAccountStorage"])
     ],
     dependencies: [
-        .package(url: "https://github.com/StanfordSpezi/SpeziFoundation.git", from: "2.0.0-beta.1"),
+        .package(url: "https://github.com/StanfordSpezi/SpeziFoundation", from: "2.0.0-beta.1"),
         .package(url: "https://github.com/StanfordSpezi/Spezi", from: "1.7.1"),
-        .package(url: "https://github.com/StanfordSpezi/SpeziViews.git", from: "1.6.0"),
+        .package(url: "https://github.com/StanfordSpezi/SpeziViews", from: "1.6.0"),
         .package(url: "https://github.com/StanfordSpezi/SpeziAccount", from: "2.0.0-beta.2"),
-        .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "11.0.0")
+        .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "11.0.0"),
+        .package(url: "https://github.com/apple/swift-atomics.git", from: "1.2.0")
     ] + swiftLintPackage(),
     targets: [
         .target(
@@ -71,7 +72,8 @@ let package = Package(
             dependencies: [
                 .target(name: "SpeziFirebaseConfiguration"),
                 .product(name: "Spezi", package: "Spezi"),
-                .product(name: "FirebaseFirestore", package: "firebase-ios-sdk")
+                .product(name: "FirebaseFirestore", package: "firebase-ios-sdk"),
+                .product(name: "Atomics", package: "swift-atomics")
             ],
             swiftSettings: [
                 swiftConcurrency
@@ -108,8 +110,7 @@ let package = Package(
             dependencies: [
                 .target(name: "SpeziFirebaseAccount"),
                 .target(name: "SpeziFirebaseConfiguration"),
-                .target(name: "SpeziFirestore"),
-                .product(name: "XCTSpezi", package: "Spezi")
+                .target(name: "SpeziFirestore")
             ],
             swiftSettings: [
                 swiftConcurrency

Sources/SpeziFirestore/DocumentReference+AsyncAwait.swift

@@ -6,8 +6,61 @@
 // SPDX-License-Identifier: MIT
 //
 
+import Atomics
 import FirebaseFirestore
 import Foundation
+import OSLog
+
+
+#if compiler(>=6)
+private struct FirestoreCompletion: Sendable {
+    private static var logger: Logger {
+        Logger(subsystem: "edu.stanford.spezi.firebase", category: "FirestoreCompletion")
+    }
+
+    private let continuation: UnsafeContinuation<Void, Error>
+    private let resumed: ManagedAtomic<Bool>
+
+    private init(continuation: UnsafeContinuation<Void, Error>) {
+        self.continuation = continuation
+        self.resumed = ManagedAtomic(false)
+    }
+
+    static func perform(
+        isolation: isolated (any Actor)? = #isolation,
+        file: StaticString = #filePath,
+        line: Int = #line,
+        action: (FirestoreCompletion) throws -> Void
+    ) async throws {
+        try await withUnsafeThrowingContinuation { continuation in
+            let completion = FirestoreCompletion(continuation: continuation)
+            do {
+                try action(completion)
+            } catch {
+                completion.complete(with: error, file: file, line: line)
+            }
+        }
+    }
+
+    func complete(
+        with error: Error?,
+        file: StaticString = #filePath,
+        line: Int = #line
+    ) {
+        let (exchanged, _) = resumed.compareExchange(expected: false, desired: true, ordering: .relaxed)
+        if !exchanged {
+            Self.logger.warning("\(file):\(line): Firestore completion handler completed twice. This time with: \(error)")
+            return
+        }
+
+        if let error {
+            continuation.resume(throwing: FirestoreError(error))
+        } else {
+            continuation.resume()
+        }
+    }
+}
+#endif
 
 
 extension DocumentReference {
@@ -31,17 +84,9 @@ extension DocumentReference {
         from value: T,
         encoder: FirebaseFirestore.Firestore.Encoder = FirebaseFirestore.Firestore.Encoder()
     ) async throws {
-        try await withCheckedThrowingContinuation { (continuation: CheckedContinuation<Void, Error>) in
-            do {
-                try setData(from: value, encoder: encoder) { error in
-                    if let error {
-                        continuation.resume(throwing: FirestoreError(error))
-                    } else {
-                        continuation.resume()
-                    }
-                }
-            } catch {
-                continuation.resume(throwing: FirestoreError(error))
+        try await FirestoreCompletion.perform { completion in
+            try setData(from: value, encoder: encoder) { error in
+                completion.complete(with: error)
             }
         }
     }
@@ -69,17 +114,9 @@ extension DocumentReference {
         merge: Bool,
         encoder: FirebaseFirestore.Firestore.Encoder = FirebaseFirestore.Firestore.Encoder()
     ) async throws {
-        try await withCheckedThrowingContinuation { (continuation: CheckedContinuation<Void, Error>) in
-            do {
-                try setData(from: value, merge: merge, encoder: encoder) { error in
-                    if let error {
-                        continuation.resume(throwing: FirestoreError(error))
-                    } else {
-                        continuation.resume()
-                    }
-                }
-            } catch {
-                continuation.resume(throwing: FirestoreError(error))
+        try await FirestoreCompletion.perform { completion in
+            try setData(from: value, merge: merge, encoder: encoder) { error in
+                completion.complete(with: error)
             }
         }
     }
@@ -111,17 +148,9 @@ extension DocumentReference {
         mergeFields: [Any],
         encoder: FirebaseFirestore.Firestore.Encoder = FirebaseFirestore.Firestore.Encoder()
     ) async throws {
-        try await withCheckedThrowingContinuation { (continuation: CheckedContinuation<Void, Error>) in
-            do {
-                try setData(from: value, mergeFields: mergeFields, encoder: encoder) { error in
-                    if let error {
-                        continuation.resume(throwing: FirestoreError(error))
-                    } else {
-                        continuation.resume()
-                    }
-                }
-            } catch {
-                continuation.resume(throwing: FirestoreError(error))
+        try await FirestoreCompletion.perform { completion in
+            try setData(from: value, mergeFields: mergeFields, encoder: encoder) { error in
+                completion.complete(with: error)
             }
         }
     }

Tests/UITests/TestAppUITests/FirebaseClient.swift

@@ -51,7 +51,7 @@
 
 
 enum FirebaseClient {
-    private static let projectId = "spezifirebaseuitests"
+    private static let projectId = "nams-e43ed" // TODO: restore "spezifirebaseuitests"
 
     // curl -H "Authorization: Bearer owner" -X DELETE http://localhost:9099/emulator/v1/projects/spezifirebaseuitests/accounts
     static func deleteAllAccounts() async throws {
@@ -142,7 +142,7 @@
                 Firebase Local Emulator Suite.
                 """
             )
             throw URLError(.fileDoesNotExist)
         }
     }
 }

Tests/UITests/UITests.xcodeproj/xcshareddata/xcschemes/TestApp.xcscheme

@@ -140,7 +140,7 @@
       <CommandLineArguments>
          <CommandLineArgument
             argument = "--account-storage"
-            isEnabled = "NO">
+            isEnabled = "YES">
          </CommandLineArgument>
       </CommandLineArguments>
       <LocationScenarioReference