more progress

Author: ncooke3

FirebaseAuth/Sources/Swift/Auth/Auth.swift

@@ -1625,7 +1625,7 @@ extension Auth: AuthInterop {
   // MARK: Internal methods
 
   init(app: FirebaseApp,
-       keychainStorageProvider: AuthKeychainStorage = AuthKeychainStorageReal(),
+       keychainStorageProvider: AuthKeychainStorage = AuthKeychainStorageReal.shared,
        backend: AuthBackend = .init(rpcIssuer: AuthBackendRPCIssuer()),
        authDispatcher: AuthDispatcher = .init()) {
     self.app = app

FirebaseAuth/Sources/Swift/Auth/AuthComponent.swift

@@ -78,7 +78,10 @@ class AuthComponent: NSObject, Library, ComponentLifecycleMaintainer {
       // This doesn't stop any request already issued, see b/27704535
 
       if let keychainServiceName = Auth.deleteKeychainServiceNameForAppName(app.name) {
-        let keychain = AuthKeychainServices(service: keychainServiceName)
+        let keychain = AuthKeychainServices(
+          service: keychainServiceName,
+          storage: AuthKeychainStorageReal.shared
+        )
         let userKey = "\(app.name)_firebase_user"
         try? keychain.removeData(forKey: userKey)
       }

FirebaseAuth/Sources/Swift/Storage/AuthKeychainServices.swift

@@ -31,8 +31,7 @@ final class AuthKeychainServices: Sendable {
 
   // MARK: - Internal methods for shared keychain operations
 
-  required init(service: String = "Unset service",
-                storage: AuthKeychainStorage = AuthKeychainStorageReal()) {
+  required init(service: String = "Unset service", storage: AuthKeychainStorage) {
     self.service = service
     keychainStorage = storage
   }
@@ -105,10 +104,6 @@ final class AuthKeychainServices: Sendable {
   /// This dictionary is to avoid unnecessary keychain operations against legacy items.
   private let legacyEntryDeletedForKey = FIRAllocatedUnfairLock<Set<String>>(initialState: [])
 
-  static func storage(identifier: String) -> Self {
-    return Self(service: identifier)
-  }
-
   func data(forKey key: String) throws -> Data? {
     if let data = try getItemLegacy(query: genericPasswordQuery(key: key)) {
       return data

FirebaseAuth/Sources/Swift/Storage/AuthKeychainStorageReal.swift

@@ -15,9 +15,12 @@
 import Foundation
 
 /// The utility class to update the real keychain
-
 @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *)
 final class AuthKeychainStorageReal: AuthKeychainStorage {
+  static let shared: AuthKeychainStorageReal = .init()
+
+  private init() {}
+
   func get(query: [String: Any], result: inout AnyObject?) -> OSStatus {
     return SecItemCopyMatching(query as CFDictionary, &result)
   }

FirebaseAuth/Tests/Unit/AuthKeychainServicesTests.swift

@@ -36,7 +36,7 @@ class AuthKeychainServicesTests: XCTestCase {
   #if (os(macOS) && !FIREBASE_AUTH_TESTING_USE_MACOS_KEYCHAIN) || SWIFT_PACKAGE
     let storage: AuthKeychainStorage = FakeAuthKeychainStorage()
   #else
-    let storage: AuthKeychainStorage = AuthKeychainStorageReal()
+    let storage: AuthKeychainStorage = AuthKeychainStorageReal.shared
   #endif // (os(macOS) && !FIREBASE_AUTH_TESTING_USE_MACOS_KEYCHAIN) || SWIFT_PACKAGE
 
   override func setUp() {

FirebaseAuth/Tests/Unit/AuthTests.swift

@@ -43,7 +43,7 @@ class AuthTests: RPCBaseTests {
     #if (os(macOS) && !FIREBASE_AUTH_TESTING_USE_MACOS_KEYCHAIN) || SWIFT_PACKAGE
       let keychainStorageProvider = FakeAuthKeychainStorage()
     #else
-      let keychainStorageProvider = AuthKeychainStorageReal()
+      let keychainStorageProvider = AuthKeychainStorageReal.shared
     #endif // (os(macOS) && !FIREBASE_AUTH_TESTING_USE_MACOS_KEYCHAIN) || SWIFT_PACKAGE
 
     // Stub the implementation to save the token refresh task for later execution.

FirebaseAuth/Tests/Unit/UserTests.swift

@@ -45,7 +45,7 @@ class UserTests: RPCBaseTests {
     #if (os(macOS) && !FIREBASE_AUTH_TESTING_USE_MACOS_KEYCHAIN) || SWIFT_PACKAGE
       let keychainStorageProvider = FakeAuthKeychainStorage()
     #else
-      let keychainStorageProvider = AuthKeychainStorageReal()
+      let keychainStorageProvider = AuthKeychainStorageReal.shared
     #endif // (os(macOS) && !FIREBASE_AUTH_TESTING_USE_MACOS_KEYCHAIN) || SWIFT_PACKAGE
     auth = Auth(
       app: FirebaseApp.app(name: "test-UserTests")!,