refactor: Sendable 경고를 해결하기 위한 잔여 구현물 제거

Author: opficdev

Application/DevLogInfra/Sources/Common/FirebaseDependency.swift

@@ -13,10 +13,12 @@ import DevLogCore
 import DevLogData
 
 final class AuthServiceImpl: AuthService {
-    private let store = FirebaseDependency(value: Firestore.firestore())
-    private let messaging = FirebaseDependency(value: Messaging.messaging())
+    private let store = Firestore.firestore()
+    private let messaging = Messaging.messaging()
     private let logger = Logger(category: "AuthServiceImpl")
-    private let authStatePublisher: AuthStatePublisher
+    private let subject = CurrentValueSubject<Bool, Never>(Auth.auth().currentUser != nil)
+    private var handler: AuthStateDidChangeListenerHandle?
+    private var isCompletingSignIn = false
 
     var uid: String? {
         Auth.auth().currentUser?.uid
@@ -35,26 +37,36 @@ final class AuthServiceImpl: AuthService {
     }
 
     init() {
-        authStatePublisher = AuthStatePublisher(logger: logger)
+        handler = Auth.auth().addStateDidChangeListener { [weak self] _, user in
+            self?.handleAuthStateChange(user)
+        }
+    }
+
+    deinit {
+        guard let handler else { return }
+        Auth.auth().removeStateDidChangeListener(handler)
     }
 
     func observeSignedIn() -> AnyPublisher<Bool, Never> {
-        authStatePublisher.observeSignedIn()
+        subject.eraseToAnyPublisher()
     }
 
     func beginSignIn() {
         logger.info("Beginning sign-in bootstrap")
-        authStatePublisher.beginSignIn()
+        isCompletingSignIn = true
+        subject.send(false)
     }
 
     func completeSignIn() {
         logger.info("Completing sign-in bootstrap")
-        authStatePublisher.completeSignIn()
+        isCompletingSignIn = false
+        subject.send(Auth.auth().currentUser != nil)
     }
 
     func cancelSignIn() {
         logger.info("Cancelling sign-in bootstrap")
-        authStatePublisher.cancelSignIn()
+        isCompletingSignIn = false
+        subject.send(Auth.auth().currentUser != nil)
     }
 
     func getProviderID() async throws -> String? {
@@ -114,59 +126,8 @@ final class AuthServiceImpl: AuthService {
 
 }
 
-private final class AuthStatePublisher {
-    private let logger: Logger
-    private let subject: CurrentValueSubject<Bool, Never>
-    private let lock = NSLock()
-    private var handler: FirebaseDependency<AuthStateDidChangeListenerHandle>?
-    private var isCompletingSignIn = false
-
-    init(logger: Logger) {
-        self.logger = logger
-        self.subject = CurrentValueSubject<Bool, Never>(Auth.auth().currentUser != nil)
-        self.handler = FirebaseDependency(
-            value: Auth.auth().addStateDidChangeListener { [weak self] _, user in
-                self?.handleAuthStateChange(user)
-            }
-        )
-    }
-
-    deinit {
-        guard let handler else { return }
-        handler.removeAuthStateDidChangeListener()
-    }
-
-    func observeSignedIn() -> AnyPublisher<Bool, Never> {
-        lock.lock()
-        defer { lock.unlock() }
-        return subject.eraseToAnyPublisher()
-    }
-
-    func beginSignIn() {
-        lock.lock()
-        isCompletingSignIn = true
-        subject.send(false)
-        lock.unlock()
-    }
-
-    func completeSignIn() {
-        lock.lock()
-        isCompletingSignIn = false
-        subject.send(Auth.auth().currentUser != nil)
-        lock.unlock()
-    }
-
-    func cancelSignIn() {
-        lock.lock()
-        isCompletingSignIn = false
-        subject.send(Auth.auth().currentUser != nil)
-        lock.unlock()
-    }
-
-    private func handleAuthStateChange(_ user: User?) {
-        lock.lock()
-        defer { lock.unlock() }
-
+private extension AuthServiceImpl {
+    func handleAuthStateChange(_ user: User?) {
         let signedIn = user != nil
         logger.info("Firebase auth state changed. signedIn: \(signedIn)")
 

Application/DevLogInfra/Sources/Service/AuthServiceImpl.swift

@@ -23,11 +23,13 @@ final class AppleAuthenticationServiceImpl: AuthenticationService {
         case revokeAppleAccessToken
     }
 
-    private let session = AppleSignInSession()
-    private let store = FirebaseDependency(value: Firestore.firestore())
-    private let functions = FirebaseDependency(value: Functions.functions(region: "asia-northeast3"))
-    private let messaging = FirebaseDependency(value: Messaging.messaging())
+    private var appleSignInDelegate: AppleSignInDelegate?
+    private var appleSignInContinuation: CheckedContinuation<ASAuthorization, Error>?
+    private let store = Firestore.firestore()
+    private let functions = Functions.functions(region: "asia-northeast3")
+    private let messaging = Messaging.messaging()
     private var user: User? { Auth.auth().currentUser }
+    private let providerID = AuthProviderID.apple
     private let logger = Logger(category: "AppleAuthService")
 
     func signIn() async throws -> AuthDataResponse {
@@ -79,9 +81,9 @@ final class AppleAuthenticationServiceImpl: AuthenticationService {
             try await changeRequest.commitChanges()
 
             // FirebaseAuth 계정에 Apple ID 연결
-            if !result.user.providerData.contains(where: { $0.providerID == AuthProviderID.apple.rawValue }) {
+            if !result.user.providerData.contains(where: { $0.providerID == providerID.rawValue }) {
                 let appleCredential = OAuthProvider.credential(
-                    providerID: AuthProviderID.apple,
+                    providerID: providerID,
                     idToken: idTokenString,
                     rawNonce: nonce
                 )
@@ -149,7 +151,7 @@ final class AppleAuthenticationServiceImpl: AuthenticationService {
             }
 
             let appleCredential = OAuthProvider.credential(
-                providerID: AuthProviderID.apple,
+                providerID: providerID,
                 idToken: idTokenString,
                 rawNonce: nonce
             )
@@ -185,7 +187,7 @@ final class AppleAuthenticationServiceImpl: AuthenticationService {
             }
 
             logger.info("Starting Firebase Apple provider unlink. uid: \(uid)")
-            _ = try await user?.unlink(fromProvider: AuthProviderID.apple.rawValue)
+            _ = try await user?.unlink(fromProvider: providerID.rawValue)
         } catch {
             logger.error("Failed to unlink Apple account", error: error)
             throw error
@@ -195,7 +197,7 @@ final class AppleAuthenticationServiceImpl: AuthenticationService {
     // Apple 인증 메서드
     @MainActor
     func authenticateWithAppleAsync() async throws -> AppleAuthResponse {
-        guard session.canStartSignIn else {
+        guard appleSignInDelegate == nil, appleSignInContinuation == nil else {
             throw SocialLoginError.authenticationAlreadyInProgress
         }
 
@@ -211,11 +213,13 @@ final class AppleAuthenticationServiceImpl: AuthenticationService {
         let controller = ASAuthorizationController(authorizationRequests: [request])
 
         let authorization = try await withCheckedThrowingContinuation { continuation in
-            let delegate = session.start(continuation: continuation) { [weak self] result in
+            let delegate = AppleSignInDelegate { [weak self] result in
                 self?.completeAppleSignIn(with: result)
             }
-            controller.delegate = delegate
-            controller.presentationContextProvider = delegate
+            self.appleSignInDelegate = delegate
+            self.appleSignInContinuation = continuation
+            controller.delegate = self.appleSignInDelegate
+            controller.presentationContextProvider = self.appleSignInDelegate
             controller.performRequests()
         }
 
@@ -237,7 +241,17 @@ final class AppleAuthenticationServiceImpl: AuthenticationService {
 
     @MainActor
     private func completeAppleSignIn(with result: Result<ASAuthorization, Error>) {
-        session.complete(with: result)
+        guard let continuation = appleSignInContinuation else { return }
+
+        appleSignInContinuation = nil
+        appleSignInDelegate = nil
+
+        switch result {
+        case .success(let authorization):
+            continuation.resume(returning: authorization)
+        case .failure(let error):
+            continuation.resume(throwing: error)
+        }
     }
 
     // Apple CustomToken 발급 메서드
@@ -299,41 +313,3 @@ final class AppleAuthenticationServiceImpl: AuthenticationService {
         _ = try await revokeFunction.call(["token": token])
     }
 }
-
-private final class AppleSignInSession {
-    @MainActor
-    private var delegate: AppleSignInDelegate?
-    @MainActor
-    private var continuation: CheckedContinuation<ASAuthorization, Error>?
-
-    @MainActor
-    var canStartSignIn: Bool {
-        delegate == nil && continuation == nil
-    }
-
-    @MainActor
-    func start(
-        continuation: CheckedContinuation<ASAuthorization, Error>,
-        completion: @escaping @MainActor (Result<ASAuthorization, Error>) -> Void
-    ) -> AppleSignInDelegate {
-        let delegate = AppleSignInDelegate(finish: completion)
-        self.delegate = delegate
-        self.continuation = continuation
-        return delegate
-    }
-
-    @MainActor
-    func complete(with result: Result<ASAuthorization, Error>) {
-        guard let continuation else { return }
-
-        self.continuation = nil
-        self.delegate = nil
-
-        switch result {
-        case .success(let authorization):
-            continuation.resume(returning: authorization)
-        case .failure(let error):
-            continuation.resume(throwing: error)
-        }
-    }
-}

Application/DevLogInfra/Sources/Service/SocialLogin/AppleAuthenticationServiceImpl.swift

@@ -26,10 +26,11 @@ final class GithubAuthenticationServiceImpl: NSObject, AuthenticationService {
         static let acceptHeader = "application/vnd.github.v3+json"
     }
 
-    private let store = FirebaseDependency(value: Firestore.firestore())
-    private let functions = FirebaseDependency(value: Functions.functions(region: "asia-northeast3"))
-    private let messaging = FirebaseDependency(value: Messaging.messaging())
+    private let store = Firestore.firestore()
+    private let functions = Functions.functions(region: "asia-northeast3")
+    private let messaging = Messaging.messaging()
     private var user: User? { Auth.auth().currentUser }
+    private let providerID = AuthProviderID.gitHub
     private let provider = TopViewControllerProvider()
     private let logger = Logger(category: "GithubAuthService")
     private let gitHubApiClient = NXAPIClient(
@@ -66,8 +67,8 @@ final class GithubAuthenticationServiceImpl: NSObject, AuthenticationService {
             }
 
             // 5. GitHub 계정과 Firebase Auth 계정 연결
-            if !result.user.providerData.contains(where: { $0.providerID == "github.com" }) {
-                let credential = OAuthProvider.credential(providerID: AuthProviderID.gitHub, accessToken: accessToken)
+            if !result.user.providerData.contains(where: { $0.providerID == providerID.rawValue }) {
+                let credential = OAuthProvider.credential(providerID: providerID, accessToken: accessToken)
                 try await result.user.link(with: credential)
             }
 
@@ -136,7 +137,7 @@ final class GithubAuthenticationServiceImpl: NSObject, AuthenticationService {
 
             try await tokensRef.setData(["githubAccessToken": accessToken], merge: true)
 
-            let credential = OAuthProvider.credential(providerID: AuthProviderID.gitHub, accessToken: accessToken)
+            let credential = OAuthProvider.credential(providerID: providerID, accessToken: accessToken)
             try await user?.link(with: credential)
 
             logger.info("Successfully linked GitHub account")
@@ -160,7 +161,7 @@ final class GithubAuthenticationServiceImpl: NSObject, AuthenticationService {
             try await tokensRef.updateData(["githubAccessToken": FieldValue.delete()])
 
             logger.info("Starting Firebase GitHub provider unlink. uid: \(uid)")
-            _ = try await user?.unlink(fromProvider: AuthProviderID.gitHub.rawValue)
+            _ = try await user?.unlink(fromProvider: providerID.rawValue)
         } catch {
             logger.error("Failed to unlink GitHub account", error: error)
             throw error

Application/DevLogInfra/Sources/Service/SocialLogin/GithubAuthenticationServiceImpl.swift

@@ -14,8 +14,8 @@ import DevLogCore
 import DevLogData
 
 final class GoogleAuthenticationServiceImpl: AuthenticationService {
-    private let store = FirebaseDependency(value: Firestore.firestore())
-    private let messaging = FirebaseDependency(value: Messaging.messaging())
+    private let store = Firestore.firestore()
+    private let messaging = Messaging.messaging()
     private var user: User? { Auth.auth().currentUser }
     private let provider = TopViewControllerProvider()
     private let logger = Logger(category: "GoogleAuthService")

Application/DevLogInfra/Sources/Service/SocialLogin/GoogleAuthenticationServiceImpl.swift

@@ -11,7 +11,7 @@ import DevLogCore
 import DevLogData
 
 final class UserServiceImpl: UserService {
-    private let store = FirebaseDependency(value: Firestore.firestore())
+    private let store = Firestore.firestore()
     private let logger = Logger(category: "UserServiceImpl")
 
     // 유저를 Firestore에 저장 및 업데이트