[auth] Fix Multi-factor session crash on second Firebase app (#14238)

Co-authored-by: Nick Cooke <[email protected]>
firebase · Dec 10, 2024 · 44ab3a9 · 44ab3a9
1 parent acc4bbf
commit 44ab3a9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/FirebaseAuth/CHANGELOG.md b/FirebaseAuth/CHANGELOG.md
@@ -1,4 +1,5 @@
 # Unreleased
+- [fixed] Fix Multi-factor session crash on second Firebase app. (#14238)
 - [fixed] Updated most decoders to be consistent with Firebase 10's behavior
   for decoding `nil` values. (#14212)
 

diff --git a/FirebaseAuth/Sources/Swift/MultiFactor/MultiFactor.swift b/FirebaseAuth/Sources/Swift/MultiFactor/MultiFactor.swift
@@ -34,7 +34,7 @@ import Foundation
     /// operation.
     @objc(getSessionWithCompletion:)
     open func getSessionWithCompletion(_ completion: ((MultiFactorSession?, Error?) -> Void)?) {
-      let session = MultiFactorSession.sessionForCurrentUser
+      let session = MultiFactorSession.session(for: user)
       if let completion {
         completion(session, nil)
       }

diff --git a/FirebaseAuth/Sources/Swift/MultiFactor/MultiFactorSession.swift b/FirebaseAuth/Sources/Swift/MultiFactor/MultiFactorSession.swift
@@ -39,8 +39,9 @@ import Foundation
     /// Current user object.
     var currentUser: User?
 
-    class var sessionForCurrentUser: MultiFactorSession {
-      guard let currentUser = Auth.auth().currentUser else {
+    class func session(for user: User?) -> MultiFactorSession {
+      let currentUser = user ?? Auth.auth().currentUser
+      guard let currentUser else {
         fatalError("Internal Auth Error: missing user for multifactor auth")
       }
       return .init(idToken: currentUser.tokenService.accessToken, currentUser: currentUser)