Cherry picks and versions for Firestore 8.9.1 (#8905)

Author: paulb777

Firebase.podspec

@@ -141,7 +141,7 @@ Simplify your app development, grow your user base, and monetize more effectivel
 
   s.subspec 'Firestore' do |ss|
     ss.dependency 'Firebase/CoreOnly'
-    ss.dependency 'FirebaseFirestore', '~> 8.9.0'
+    ss.dependency 'FirebaseFirestore', '~> 8.9.1'
   end
 
   s.subspec 'Functions' do |ss|

FirebaseFirestore.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'FirebaseFirestore'
-  s.version          = '8.9.0'
+  s.version          = '8.9.1'
   s.summary          = 'Google Cloud Firestore'
 
   s.description      = <<-DESC

Firestore/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v8.9.1
+- [fixed] Fixed a bug in the AppCheck integration that caused the SDK to respond
+  to unrelated notifications (#8895).
+
 # v8.9.0
 - [added] Added support for Firebase AppCheck.
 - [fixed] Fix a crash if `[FIRTransaction getDocument]` was called after

Firestore/core/src/credentials/firebase_app_check_credentials_provider_apple.mm

@@ -31,8 +31,12 @@
 FirebaseAppCheckCredentialsProvider::FirebaseAppCheckCredentialsProvider(
     FIRApp* app, id<FIRAppCheckInterop> app_check) {
   contents_ = std::make_shared<Contents>(app, app_check);
-  std::weak_ptr<Contents> weak_contents = contents_;
 
+  if (app_check == nil) {
+    return;
+  }
+
+  std::weak_ptr<Contents> weak_contents = contents_;
   app_check_listener_handle_ = [[NSNotificationCenter defaultCenter]
       addObserverForName:[app_check tokenDidChangeNotificationName]
                   object:nil
@@ -73,20 +77,17 @@
 
 void FirebaseAppCheckCredentialsProvider::GetToken(
     TokenListener<std::string> completion) {
-  HARD_ASSERT(app_check_listener_handle_,
-              "GetToken cannot be called after listener removed.");
-
-  void (^get_token_callback)(id<FIRAppCheckTokenResultInterop>) =
-      ^(id<FIRAppCheckTokenResultInterop> result) {
-        if (result.error != nil) {
-          LOG_WARN("AppCheck failed: '%s'",
-                   util::MakeString(result.error.localizedDescription));
-        }
-        completion(util::MakeString(result.token));  // Always return token
-      };
-
   std::weak_ptr<Contents> weak_contents = contents_;
   if (contents_->app_check) {
+    void (^get_token_callback)(id<FIRAppCheckTokenResultInterop>) =
+        ^(id<FIRAppCheckTokenResultInterop> result) {
+          if (result.error != nil) {
+            LOG_WARN("AppCheck failed: '%s'",
+                     util::MakeString(result.error.localizedDescription));
+          }
+          completion(util::MakeString(result.token));  // Always return token
+        };
+
     // Retrieve a cached or generate a new FAC Token. If forcingRefresh == YES
     // always generates a new token and updates the cache.
     [contents_->app_check getTokenForcingRefresh:force_refresh_
@@ -106,11 +107,12 @@
     // Fire initial event.
     change_listener(contents_->current_token);
   } else {
-    HARD_ASSERT(app_check_listener_handle_, "removed change_listener twice!");
     HARD_ASSERT(change_listener_, "change_listener removed without being set!");
-    [[NSNotificationCenter defaultCenter]
-        removeObserver:app_check_listener_handle_];
-    app_check_listener_handle_ = nil;
+    if (app_check_listener_handle_) {
+      [[NSNotificationCenter defaultCenter]
+          removeObserver:app_check_listener_handle_];
+      app_check_listener_handle_ = nil;
+    }
   }
 
   change_listener_ = change_listener;