Revert "Migrate from using IID SDK for Remote Config to the new FIS SDK (#5096)" (#5156)

maksymmalyhin · web-flow · commit 230d56260f04 · 2020-03-19T19:02:50.000-04:00
This reverts commit 887ff82.
diff --git a/FirebaseRemoteConfig.podspec b/FirebaseRemoteConfig.podspec
@@ -41,7 +41,7 @@ app update.
   s.dependency 'FirebaseAnalyticsInterop', '~> 1.4'
   s.dependency 'FirebaseABTesting', '~> 3.1'
   s.dependency 'FirebaseCore', '~> 6.2'
-  s.dependency 'FirebaseInstallations', '~> 1.1'
+  s.dependency 'FirebaseInstanceID', '~> 4.2'
   s.dependency 'GoogleUtilities/Environment', '~> 6.2'
   s.dependency 'GoogleUtilities/NSData+zlib', '~> 6.2'
   s.dependency 'Protobuf', '~> 3.9', '>= 3.9.2'
diff --git a/FirebaseRemoteConfig/CHANGELOG.md b/FirebaseRemoteConfig/CHANGELOG.md
@@ -1,5 +1,3 @@
-# v4.4.10
-- [changed] Internal code changes - migrate to using the FIS SDK. (#5096)
 # v4.4.9
 - [changed] Internal code changes. (#4934)
 # v4.4.8
diff --git a/FirebaseRemoteConfig/Sources/Private/RCNConfigSettings.h b/FirebaseRemoteConfig/Sources/Private/RCNConfigSettings.h
@@ -39,10 +39,10 @@
 @property(nonatomic, copy) NSString *secretToken;
 /// Device data version of checkin information.
 @property(nonatomic, copy) NSString *deviceDataVersion;
-/// InstallationsID.
-@property(nonatomic, copy) NSString *configInstallationsIdentifier;
-/// Installations token.
-@property(nonatomic, copy) NSString *configInstallationsToken;
+/// InstanceID.
+@property(nonatomic, copy) NSString *configInstanceID;
+/// InstanceID token.
+@property(nonatomic, copy) NSString *configInstanceIDToken;
 
 /// A list of successful fetch timestamps in milliseconds.
 /// TODO Not used anymore. Safe to remove.
diff --git a/FirebaseRemoteConfig/Sources/RCNConfigSettings.m b/FirebaseRemoteConfig/Sources/RCNConfigSettings.m
@@ -334,9 +334,9 @@ - (NSString *)nextRequestWithUserProperties:(NSDictionary *)userProperties {
   // Note: We only set user properties as mentioned in the new REST API Design doc
   NSString *ret = [NSString stringWithFormat:@"{"];
   ret = [ret stringByAppendingString:[NSString stringWithFormat:@"app_instance_id:'%@'",
-                                                                _configInstallationsIdentifier]];
+                                                                _configInstanceID]];
   ret = [ret stringByAppendingString:[NSString stringWithFormat:@", app_instance_id_token:'%@'",
-                                                                _configInstallationsToken]];
+                                                                _configInstanceIDToken]];
   ret = [ret stringByAppendingString:[NSString stringWithFormat:@", app_id:'%@'", _googleAppID]];
 
   ret = [ret stringByAppendingString:[NSString stringWithFormat:@", country_code:'%@'",
diff --git a/FirebaseRemoteConfig/Sources/RCNFetch.m b/FirebaseRemoteConfig/Sources/RCNFetch.m
@@ -16,10 +16,10 @@
 
 #import "FirebaseRemoteConfig/Sources/RCNConfigFetch.h"
 
-#import <FirebaseCore/FIRApp.h>
 #import <FirebaseCore/FIRLogger.h>
 #import <FirebaseCore/FIROptions.h>
-#import <FirebaseInstallations/FirebaseInstallations.h>
+#import <FirebaseInstanceID/FIRInstanceID+Private.h>
+#import <FirebaseInstanceID/FIRInstanceIDCheckinPreferences.h>
 #import <GoogleUtilities/GULNSData+zlib.h>
 #import "FirebaseRemoteConfig/Sources/Private/RCNConfigSettings.h"
 #import "FirebaseRemoteConfig/Sources/RCNConfigConstants.h"
@@ -40,6 +40,7 @@
 static NSString *const kServerURLQuery = @":fetch?";
 static NSString *const kServerURLKey = @"key=";
 static NSString *const kRequestJSONKeyAppID = @"app_id";
+static NSString *const kRequestJSONKeyAppInstanceID = @"app_instance_id";
 
 static NSString *const kHTTPMethodPost = @"POST";  ///< HTTP request method config fetch using
 static NSString *const kContentTypeHeaderName = @"Content-Type";  ///< HTTP Header Field Name
@@ -48,13 +49,13 @@
 static NSString *const kAcceptEncodingHeaderName = @"Accept-Encoding";  ///< HTTP Header Field Name
 static NSString *const kETagHeaderName = @"etag";                       ///< HTTP Header Field Name
 static NSString *const kIfNoneMatchETagHeaderName = @"if-none-match";   ///< HTTP Header Field Name
-static NSString *const kInstallationsAuthTokenHeaderName = @"x-goog-firebase-installations-auth";
 // Sends the bundle ID. Refer to b/130301479 for details.
 static NSString *const kiOSBundleIdentifierHeaderName =
     @"X-Ios-Bundle-Identifier";  ///< HTTP Header Field Name
 
 /// Config HTTP request content type proto buffer
 static NSString *const kContentTypeValueJSON = @"application/json";
+static NSString *const kInstanceIDScopeConfig = @"*";  /// InstanceID scope
 
 /// HTTP status codes. Ref: https://cloud.google.com/apis/design/errors#error_retries
 static NSInteger const kRCNFetchResponseHTTPStatusCodeOK = 200;
@@ -191,22 +192,18 @@ - (void)fetchConfigWithExpirationDuration:(NSTimeInterval)expirationDuration
                                          withError:error];
     }
     strongSelf->_settings.isFetchInProgress = YES;
-    [strongSelf refreshInstallationsTokenWithCompletionHandler:completionHandler];
+    [strongSelf refreshInstanceIDTokenAndFetchCheckInInfoWithCompletionHandler:completionHandler];
   });
 }
 
 #pragma mark - Fetch helpers
 
-- (NSString *)FIRAppNameFromFullyQualifiedNamespace {
-  return [[_FIRNamespace componentsSeparatedByString:@":"] lastObject];
-}
-/// Refresh installation ID token before fetching config. installation ID is now mandatory for fetch
+/// Refresh instance ID token before fetching config. Instance ID is now mandatory for fetch
 /// requests to work.(b/14751422).
-- (void)refreshInstallationsTokenWithCompletionHandler:
+- (void)refreshInstanceIDTokenAndFetchCheckInInfoWithCompletionHandler:
     (FIRRemoteConfigFetchCompletion)completionHandler {
-  FIRInstallations *installations = [FIRInstallations
-      installationsWithApp:[FIRApp appNamed:[self FIRAppNameFromFullyQualifiedNamespace]]];
-  if (!installations || !_options.GCMSenderID) {
+  FIRInstanceID *instanceID = [FIRInstanceID instanceID];
+  if (!_options.GCMSenderID) {
     NSString *errorDescription = @"Failed to get GCMSenderID";
     FIRLogError(kFIRLoggerRemoteConfig, @"I-RCN000074", @"%@",
                 [NSString stringWithFormat:@"%@", errorDescription]);
@@ -220,11 +217,10 @@ - (void)refreshInstallationsTokenWithCompletionHandler:
                                                     NSLocalizedDescriptionKey : errorDescription
                                                   }]];
   }
-  FIRInstallationsTokenHandler installationsTokenHandler = ^(
-      FIRInstallationsAuthTokenResult *tokenResult, NSError *error) {
-    if (!tokenResult || !tokenResult.authToken || error) {
+  FIRInstanceIDTokenHandler instanceIDHandler = ^(NSString *token, NSError *error) {
+    if (!token || error) {
       NSString *errorDescription =
-          [NSString stringWithFormat:@"Failed to get installations token. Error : %@.", error];
+          [NSString stringWithFormat:@"Failed to get InstanceID token. Error : %@.", error];
       FIRLogError(kFIRLoggerRemoteConfig, @"I-RCN000073", @"%@",
                   [NSString stringWithFormat:@"%@", errorDescription]);
       self->_settings.isFetchInProgress = NO;
@@ -238,21 +234,20 @@ - (void)refreshInstallationsTokenWithCompletionHandler:
                                                     }]];
     }
 
-    // We have a valid token. Get the backing installationID.
+    // If the token is available, try to get the instanceID.
     __weak RCNConfigFetch *weakSelf = self;
-    [installations installationIDWithCompletion:^(NSString *_Nullable identifier,
-                                                  NSError *_Nullable error) {
+    [instanceID getIDWithHandler:^(NSString *_Nullable identity, NSError *_Nullable error) {
       RCNConfigFetch *strongSelf = weakSelf;
 
       // Dispatch to the RC serial queue to update settings on the queue.
       dispatch_async(strongSelf->_lockQueue, ^{
         RCNConfigFetch *strongSelfQueue = weakSelf;
 
         // Update config settings with the IID and token.
-        strongSelfQueue->_settings.configInstallationsToken = tokenResult.authToken;
-        strongSelfQueue->_settings.configInstallationsIdentifier = identifier;
+        strongSelfQueue->_settings.configInstanceIDToken = [token copy];
+        strongSelfQueue->_settings.configInstanceID = identity;
 
-        if (!identifier || error) {
+        if (!identity || error) {
           NSString *errorDescription =
               [NSString stringWithFormat:@"Error getting iid : %@.", error];
           FIRLogError(kFIRLoggerRemoteConfig, @"I-RCN000055", @"%@",
@@ -270,23 +265,56 @@ - (void)refreshInstallationsTokenWithCompletionHandler:
         }
 
         FIRLogInfo(kFIRLoggerRemoteConfig, @"I-RCN000022", @"Success to get iid : %@.",
-                   strongSelfQueue->_settings.configInstallationsIdentifier);
-        [strongSelf
-            getAnalyticsUserPropertiesWithCompletionHandler:^(NSDictionary *userProperties) {
-              dispatch_async(strongSelf->_lockQueue, ^{
-                [strongSelf fetchWithUserProperties:userProperties
-                                  completionHandler:completionHandler];
-              });
-            }];
+                   strongSelfQueue->_settings.configInstanceID);
+
+        // Continue the fetch regardless of whether fetch of instance ID succeeded.
+        [strongSelfQueue fetchCheckinInfoWithCompletionHandler:completionHandler];
       });
     }];
   };
-
   FIRLogDebug(kFIRLoggerRemoteConfig, @"I-RCN000039", @"Starting requesting token.");
-  [installations authTokenWithCompletion:installationsTokenHandler];
+  // Note: We expect the GCMSenderID to always be available by the time this request is made.
+  [instanceID tokenWithAuthorizedEntity:_options.GCMSenderID
+                                  scope:kInstanceIDScopeConfig
+                                options:nil
+                                handler:instanceIDHandler];
+}
+
+/// Fetch checkin info before fetching config. Checkin info including device authentication ID,
+/// secret token and device data version are optional fields in config request.
+- (void)fetchCheckinInfoWithCompletionHandler:(FIRRemoteConfigFetchCompletion)completionHandler {
+  FIRInstanceID *instanceID = [FIRInstanceID instanceID];
+  __weak RCNConfigFetch *weakSelf = self;
+  [instanceID fetchCheckinInfoWithHandler:^(FIRInstanceIDCheckinPreferences *preferences,
+                                            NSError *error) {
+    RCNConfigFetch *fetchCheckinInfoWithHandlerSelf = weakSelf;
+    dispatch_async(fetchCheckinInfoWithHandlerSelf->_lockQueue, ^{
+      RCNConfigFetch *strongSelf = fetchCheckinInfoWithHandlerSelf;
+      if (error) {
+        FIRLogError(kFIRLoggerRemoteConfig, @"I-RCN000023", @"Failed to fetch checkin info: %@.",
+                    error);
+      } else {
+        strongSelf->_settings.deviceAuthID = preferences.deviceID;
+        strongSelf->_settings.secretToken = preferences.secretToken;
+        strongSelf->_settings.deviceDataVersion = preferences.deviceDataVersion;
+        if (strongSelf->_settings.deviceAuthID.length && strongSelf->_settings.secretToken.length) {
+          FIRLogInfo(kFIRLoggerRemoteConfig, @"I-RCN000024",
+                     @"Success to get device authentication ID: %@, security token: %@.",
+                     self->_settings.deviceAuthID, self->_settings.secretToken);
+        }
+      }
+      // Checkin info is optional, continue fetch config regardless fetch of checkin info
+      // succeeded.
+      [strongSelf fetchWithUserPropertiesCompletionHandler:^(NSDictionary *userProperties) {
+        dispatch_async(strongSelf->_lockQueue, ^{
+          [strongSelf fetchWithUserProperties:userProperties completionHandler:completionHandler];
+        });
+      }];
+    });
+  }];
 }
 
-- (void)getAnalyticsUserPropertiesWithCompletionHandler:
+- (void)fetchWithUserPropertiesCompletionHandler:
     (FIRAInteropUserPropertiesCallback)completionHandler {
   FIRLogDebug(kFIRLoggerRemoteConfig, @"I-RCN000060", @"Fetch with user properties completed.");
   id<FIRAnalyticsInterop> analytics = self->_analytics;
@@ -562,8 +590,6 @@ - (NSURLSessionDataTask *)URLSessionDataTaskWithContent:(NSData *)content
                                timeoutInterval:timeoutInterval];
   URLRequest.HTTPMethod = kHTTPMethodPost;
   [URLRequest setValue:kContentTypeValueJSON forHTTPHeaderField:kContentTypeHeaderName];
-  [URLRequest setValue:_settings.configInstallationsToken
-      forHTTPHeaderField:kInstallationsAuthTokenHeaderName];
   [URLRequest setValue:[[NSBundle mainBundle] bundleIdentifier]
       forHTTPHeaderField:kiOSBundleIdentifierHeaderName];
   [URLRequest setValue:@"gzip" forHTTPHeaderField:kContentEncodingHeaderName];
diff --git a/FirebaseRemoteConfig/Tests/Sample/Podfile b/FirebaseRemoteConfig/Tests/Sample/Podfile
@@ -7,6 +7,7 @@ target 'RemoteConfigSampleApp' do
   pod 'FirebaseAnalytics'
   pod 'FirebaseCore', :path => '../../../'
   pod 'FirebaseInstallations', :path => '../../../'
+  pod 'FirebaseInstanceID', :path => '../../../'
   pod 'FirebaseRemoteConfig', :path => '../../../'
 
   # Pods for RemoteConfigSampleApp
diff --git a/FirebaseRemoteConfig/Tests/Sample/RemoteConfigSampleApp/ViewController.m b/FirebaseRemoteConfig/Tests/Sample/RemoteConfigSampleApp/ViewController.m
@@ -17,7 +17,7 @@
 #import <FirebaseAnalytics/FirebaseAnalytics.h>
 #import <FirebaseCore/FIROptions.h>
 #import <FirebaseCore/FirebaseCore.h>
-#import <FirebaseInstallations/FirebaseInstallations.h>
+#import <FirebaseInstanceID/FIRInstanceID+Private.h>
 #import <FirebaseRemoteConfig/FIRRemoteConfig_Private.h>
 #import <FirebaseRemoteConfig/FirebaseRemoteConfig.h>
 #import "FRCLog.h"
@@ -355,19 +355,21 @@ - (void)printResult:(NSMutableString *)output {
                            stringWithFormat:@"%@\n",
                                             [self statusString:currentRCInstance.lastFetchStatus]]];
 
-  FIRInstallations *installations = [FIRInstallations installations];
-  [installations installationIDWithCompletion:^(NSString *_Nullable identifier,
-                                                NSError *_Nullable error) {
-    [output appendString:@"\n-----------Installation ID------------------\n"];
-    [output appendString:[NSString stringWithFormat:@"%@\n", identifier]];
+  FIRInstanceID *instanceID = [FIRInstanceID instanceID];
+  [instanceID getIDWithHandler:^(NSString *_Nullable identity, NSError *_Nullable error) {
+    [output appendString:@"\n-----------Instance ID------------------\n"];
+    [output appendString:[NSString stringWithFormat:@"%@\n", identity]];
 
-    [output appendString:@"\n-----------Installation ID token------------\n"];
+    [output appendString:@"\n-----------Instance ID token------------\n"];
+    [output
+        appendString:[NSString stringWithFormat:@"%@\n",
+                                                currentRCInstance.settings.configInstanceIDToken]];
 
-    [installations authTokenWithCompletion:^(FIRInstallationsAuthTokenResult *_Nullable tokenResult,
-                                             NSError *_Nullable error) {
-      [output appendString:[NSString stringWithFormat:@"%@\n", tokenResult.authToken]];
-      [[FRCLog sharedInstance] logToConsole:output];
-    }];
+    [output appendString:@"\n-----------Android ID------------\n"];
+    [output
+        appendString:[NSString stringWithFormat:@"%@\n", currentRCInstance.settings.deviceAuthID]];
+
+    [[FRCLog sharedInstance] logToConsole:output];
   }];
 }
 
@@ -407,28 +409,27 @@ - (NSString *)errorString:(FIRRemoteConfigError)error {
 }
 
 - (IBAction)fetchIIDButtonClicked:(id)sender {
-  FIRInstallations *installations =
-      [FIRInstallations installationsWithApp:[FIRApp appNamed:self.FIRAppName]];
-  [installations installationIDWithCompletion:^(NSString *_Nullable identifier,
-                                                NSError *_Nullable error) {
+  FIRInstanceID *instanceID = [FIRInstanceID instanceID];
+  FIRInstanceIDTokenHandler instanceIDHandler = ^(NSString *token, NSError *error) {
     if (error) {
       [[FRCLog sharedInstance] logToConsole:[NSString stringWithFormat:@"%@", error]];
-    } else {
-      [installations authTokenWithCompletion:^(
-                         FIRInstallationsAuthTokenResult *_Nullable tokenResult,
-                         NSError *_Nullable error) {
-        if (tokenResult.authToken) {
-          ((FIRRemoteConfig *)self.RCInstances[self.currentNamespace][self.FIRAppName])
-              .settings.configInstallationsToken = tokenResult.authToken;
-          [[FRCLog sharedInstance]
-              logToConsole:[NSString
-                               stringWithFormat:
-                                   @"Successfully got installation ID : \n\n%@\n\nToken : \n\n%@\n",
-                                   identifier, tokenResult.authToken]];
-        }
+    }
+    if (token) {
+      ((FIRRemoteConfig *)self.RCInstances[self.currentNamespace][self.FIRAppName])
+          .settings.configInstanceIDToken = token;
+      [instanceID getIDWithHandler:^(NSString *_Nullable identity, NSError *_Nullable error) {
+        [[FRCLog sharedInstance]
+            logToConsole:[NSString
+                             stringWithFormat:
+                                 @"Successfully getting InstanceID : \n\n%@\n\nToken : \n\n%@\n",
+                                 identity, token]];
       }];
     }
-  }];
+  };
+  [instanceID tokenWithAuthorizedEntity:[FIRApp appNamed:self.FIRAppName].options.GCMSenderID
+                                  scope:@"*"
+                                options:nil
+                                handler:instanceIDHandler];
 }
 
 - (IBAction)searchButtonClicked:(id)sender {
diff --git a/FirebaseRemoteConfig/Tests/Unit/RCNInstanceIDTest.m b/FirebaseRemoteConfig/Tests/Unit/RCNInstanceIDTest.m

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-# v4.4.10`
`2`		`-- [changed] Internal code changes - migrate to using the FIS SDK. (#5096)`
`3`	`1`	`# v4.4.9`
`4`	`2`	`- [changed] Internal code changes. (#4934)`
`5`	`3`	`# v4.4.8`