Merge remote-tracking branch 'origin/master' into snappy2

Author: dconeybe

.github/workflows/remoteconfig.yml

@@ -8,6 +8,7 @@ on:
     - '.github/workflows/remoteconfig.yml'
     - 'Gemfile*'
     - 'scripts/generate_access_token.sh'
+    - 'scripts/gha-encrypted/RemoteConfigSwiftAPI/**'
   schedule:
     # Run every day at 12am (PST) - cron uses UTC times
     - cron:  '0 8 * * *'

AddNewPod.md

@@ -76,6 +76,8 @@ For top-level Firebase pods that map to documented products:
   [FIRApp.m](FirebaseCore/Sources/FIRApp.m).
 * When ready to release with Firebase, add to the
   [Firebase manifest](ReleaseTooling/Sources/FirebaseManifest/FirebaseManifest.swift).
+* Create an empty JSON file to enable the Carthage build
+  [here](ReleaseTooling/Sources/CarthageJSON).
 * Add a [quickstart](https://github.com/firebase/quickstart-ios).
 
 ## Review and Release

FirebaseAnalytics.podspec.json

@@ -22,7 +22,7 @@
         "z"
     ],
     "license": {
-        "text": "Copyright 2021 Google",
+        "text": "Copyright 2022 Google",
         "type": "Copyright"
     },
     "name": "FirebaseAnalytics",
@@ -32,7 +32,7 @@
         "tvos": "12.0"
     },
     "source": {
-        "http": "https://dl.google.com/firebase/ios/analytics/dcdcf15b4c4831d9/FirebaseAnalytics-8.15.0.tar.gz"
+        "http": "https://dl.google.com/firebase/ios/analytics/a596b932b0fcdc4b/FirebaseAnalytics-9.0.0.tar.gz"
     },
     "subspecs": [
         {

FirebaseAnalyticsOnDeviceConversion.podspec.json

@@ -0,0 +1,25 @@
+{
+    "authors": "Google, Inc.",
+    "cocoapods_version": ">= 1.10.2",
+    "dependencies": {
+        "GoogleAppMeasurementOnDeviceConversion": "9.0.0"
+    },
+    "description": "On device conversion measurement plugin for FirebaseAnalytics. This pod does not expose any headers and isn't intended for direct use, but rather as a plugin of FirebaseAnalytics.",
+    "homepage": "https://firebase.google.com/features/analytics/",
+    "license": {
+        "text": "Copyright 2022 Google",
+        "type": "Copyright"
+    },
+    "name": "FirebaseAnalyticsOnDeviceConversion",
+    "platforms": {
+        "ios": "10.0"
+    },
+    "source": {
+        "git": "https://github.com/firebase/firebase-ios-sdk.git",
+        "tag": "CocoaPods-9.0.0"
+    },
+    "source_files": [ "FirebaseAnalyticsOnDeviceConversionWrapper/*" ],
+    "static_framework": true,
+    "summary": "On device conversion measurement plugin for FirebaseAnalytics. Not intended for direct use.",
+    "version": "9.0.0"
+}

FirebaseAnalyticsOnDeviceConversionWrapper/dummy.m

@@ -0,0 +1,17 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// Swift Package Manager needs at least one source file.

FirebaseAnalyticsOnDeviceConversionWrapper/include/dummy.h

@@ -0,0 +1,18 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// Swift Package Manager needs at least one header to prevent a warning. See
+// https://github.com/firebase/firebase-ios-sdk/pull/6504.

FirebaseAppCheck.podspec

@@ -46,7 +46,7 @@ Pod::Spec.new do |s|
   s.tvos.weak_framework = 'DeviceCheck'
 
   s.dependency 'FirebaseCore', '~> 9.0'
-  s.dependency 'PromisesObjC', '~> 2.0'
+  s.dependency 'PromisesObjC', '~> 2.1'
   s.dependency 'GoogleUtilities/Environment', '~> 7.7'
 
   s.pod_target_xcconfig = {

FirebaseAppDistribution.podspec

@@ -51,5 +51,4 @@ iOS SDK for App Distribution for Firebase.
    unit_tests.dependency 'OCMock'
   end
 
-  # end
 end

FirebaseAuth.podspec

@@ -54,7 +54,7 @@ supports email and password accounts, as well as several 3rd party authenticatio
   s.dependency 'FirebaseCore', '~> 9.0'
   s.dependency 'GoogleUtilities/AppDelegateSwizzler', '~> 7.7'
   s.dependency 'GoogleUtilities/Environment', '~> 7.7'
-  s.dependency 'GTMSessionFetcher/Core', '~> 1.5'
+  s.dependency 'GTMSessionFetcher/Core', '~> 1.7'
 
   # Using environment variable because of the dependency on the unpublished
   # HeartbeatLoggingTestUtils.

FirebaseAuth/CHANGELOG.md

@@ -1,5 +1,6 @@
 # v9.0.0
 - [fixed] **Breaking change:** Fixed an ObjC-to-Swift API conversion error where `getStoredUser(forAccessGroup:)` returned a non-optional type. This change is breaking for Swift users only (#8599).
+- [fixed] Fixed an iOS 15 keychain access issue related to prewarming. (#8695)
 
 # v8.14.0
 - [added] Started to collect the Firebase user agent for Firebase Auth. (#9066)

FirebaseAuth/Sources/Auth/FIRAuth.m

@@ -420,6 +420,12 @@ @implementation FIRAuth {
           UIApplicationDidEnterBackgroundNotification.
    */
   id<NSObject> _applicationDidEnterBackgroundObserver;
+
+  /** @var _protectedDataDidBecomeAvailableObserver
+      @brief An opaque object to act as the observer for
+     UIApplicationProtectedDataDidBecomeAvailable.
+   */
+  id<NSObject> _protectedDataDidBecomeAvailableObserver;
 }
 
 + (void)load {
@@ -485,65 +491,107 @@ - (nullable instancetype)initWithAPIKey:(NSString *)APIKey
     _firebaseAppName = [appName copy];
 #if TARGET_OS_IOS
     _settings = [[FIRAuthSettings alloc] init];
+
+    [GULAppDelegateSwizzler proxyOriginalDelegateIncludingAPNSMethods];
+    [GULSceneDelegateSwizzler proxyOriginalSceneDelegate];
+#endif  // TARGET_OS_IOS
+
+#if TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_MACCATALYST
     static Class applicationClass = nil;
     // iOS App extensions should not call [UIApplication sharedApplication], even if UIApplication
     // responds to it.
     if (![GULAppEnvironmentUtil isAppExtension]) {
       Class cls = NSClassFromString(@"UIApplication");
-      if (cls && [cls respondsToSelector:NSSelectorFromString(@"sharedApplication")]) {
+      if (cls && [cls respondsToSelector:@selector(sharedApplication)]) {
         applicationClass = cls;
       }
     }
     UIApplication *application = [applicationClass sharedApplication];
-
-    [GULAppDelegateSwizzler proxyOriginalDelegateIncludingAPNSMethods];
-    [GULSceneDelegateSwizzler proxyOriginalSceneDelegate];
-#endif  // TARGET_OS_IOS
-
-    // Continue with the rest of initialization in the work thread.
-    __weak FIRAuth *weakSelf = self;
-    dispatch_async(FIRAuthGlobalWorkQueue(), ^{
-      // Load current user from Keychain.
-      FIRAuth *strongSelf = weakSelf;
-      if (!strongSelf) {
-        return;
-      }
-      NSString *keychainServiceName =
-          [FIRAuth keychainServiceNameForAppName:strongSelf->_firebaseAppName];
-      if (keychainServiceName) {
-        strongSelf->_keychainServices =
-            [[FIRAuthKeychainServices alloc] initWithService:keychainServiceName];
-        strongSelf.storedUserManager =
-            [[FIRAuthStoredUserManager alloc] initWithServiceName:keychainServiceName];
+    if ([application respondsToSelector:@selector(isProtectedDataAvailable)]) {
+      if ([application isProtectedDataAvailable]) {
+        [self protectedDataInitialization];
+      } else {
+        // Add listener for UIApplicationProtectedDataDidBecomeAvailable.
+        self->_protectedDataDidBecomeAvailableObserver = [[NSNotificationCenter defaultCenter]
+            addObserverForName:UIApplicationProtectedDataDidBecomeAvailable
+                        object:nil
+                         queue:nil
+                    usingBlock:^(NSNotification *notification) {
+                      [self protectedDataInitialization];
+                    }];
       }
+    } else {
+      [self protectedDataInitialization];
+    }
+#else
+    [self protectedDataInitialization];
+#endif  // TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_MACCATALYST
+  }
+  return self;
+}
 
-      NSError *error;
-      NSString *storedUserAccessGroup =
-          [strongSelf.storedUserManager getStoredUserAccessGroupWithError:&error];
-      if (!error) {
-        if (!storedUserAccessGroup) {
-          FIRUser *user;
-          if ([strongSelf getUser:&user error:&error]) {
-            strongSelf.tenantID = user.tenantID;
-            [strongSelf updateCurrentUser:user byForce:NO savingToDisk:NO error:&error];
-            self->_lastNotifiedUserToken = user.rawAccessToken;
-          } else {
-            FIRLogError(kFIRLoggerAuth, @"I-AUT000001",
-                        @"Error loading saved user when starting up: %@", error);
-          }
+- (void)protectedDataInitialization {
+#if TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_MACCATALYST
+  [[NSNotificationCenter defaultCenter] removeObserver:_protectedDataDidBecomeAvailableObserver
+                                                  name:UIApplicationProtectedDataDidBecomeAvailable
+                                                object:nil];
+#endif  // TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_MACCATALYST
+  // Continue with the rest of initialization in the work thread.
+  __weak FIRAuth *weakSelf = self;
+  dispatch_async(FIRAuthGlobalWorkQueue(), ^{
+    // Load current user from Keychain.
+    FIRAuth *strongSelf = weakSelf;
+    if (!strongSelf) {
+      return;
+    }
+    NSString *keychainServiceName =
+        [FIRAuth keychainServiceNameForAppName:strongSelf->_firebaseAppName];
+    if (keychainServiceName) {
+      strongSelf->_keychainServices =
+          [[FIRAuthKeychainServices alloc] initWithService:keychainServiceName];
+      strongSelf.storedUserManager =
+          [[FIRAuthStoredUserManager alloc] initWithServiceName:keychainServiceName];
+    }
+
+    NSError *error;
+    NSString *storedUserAccessGroup =
+        [strongSelf.storedUserManager getStoredUserAccessGroupWithError:&error];
+    if (!error) {
+      if (!storedUserAccessGroup) {
+        FIRUser *user;
+        if ([strongSelf getUser:&user error:&error]) {
+          strongSelf.tenantID = user.tenantID;
+          [strongSelf updateCurrentUser:user byForce:NO savingToDisk:NO error:&error];
+          self->_lastNotifiedUserToken = user.rawAccessToken;
         } else {
-          [strongSelf internalUseUserAccessGroup:storedUserAccessGroup error:&error];
-          if (error) {
-            FIRLogError(kFIRLoggerAuth, @"I-AUT000001",
-                        @"Error loading saved user when starting up: %@", error);
-          }
+          FIRLogError(kFIRLoggerAuth, @"I-AUT000001",
+                      @"Error loading saved user when starting up: %@", error);
         }
       } else {
-        FIRLogError(kFIRLoggerAuth, @"I-AUT000001",
-                    @"Error loading saved user when starting up: %@", error);
+        [strongSelf internalUseUserAccessGroup:storedUserAccessGroup error:&error];
+        if (error) {
+          FIRLogError(kFIRLoggerAuth, @"I-AUT000001",
+                      @"Error loading saved user when starting up: %@", error);
+        }
       }
+    } else {
+      FIRLogError(kFIRLoggerAuth, @"I-AUT000001", @"Error loading saved user when starting up: %@",
+                  error);
+    }
 
 #if TARGET_OS_IOS
+    static Class applicationClass = nil;
+    // iOS App extensions should not call [UIApplication sharedApplication], even if UIApplication
+    // responds to it.
+    if (![GULAppEnvironmentUtil isAppExtension]) {
+      Class cls = NSClassFromString(@"UIApplication");
+      if (cls && [cls respondsToSelector:@selector(sharedApplication)]) {
+        applicationClass = cls;
+      }
+    }
+    UIApplication *application = [applicationClass sharedApplication];
+
+    if (application) {
       // Initialize for phone number auth.
       strongSelf->_tokenManager = [[FIRAuthAPNSTokenManager alloc] initWithApplication:application];
 
@@ -553,17 +601,16 @@ - (nullable instancetype)initWithAPIKey:(NSString *)APIKey
       strongSelf->_notificationManager = [[FIRAuthNotificationManager alloc]
            initWithApplication:application
           appCredentialManager:strongSelf->_appCredentialManager];
+    }
 
-      [GULAppDelegateSwizzler registerAppDelegateInterceptor:strongSelf];
+    [GULAppDelegateSwizzler registerAppDelegateInterceptor:strongSelf];
 #if ((TARGET_OS_IOS || TARGET_OS_TV) && (__IPHONE_OS_VERSION_MAX_ALLOWED >= 130000))
-      if (@available(iOS 13, tvos 13, *)) {
-        [GULSceneDelegateSwizzler registerSceneDelegateInterceptor:strongSelf];
-      }
+    if (@available(iOS 13, tvos 13, *)) {
+      [GULSceneDelegateSwizzler registerSceneDelegateInterceptor:strongSelf];
+    }
 #endif  // ((TARGET_OS_IOS || TARGET_OS_TV) && (__IPHONE_OS_VERSION_MAX_ALLOWED >= 130000))
 #endif  // TARGET_OS_IOS
-    });
-  }
-  return self;
+  });
 }
 
 - (void)dealloc {

FirebaseCore/Internal/Sources/HeartbeatLogging/HeartbeatController.swift

@@ -22,7 +22,6 @@ public final class HeartbeatController {
   private let heartbeatsStorageCapacity: Int = 30
   /// Current date provider. It is used for testability.
   private let dateProvider: () -> Date
-  // TODO: Maybe share config with HeartbeatsPayload's DateFormatter?
   /// Used for standardizing dates for calendar-day comparision.
   static let dateStandardizer: (Date) -> (Date) = {
     var calendar = Calendar(identifier: .iso8601)

FirebaseCore/Internal/Sources/HeartbeatLogging/HeartbeatStorage.swift

@@ -90,7 +90,9 @@ final class HeartbeatStorage: HeartbeatStorageProtocol {
 
   // MARK: - HeartbeatStorageProtocol
 
-  // TODO: Document.
+  /// Synchronously reads from and writes to storage using the given transform block.
+  /// - Parameter transform: A block to transform the currently stored heartbeats bundle to a new
+  /// heartbeats bundle value.
   func readAndWriteSync(using transform: (HeartbeatsBundle?) -> HeartbeatsBundle?) {
     queue.sync {
       let oldHeartbeatsBundle = try? load(from: storage)

FirebaseCore/Internal/Sources/HeartbeatLogging/StorageFactory.swift

@@ -32,7 +32,10 @@ extension FileStorage: StorageFactory {
   static func makeStorage(id: String) -> Storage {
     let rootDirectory = FileManager.default.applicationSupportDirectory
     let heartbeatDirectoryPath = Constants.heartbeatFileStorageDirectoryPath
-    let heartbeatFilePath = "heartbeats-\(id)"
+
+    // Sanitize the `id` so the heartbeat file name does not include a ":".
+    let sanitizedID = id.replacingOccurrences(of: ":", with: "_")
+    let heartbeatFilePath = "heartbeats-\(sanitizedID)"
 
     let storageURL = rootDirectory
       .appendingPathComponent(heartbeatDirectoryPath, isDirectory: true)

FirebaseCore/Internal/Tests/Integration/HeartbeatLoggingIntegrationTests.swift

@@ -364,4 +364,30 @@ class HeartbeatLoggingIntegrationTests: XCTestCase {
       XCTAssertNotNil(try Data(contentsOf: heartbeatsFileURL), "Data should not be nil.")
     #endif
   }
+
+  #if !os(tvOS)
+    // Do not run on tvOS because tvOS uses UserDefaults to store heartbeats.
+    func testControllerCreatesHeartbeatStorageWithSanitizedFileName() throws {
+      // Given
+      let appID = "1:123456789000:ios:abcdefghijklmnop"
+      let sanitizedAppID = appID.replacingOccurrences(of: ":", with: "_")
+      let controller = HeartbeatController(id: appID)
+      // When
+      // - Trigger the controller to write to the file system.
+      controller.log("dummy_agent")
+      _ = XCTWaiter.wait(for: [expectation(description: "Wait for async log.")], timeout: 0.1)
+      // Then
+      let heartbeatsDirectoryURL = FileManager.default
+        .applicationSupportDirectory
+        .appendingPathComponent(
+          HeartbeatLoggingTestUtils.Constants.heartbeatFileStorageDirectoryPath,
+          isDirectory: true
+        )
+
+      let directoryContents = try FileManager.default
+        .contentsOfDirectory(atPath: heartbeatsDirectoryURL.path)
+
+      XCTAssertEqual(directoryContents, ["heartbeats-\(sanitizedAppID)"])
+    }
+  #endif // !os(tvOS)
 }

FirebaseCrashlytics.podspec

@@ -55,7 +55,7 @@ Pod::Spec.new do |s|
 
   s.dependency 'FirebaseCore', '~> 9.0'
   s.dependency 'FirebaseInstallations', '~> 9.0'
-  s.dependency 'PromisesObjC', '~> 2.0'
+  s.dependency 'PromisesObjC', '~> 2.1'
   s.dependency 'GoogleDataTransport', '~> 9.1'
   s.dependency 'GoogleUtilities/Environment', '~> 7.7'
   s.dependency 'nanopb', '~> 2.30908.0'

FirebaseDatabase.podspec

@@ -78,6 +78,7 @@ Simplify your iOS development, grow your user base, and monetize more effectivel
   s.test_spec 'integration' do |int_tests|
     int_tests.platforms = {:ios => ios_deployment_target, :osx => osx_deployment_target, :tvos => tvos_deployment_target}
     int_tests.scheme = { :code_coverage => true }
+    int_tests.requires_app_host = true
     int_tests.source_files = [
       'FirebaseDatabase/Tests/Integration/*.[mh]',
       'FirebaseDatabase/Tests/Helpers/*.[mh]',