Merge github.com:firebase/firebase-ios-sdk

Author: mikeger

.github/ISSUE_TEMPLATE/bug_report.md

@@ -25,9 +25,8 @@ template_path=.github/ISSUE_TEMPLATE/bug_report.md
 
   * Xcode version: _____
   * Firebase SDK version: _____
-  * Firebase Component: _____ (Auth, Core, Database, Firestore, Messaging, Storage, etc)
-  * Component version: _____
   * Installation method: `CocoaPods | Carthage | Zip file | Swift Package Manager` (select one)
+  * Firebase Component: _____ (Auth, Core, Database, Firestore, Messaging, Storage, etc)
 
 ### [REQUIRED] Step 2: Describe the problem
 

.github/workflows/check.yml

@@ -4,6 +4,8 @@ on:
   pull_request:
     paths-ignore:
       - 'Firestore/**'
+  push:
+    branches: master
 
 jobs:
   check:

.github/workflows/firestore.yml

@@ -196,6 +196,7 @@ jobs:
     # Don't run on private repo unless it is a PR.
     if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
     runs-on: macOS-latest
+    needs: check
     steps:
     - uses: actions/checkout@v2
     - name: Xcode 12
@@ -205,7 +206,7 @@ jobs:
     - name: iOS Build Test
       run: scripts/third_party/travis/retry.sh ./scripts/build.sh FirebaseFirestore iOS spmbuildonly
     - name: Swift Build
-      run: scripts/third_party/travis/retry.sh ./scripts/build.sh FirebaseFirestoreSwift iOS spmbuildonly
+      run: scripts/third_party/travis/retry.sh ./scripts/build.sh FirebaseFirestoreSwift-Beta iOS spmbuildonly
 
   spm-cron:
     # Don't run on private repo.
@@ -223,7 +224,7 @@ jobs:
     - name: Build Test
       run: scripts/third_party/travis/retry.sh ./scripts/build.sh FirebaseFirestore ${{ matrix.target }} spmbuildonly
     - name: Swift Build
-      run: scripts/third_party/travis/retry.sh ./scripts/build.sh FirebaseFirestoreSwift ${{ matrix.target }} spmbuildonly
+      run: scripts/third_party/travis/retry.sh ./scripts/build.sh FirebaseFirestoreSwift-Beta ${{ matrix.target }} spmbuildonly
 
 # Restore when FirebaseUI works with Firebase 7 (#6646)
   quickstart:

.github/workflows/storage.yml

@@ -54,7 +54,7 @@ jobs:
     - name: iOS Unit Tests
       run: scripts/third_party/travis/retry.sh ./scripts/build.sh StorageUnit iOS spm
     - name: Swift Build
-      run: scripts/third_party/travis/retry.sh ./scripts/build.sh FirebaseStorageSwift iOS spmbuildonly
+      run: scripts/third_party/travis/retry.sh ./scripts/build.sh FirebaseStorageSwift-Beta iOS spmbuildonly
 
   spm-cron:
     # Don't run on private repo.
@@ -72,7 +72,7 @@ jobs:
     - name: Unit Tests
       run: scripts/third_party/travis/retry.sh ./scripts/build.sh StorageUnit ${{ matrix.target }} spm
     - name: Swift Build
-      run: scripts/third_party/travis/retry.sh ./scripts/build.sh FirebaseStorageSwift ${{ matrix.target }} spmbuildonly
+      run: scripts/third_party/travis/retry.sh ./scripts/build.sh FirebaseStorageSwift-Beta ${{ matrix.target }} spmbuildonly
 
   catalyst:
     # Don't run on private repo unless it is a PR.

Crashlytics/CHANGELOG.md

@@ -1,5 +1,6 @@
 # Unreleased
 - [fixed] Fixed an issue where symbol uploads would fail when there are spaces in the project path, particularly in Unity builds (#6789).
+- [changed] Added additional logging when settings requests fail with a 404 status to help customers debug onboarding issues (#6847).
 
 # v4.6.2
 

Crashlytics/Crashlytics/Settings/FIRCLSSettingsOnboardingManager.m

@@ -181,7 +181,15 @@ - (void)onboardingOperation:(FIRCLSOnboardingOperation *)operation
 - (void)operation:(FIRCLSDownloadAndSaveSettingsOperation *)operation
     didDownloadAndSaveSettingsWithError:(nullable NSError *)error {
   if (error) {
-    FIRCLSErrorLog(@"Failed to download settings %@", error);
+    NSString *message = @"Failed to download settings.";
+    if (error.userInfo && [error.userInfo objectForKey:@"status_code"] &&
+        [[error.userInfo objectForKey:@"status_code"]
+            isEqualToNumber:[NSNumber numberWithInt:404]]) {
+      NSString *debugHint = @"If this is your first time launching the app, make sure you have "
+                            @"enabled Crashlytics in the Firebase Console.";
+      message = [NSString stringWithFormat:@"%@ %@", message, debugHint];
+    }
+    FIRCLSErrorLog(@"%@ %@", message, error);
     [self finishNetworkingSession];
     return;
   }

FirebaseDynamicLinks/Sources/FIRDynamicLinks.m

@@ -509,9 +509,22 @@ - (BOOL)handleIncomingCustomSchemeDeepLink:(NSURL *)url {
 }
 
 - (void)passRetrievedDynamicLinkToApplication:(NSURL *)url {
+  id<UIApplicationDelegate> applicationDelegate = [UIApplication sharedApplication].delegate;
+  if ([self isOpenUrlMethodPresentInAppDelegate:applicationDelegate]) {
+    // pass url directly to application delegate to avoid hop into
+    // iOS handling of the universal links
+    [applicationDelegate application:[UIApplication sharedApplication] openURL:url options:@{}];
+    return;
+  }
+
   [[UIApplication sharedApplication] openURL:url options:@{} completionHandler:nil];
 }
 
+- (BOOL)isOpenUrlMethodPresentInAppDelegate:(id<UIApplicationDelegate>)applicationDelegate {
+  return applicationDelegate &&
+         [applicationDelegate respondsToSelector:@selector(application:openURL:options:)];
+}
+
 - (void)handlePendingDynamicLinkRetrievalFailureWithErrorCode:(NSInteger)errorCode
                                              errorDescription:(NSString *)errorDescription
                                               underlyingError:(nullable NSError *)underlyingError {

FirebaseDynamicLinks/Tests/Sample/Podfile

@@ -1,14 +1,10 @@
-# Uncomment the next line to define a global platform for your project
-# platform :ios, '9.0'
-
 target 'FDLBuilderTestAppObjC' do
-  # Comment the next line if you don't want to use dynamic frameworks
+  platform :ios, '10.0'
   use_frameworks!
-  pod 'FirebaseAnalytics'
+
   pod 'FirebaseCore', :path => '../../../'
-  pod 'FirebaseInstallations', :path => '../../../'
-  pod 'FirebaseInstanceID', :path => '../../../'
-  pod 'FirebaseDynamicLinks', :path => '../../../'
+  pod 'FirebaseCoreDiagnostics', :path => '../../../'
+  pod 'GoogleDataTransport', :path => '../../../'
   pod 'GoogleUtilities', :path => '../../../'
-
+  pod 'FirebaseDynamicLinks', :path => '../../../'
 end

FirebaseDynamicLinks/Tests/Unit/FIRDynamicLinksTest.m

@@ -79,6 +79,8 @@ - (BOOL)setUpWithLaunchOptions:(nullable NSDictionary *)launchOptions
                      urlScheme:(nullable NSString *)urlScheme
                   userDefaults:(nullable NSUserDefaults *)userDefaults;
 - (BOOL)canParseUniversalLinkURL:(nullable NSURL *)url;
+- (void)passRetrievedDynamicLinkToApplication:(NSURL *)url;
+- (BOOL)isOpenUrlMethodPresentInAppDelegate:(id<UIApplicationDelegate>)applicationDelegate;
 @end
 
 @interface FakeShortLinkResolver : FIRDynamicLinkNetworking
@@ -1119,7 +1121,7 @@ - (void)test_retrievePendingDeepLinkShouldSetkFIRDLOpenURLKeyRegardlessOfFailure
                                 apiKey:kAPIKey
                              urlScheme:nil
                           userDefaults:[NSUserDefaults standardUserDefaults]];
-  FIRDynamicLinks<FIRDLRetrievalProcessDelegate> *deleagte =
+  FIRDynamicLinks<FIRDLRetrievalProcessDelegate> *delegate =
       (FIRDynamicLinks<FIRDLRetrievalProcessDelegate> *)self.service;
 
   // Error Result to pass
@@ -1131,13 +1133,36 @@ - (void)test_retrievePendingDeepLinkShouldSetkFIRDLOpenURLKeyRegardlessOfFailure
 
   FIRDLDefaultRetrievalProcessV2 *defaultRetrievalProcess = [FIRDLDefaultRetrievalProcessV2 alloc];
 
-  [deleagte retrievalProcess:defaultRetrievalProcess completedWithResult:result];
+  [delegate retrievalProcess:defaultRetrievalProcess completedWithResult:result];
 
   NSString *kFIRDLOpenURLKey = @"com.google.appinvite.openURL";
   XCTAssertEqual([[NSUserDefaults standardUserDefaults] boolForKey:kFIRDLOpenURLKey], YES,
                  @"kFIRDLOpenURL key should be set regardless of failures");
 }
 
+- (void)test_passRetrievedDynamicLinkToApplicationDelegatesProperly {
+  // Creating ApplicationDelegate partial mock object.
+  id applicationDelegate = OCMPartialMock([UIApplication sharedApplication].delegate);
+  // Creating FIRDynamicLinks partial mock object.
+  id firebaseDynamicLinks = OCMPartialMock(self.service);
+  // Stubbing Application delegate to return YES when application:openURL:options method is called.
+  // Not sure why this is required as we are not concerned about its return, but without this, the
+  // test will throw NSInvalidArgumentException with message "unrecognized selector sent to
+  // instance".
+  OCMStub([applicationDelegate application:[OCMArg any] openURL:[OCMArg any] options:[OCMArg any]])
+      .andReturn(YES);
+  // Stubbing firebase dynamiclinks instance to return YES when isOpenUrlMethodPresentInAppDelegate
+  // is called.
+  OCMStub([firebaseDynamicLinks isOpenUrlMethodPresentInAppDelegate:[OCMArg any]]).andReturn(YES);
+
+  // Executing the function with a URL.
+  NSURL *url = [NSURL URLWithString:@"http://www.google.com"];
+  [firebaseDynamicLinks passRetrievedDynamicLinkToApplication:url];
+
+  // Verifying the application:openURL:options method is called in AppDelegate.
+  OCMVerify([applicationDelegate application:[OCMArg any] openURL:url options:[OCMArg any]]);
+}
+
 #pragma mark - Self-diagnose tests
 
 - (void)testSelfDiagnoseWithNilCompletion {

FirebaseFirestore.podspec

@@ -72,7 +72,7 @@ Google Cloud Firestore is a NoSQL document database built for automatic scaling,
   s.dependency 'leveldb-library', '~> 1.22'
   s.dependency 'nanopb', '~> 2.30906.0'
 
-  s.ios.frameworks = 'MobileCoreServices', 'SystemConfiguration', 'UIKit'
+  s.ios.frameworks = 'SystemConfiguration', 'UIKit'
   s.osx.frameworks = 'SystemConfiguration'
   s.tvos.frameworks = 'SystemConfiguration', 'UIKit'
 

FirebaseRemoteConfig.podspec

@@ -54,6 +54,7 @@ app update.
 #        'FirebaseRemoteConfig/Tests/Unit/RCNConfigTest.m',
         'FirebaseRemoteConfig/Tests/Unit/RCNConfigExperimentTest.m',
         'FirebaseRemoteConfig/Tests/Unit/RCNConfigValueTest.m',
+        'FirebaseRemoteConfig/Tests/Unit/RCNPersonalizationTest.m',
 #        'FirebaseRemoteConfig/Tests/Unit/RCNRemoteConfig+FIRAppTest.m',
         'FirebaseRemoteConfig/Tests/Unit/RCNRemoteConfigTest.m',
 #        'FirebaseRemoteConfig/Tests/Unit/RCNThrottlingTests.m',

FirebaseRemoteConfig/CHANGELOG.md

@@ -1,3 +1,6 @@
+# v7.1.0
+- [changed] Add support for other Firebase products to integrate with Remote Config. (#6692)
+
 # v7.0.0
 - [changed] Updated `lastFetchTime` field to readonly. (#6567)
 - [changed] Functionally neutral change to stop using a deprecated method in the AB Testing API. (#6543)

FirebaseRemoteConfig/Sources/FIRRemoteConfig.m

@@ -28,6 +28,7 @@
 #import "FirebaseRemoteConfig/Sources/RCNConfigExperiment.h"
 #import "FirebaseRemoteConfig/Sources/RCNConfigValue_Internal.h"
 #import "FirebaseRemoteConfig/Sources/RCNDevice.h"
+#import "FirebaseRemoteConfig/Sources/RCNPersonalization.h"
 
 /// Remote Config Error Domain.
 /// TODO: Rename according to obj-c style for constants.
@@ -39,6 +40,9 @@
 /// Timeout value for waiting on a fetch response.
 static NSString *const kRemoteConfigFetchTimeoutKey = @"_rcn_fetch_timeout";
 
+/// Listener for the get methods.
+typedef void (^FIRRemoteConfigListener)(NSString *_Nonnull, NSDictionary *_Nonnull);
+
 @implementation FIRRemoteConfigSettings
 
 - (instancetype)init {
@@ -61,6 +65,7 @@ @implementation FIRRemoteConfig {
   RCNConfigExperiment *_configExperiment;
   dispatch_queue_t _queue;
   NSString *_appName;
+  NSMutableArray *_listeners;
 }
 
 static NSMutableDictionary<NSString *, NSMutableDictionary<NSString *, FIRRemoteConfig *> *>
@@ -154,6 +159,15 @@ - (instancetype)initWithAppName:(NSString *)appName
                                                    options:options];
 
     [_settings loadConfigFromMetadataTable];
+
+    if (analytics) {
+      _listeners = [[NSMutableArray alloc] init];
+      RCNPersonalization *personalization =
+          [[RCNPersonalization alloc] initWithAnalytics:analytics];
+      [self addListener:^(NSString *key, NSDictionary *config) {
+        [personalization logArmActive:key config:config];
+      }];
+    }
   }
   return self;
 }
@@ -185,6 +199,24 @@ - (void)ensureInitializedWithCompletionHandler:
   });
 }
 
+/// Adds a listener that will be called whenever one of the get methods is called.
+/// @param listener Function that takes in the parameter key and the config.
+- (void)addListener:(nonnull FIRRemoteConfigListener)listener {
+  @synchronized(_listeners) {
+    [_listeners addObject:listener];
+  }
+}
+
+- (void)callListeners:(NSString *)key config:(NSDictionary *)config {
+  @synchronized(_listeners) {
+    for (FIRRemoteConfigListener listener in _listeners) {
+      dispatch_async(_queue, ^{
+        listener(key, config);
+      });
+    }
+  }
+}
+
 #pragma mark - fetch
 
 - (void)fetchWithCompletionHandler:(FIRRemoteConfigFetchCompletion)completionHandler {
@@ -279,6 +311,7 @@ - (void)activateWithCompletion:(FIRRemoteConfigActivateChangeCompletion)completi
                                       forNamespace:self->_FIRNamespace];
     strongSelf->_settings.lastApplyTimeInterval = [[NSDate date] timeIntervalSince1970];
     FIRLogDebug(kFIRLoggerRemoteConfig, @"I-RCN000069", @"Config activated.");
+    [strongSelf->_configContent activatePersonalization];
     [strongSelf->_configExperiment updateExperimentsWithHandler:^(NSError *_Nullable error) {
       if (completion) {
         dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
@@ -321,6 +354,8 @@ - (FIRRemoteConfigValue *)configValueForKey:(NSString *)key {
                     @"Key %@ should come from source:%zd instead coming from source: %zd.", key,
                     (long)FIRRemoteConfigSourceRemote, (long)value.source);
       }
+      [self callListeners:key
+                   config:[self->_configContent getConfigAndMetadataForNamespace:FQNamespace]];
       return;
     }
     value = self->_configContent.defaultConfig[FQNamespace][key];

FirebaseRemoteConfig/Sources/RCNConfigConstants.h

@@ -35,6 +35,8 @@ static const char *RCNRemoteConfigQueueLabel = "com.google.GoogleConfigService.F
 static NSString *const RCNFetchResponseKeyEntries = @"entries";
 /// Key that includes data for experiment descriptions in ABT.
 static NSString *const RCNFetchResponseKeyExperimentDescriptions = @"experimentDescriptions";
+/// Key that includes data for Personalization metadata.
+static NSString *const RCNFetchResponseKeyPersonalizationMetadata = @"personalizationMetadata";
 /// Error key.
 static NSString *const RCNFetchResponseKeyError = @"error";
 /// Error code.

FirebaseRemoteConfig/Sources/RCNConfigContent.h

@@ -57,4 +57,10 @@ typedef NS_ENUM(NSInteger, RCNDBSource) {
                   toSource:(RCNDBSource)source
               forNamespace:(NSString *)FIRNamespace;
 
+/// Sets the fetched Personalization metadata to active.
+- (void)activatePersonalization;
+
+/// Gets the active config and Personalization metadata.
+- (NSDictionary *)getConfigAndMetadataForNamespace:(NSString *)FIRNamespace;
+
 @end