Firebase Installations: validation of FIROptions parameters

FirebaseCore/CHANGELOG.md

@@ -1,5 +1,6 @@
 # v6.6.0 -- M62
 - [changed] Reorganized directory structure.
+- [changed] [Firebase Installations](../FirebaseInstallations/CHANGELOG.md) throws an exception when there are missing required `FirebaseOptions` parameters (`APIKey`, `googleAppID`, and `projectID`). Please make sure your `GoogleServices-Info.plist` (or `FirebaseOptions` if you configure Firebase in code) are up to date. The file and settings can be downloaded from the [Firebase Console](https://console.firebase.google.com/). (#4683)
 - [changed] The following SDKs introduce a new transitive dependency on the [Firebase Installations API](https://console.cloud.google.com/apis/library/firebaseinstallations.googleapis.com):
   - Analytics
   - Cloud Messaging

FirebaseInstallations/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v1.1.0 -- M62.1
+
+- [changed] Throw an exception when there are missing required `FirebaseOptions` parameters (`APIKey`, `googleAppID`, and `projectID`). Please make sure your `GoogleServices-Info.plist` (or `FirebaseOptions` if you configure Firebase in code) are up to date. The file and settings can be downloaded from the [Firebase Console](https://console.firebase.google.com/).  (#4683)
+
 # v1.0.0 -- M62
 
 - [added] The Firebase Installations Service is an infrastructure service for Firebase services that creates unique identifiers and authentication tokens for Firebase clients (called "Firebase Installations") enabling Firebase Targeting, i.e. interoperation between Firebase services.

FirebaseInstallations/Source/Library/FIRInstallations.m

@@ -130,20 +130,24 @@ + (void)validateAppOptions:(FIROptions *)appOptions appName:(NSString *)appName
   if (appOptions.googleAppID.length < 1) {
     [missingFields addObject:@"`FirebaseOptions.googleAppID`"];
   }
-  if (appOptions.GCMSenderID.length < 1) {
-    [missingFields addObject:@"`FirebaseOptions.GCMSenderID`"];
+
+  // TODO(#4692): Check for `appOptions.projectID.length < 1` only.
+  // We can use `GCMSenderID` instead of `projectID` temporary.
+  if (appOptions.projectID.length < 1 && appOptions.GCMSenderID.length < 1) {
+    [missingFields addObject:@"`FirebaseOptions.projectID`"];
   }
 
   if (missingFields.count > 0) {
     [NSException
          raise:kFirebaseInstallationsErrorDomain
-        format:@"%@[%@] Could not configure Firebase Installations due to invalid FirebaseApp "
-               @"options. The following parameters are nil or empty: %@. If you use "
-               @"GoogleServices-Info.plist please download the most recent version from Firebase "
-               @"Console. If you configure Firebase in code, please make sure you specify all "
-               @"required parameters.",
-               kFIRLoggerInstallations, kFIRInstallationsMessageCodeInvalidFirebaseAppOptions,
-               [missingFields componentsJoinedByString:@", "]];
+        format:
+            @"%@[%@] Could not configure Firebase Installations due to invalid FirebaseApp "
+            @"options. The following parameters are nil or empty: %@. If you use "
+            @"GoogleServices-Info.plist please download the most recent version from the Firebase "
+            @"Console. If you configure Firebase in code, please make sure you specify all "
+            @"required parameters.",
+            kFIRLoggerInstallations, kFIRInstallationsMessageCodeInvalidFirebaseAppOptions,
+            [missingFields componentsJoinedByString:@", "]];
   }
 }
 

FirebaseInstallations/Source/Tests/Unit/FIRInstallationsTests.m

@@ -266,7 +266,18 @@ - (void)testInitWhenGoogleAppIDMissingThenThrows {
 - (void)testInitWhenGCMSenderIDMissingThenThrows {
   FIROptions *options = [self.appOptions copy];
   options.GCMSenderID = @"";
-  XCTAssertThrows([self createInstallationsWithAppOptions:options appName:@"emptyGCMSenderID"]);
+  XCTAssertNoThrow([self createInstallationsWithAppOptions:options appName:@"emptyGCMSenderID"]);
+}
+
+- (void)testInitWhenProjectIDAndGCMSenderIDMissingThenNoThrow {
+  FIROptions *options = [self.appOptions copy];
+  options.GCMSenderID = @"";
+
+  options.projectID = nil;
+  XCTAssertThrows([self createInstallationsWithAppOptions:options appName:@"missingProjectID"]);
+
+  options.projectID = @"";
+  XCTAssertThrows([self createInstallationsWithAppOptions:options appName:@"emptyProjectID"]);
 }
 
 - (void)testInitWhenAppNameMissingThenThrows {