Revert "Realtime rc no change (#10188)" (#10346)

qdpham13 · web-flow · commit 563232cd819d · 2022-10-13T10:27:26.000-07:00
This reverts commit abe7939. In part of implementing a different solution.
diff --git a/FirebaseRemoteConfig/Sources/FIRRemoteConfig.m b/FirebaseRemoteConfig/Sources/FIRRemoteConfig.m
@@ -250,8 +250,7 @@ - (void)fetchWithExpirationDuration:(NSTimeInterval)expirationDuration
     completionHandlerCopy = [completionHandler copy];
   }
   [_configFetch fetchConfigWithExpirationDuration:expirationDuration
-                                completionHandler:completionHandlerCopy
-                     excludeEtagHeaderForRealtime:false];
+                                completionHandler:completionHandlerCopy];
 }
 
 #pragma mark - fetchAndActivate
diff --git a/FirebaseRemoteConfig/Sources/Private/RCNConfigFetch.h b/FirebaseRemoteConfig/Sources/Private/RCNConfigFetch.h
@@ -46,12 +46,9 @@ typedef void (^RCNConfigFetcherCompletion)(NSData *data, NSURLResponse *response
 
 /// Fetches config data keyed by namespace. Completion block will be called on the main queue.
 /// @param expirationDuration  Expiration duration, in seconds.
-/// @param excludeEtagHeaderForRealtime Needed for fetches from Realtime when an UPDATE response is
-/// required
 /// @param completionHandler   Callback handler.
 - (void)fetchConfigWithExpirationDuration:(NSTimeInterval)expirationDuration
-                        completionHandler:(FIRRemoteConfigFetchCompletion)completionHandler
-             excludeEtagHeaderForRealtime:(bool)excludeEtagHeaderForRealtime;
+                        completionHandler:(FIRRemoteConfigFetchCompletion)completionHandler;
 
 /// Add the ability to update NSURLSession's timeout after a session has already been created.
 - (void)recreateNetworkSession;
diff --git a/FirebaseRemoteConfig/Sources/RCNConfigFetch.m b/FirebaseRemoteConfig/Sources/RCNConfigFetch.m
@@ -127,8 +127,7 @@ - (void)dealloc {
 #pragma mark - Fetch Config API
 
 - (void)fetchConfigWithExpirationDuration:(NSTimeInterval)expirationDuration
-                        completionHandler:(FIRRemoteConfigFetchCompletion)completionHandler
-             excludeEtagHeaderForRealtime:(bool)excludeEtagHeaderForRealtime {
+                        completionHandler:(FIRRemoteConfigFetchCompletion)completionHandler {
   // Note: We expect the googleAppID to always be available.
   BOOL hasDeviceContextChanged =
       FIRRemoteConfigHasDeviceContextChanged(_settings.deviceContext, _options.googleAppID);
@@ -192,8 +191,7 @@ - (void)fetchConfigWithExpirationDuration:(NSTimeInterval)expirationDuration
                                          withError:error];
     }
     strongSelf->_settings.isFetchInProgress = YES;
-    [strongSelf refreshInstallationsTokenWithCompletionHandler:completionHandler
-                                  excludeEtagHeaderForRealtime:excludeEtagHeaderForRealtime];
+    [strongSelf refreshInstallationsTokenWithCompletionHandler:completionHandler];
   });
 }
 
@@ -205,8 +203,7 @@ - (NSString *)FIRAppNameFromFullyQualifiedNamespace {
 /// Refresh installation ID token before fetching config. installation ID is now mandatory for fetch
 /// requests to work.(b/14751422).
 - (void)refreshInstallationsTokenWithCompletionHandler:
-            (FIRRemoteConfigFetchCompletion)completionHandler
-                          excludeEtagHeaderForRealtime:(bool)excludeEtagHeaderForRealtime {
+    (FIRRemoteConfigFetchCompletion)completionHandler {
   FIRInstallations *installations = [FIRInstallations
       installationsWithApp:[FIRApp appNamed:[self FIRAppNameFromFullyQualifiedNamespace]]];
   if (!installations || !_options.GCMSenderID) {
@@ -286,8 +283,7 @@ - (void)refreshInstallationsTokenWithCompletionHandler:
 
         FIRLogInfo(kFIRLoggerRemoteConfig, @"I-RCN000022", @"Success to get iid : %@.",
                    strongSelfQueue->_settings.configInstallationsIdentifier);
-        [strongSelf doFetchCall:completionHandler
-            excludeEtagHeaderForRealtime:excludeEtagHeaderForRealtime];
+        [strongSelf doFetchCall:completionHandler];
       });
     }];
   };
@@ -296,13 +292,10 @@ - (void)refreshInstallationsTokenWithCompletionHandler:
   [installations authTokenWithCompletion:installationsTokenHandler];
 }
 
-- (void)doFetchCall:(FIRRemoteConfigFetchCompletion)completionHandler
-    excludeEtagHeaderForRealtime:(bool)excludeEtagHeaderForRealtime {
+- (void)doFetchCall:(FIRRemoteConfigFetchCompletion)completionHandler {
   [self getAnalyticsUserPropertiesWithCompletionHandler:^(NSDictionary *userProperties) {
     dispatch_async(self->_lockQueue, ^{
-      [self fetchWithUserProperties:userProperties
-                     completionHandler:completionHandler
-          excludeEtagHeaderForRealtime:excludeEtagHeaderForRealtime];
+      [self fetchWithUserProperties:userProperties completionHandler:completionHandler];
     });
   }];
 }
@@ -329,8 +322,7 @@ - (void)reportCompletionOnHandler:(FIRRemoteConfigFetchCompletion)completionHand
 }
 
 - (void)fetchWithUserProperties:(NSDictionary *)userProperties
-               completionHandler:(FIRRemoteConfigFetchCompletion)completionHandler
-    excludeEtagHeaderForRealtime:(bool)excludeEtagHeaderForRealtime {
+              completionHandler:(FIRRemoteConfigFetchCompletion)completionHandler {
   FIRLogDebug(kFIRLoggerRemoteConfig, @"I-RCN000061", @"Fetch with user properties initiated.");
 
   NSString *postRequestString = [_settings nextRequestWithUserProperties:userProperties];
@@ -523,10 +515,8 @@ - (void)fetchWithUserProperties:(NSDictionary *)userProperties
 
   FIRLogDebug(kFIRLoggerRemoteConfig, @"I-RCN000061", @"Making remote config fetch.");
 
-  NSURLSessionDataTask *dataTask =
-      [self URLSessionDataTaskWithContent:compressedContent
-                        completionHandler:fetcherCompletion
-             excludeEtagHeaderForRealtime:excludeEtagHeaderForRealtime];
+  NSURLSessionDataTask *dataTask = [self URLSessionDataTaskWithContent:compressedContent
+                                                     completionHandler:fetcherCompletion];
   [dataTask resume];
 }
 
@@ -566,8 +556,7 @@ - (NSURLSession *)newFetchSession {
 
 - (NSURLSessionDataTask *)URLSessionDataTaskWithContent:(NSData *)content
                                       completionHandler:
-                                          (RCNConfigFetcherCompletion)fetcherCompletion
-                           excludeEtagHeaderForRealtime:(bool)excludeEtagHeaderForRealtime {
+                                          (RCNConfigFetcherCompletion)fetcherCompletion {
   NSURL *URL = [NSURL URLWithString:[self constructServerURL]];
   FIRLogDebug(kFIRLoggerRemoteConfig, @"I-RCN000046", @"%@",
               [NSString stringWithFormat:@"Making config request: %@", [URL absoluteString]]);
@@ -586,7 +575,7 @@ - (NSURLSessionDataTask *)URLSessionDataTaskWithContent:(NSData *)content
   [URLRequest setValue:@"gzip" forHTTPHeaderField:kContentEncodingHeaderName];
   [URLRequest setValue:@"gzip" forHTTPHeaderField:kAcceptEncodingHeaderName];
   // Set the eTag from the last successful fetch, if available.
-  if (_settings.lastETag && !excludeEtagHeaderForRealtime) {
+  if (_settings.lastETag) {
     [URLRequest setValue:_settings.lastETag forHTTPHeaderField:kIfNoneMatchETagHeaderName];
   }
   [URLRequest setHTTPBody:content];
diff --git a/FirebaseRemoteConfig/Sources/RCNConfigRealtime.m b/FirebaseRemoteConfig/Sources/RCNConfigRealtime.m
@@ -420,10 +420,6 @@ - (void)fetchLatestConfig:(NSInteger)remainingAttempts targetVersion:(NSInteger)
         [strongSelf autoFetch:remainingAttempts - 1 targetVersion:targetVersion];
       }
     } else {
-      /// If the template version is it's default value, 0, then we need to exclude the Etag from
-      /// the fetch to get a response with the current template version.
-      bool excludeEtagHeaderForRealtime =
-          [[strongSelf->_configFetch templateVersionNumber] integerValue] == 0;
       [strongSelf->_configFetch
           fetchConfigWithExpirationDuration:0
                           completionHandler:^(FIRRemoteConfigFetchStatus status, NSError *error) {
@@ -455,8 +451,7 @@ - (void)fetchLatestConfig:(NSInteger)remainingAttempts targetVersion:(NSInteger)
                                         targetVersion:targetVersion];
                               }
                             }
-                          }
-               excludeEtagHeaderForRealtime:excludeEtagHeaderForRealtime];
+                          }];
     }
   });
 }
diff --git a/FirebaseRemoteConfig/Tests/Unit/RCNPersonalizationTest.m b/FirebaseRemoteConfig/Tests/Unit/RCNPersonalizationTest.m
@@ -30,12 +30,10 @@
 @interface RCNConfigFetch (ForTest)
 - (NSURLSessionDataTask *)URLSessionDataTaskWithContent:(NSData *)content
                                       completionHandler:
-                                          (RCNConfigFetcherCompletion)fetcherCompletion
-                           excludeEtagHeaderForRealtime:(bool)excludeEtagHeaderForRealtime;
+                                          (RCNConfigFetcherCompletion)fetcherCompletion;
 
 - (void)fetchWithUserProperties:(NSDictionary *)userProperties
-               completionHandler:(FIRRemoteConfigFetchCompletion)completionHandler
-    excludeEtagHeaderForRealtime:(bool)excludeEtagHeaderForRealtime;
+              completionHandler:(FIRRemoteConfigFetchCompletion)completionHandler;
 @end
 
 @interface RCNPersonalizationTest : XCTestCase {
@@ -240,20 +238,16 @@ - (void)testRemoteConfigIntegration {
 
 + (id)mockFetchRequest {
   id configFetch = OCMClassMock([RCNConfigFetch class]);
-  OCMStub([configFetch fetchConfigWithExpirationDuration:0
-                                       completionHandler:OCMOCK_ANY
-                            excludeEtagHeaderForRealtime:false])
+  OCMStub([configFetch fetchConfigWithExpirationDuration:0 completionHandler:OCMOCK_ANY])
       .ignoringNonObjectArgs()
       .andDo(^(NSInvocation *invocation) {
         __unsafe_unretained FIRRemoteConfigFetchCompletion handler;
         [invocation getArgument:&handler atIndex:3];
-        [configFetch fetchWithUserProperties:[[NSDictionary alloc] init]
-                           completionHandler:handler
-                excludeEtagHeaderForRealtime:false];
+        [configFetch fetchWithUserProperties:[[NSDictionary alloc] init] completionHandler:handler];
       });
-  OCMExpect([configFetch URLSessionDataTaskWithContent:[OCMArg any]
-                                     completionHandler:[RCNPersonalizationTest mockResponseHandler]
-                          excludeEtagHeaderForRealtime:false])
+  OCMExpect([configFetch
+                URLSessionDataTaskWithContent:[OCMArg any]
+                            completionHandler:[RCNPersonalizationTest mockResponseHandler]])
       .andReturn(nil);
   return configFetch;
 }
diff --git a/FirebaseRemoteConfig/Tests/Unit/RCNRemoteConfigTest.m b/FirebaseRemoteConfig/Tests/Unit/RCNRemoteConfigTest.m
diff --git a/FirebaseRemoteConfigSwift/Tests/ObjC/FetchMocks.m b/FirebaseRemoteConfigSwift/Tests/ObjC/FetchMocks.m

Original file line number	Diff line number	Diff line change
`@@ -250,8 +250,7 @@ - (void)fetchWithExpirationDuration:(NSTimeInterval)expirationDuration`
`250`	`250`	`completionHandlerCopy = [completionHandler copy];`
`251`	`251`	`}`
`252`	`252`	`[_configFetch fetchConfigWithExpirationDuration:expirationDuration`
`253`		`- completionHandler:completionHandlerCopy`
`254`		`- excludeEtagHeaderForRealtime:false];`
	`253`	`+ completionHandler:completionHandlerCopy];`
`255`	`254`	`}`
`256`	`255`
`257`	`256`	`#pragma mark - fetchAndActivate`
Original file line number	Diff line number	Diff line change
`@@ -420,10 +420,6 @@ - (void)fetchLatestConfig:(NSInteger)remainingAttempts targetVersion:(NSInteger)`
`420`	`420`	`[strongSelf autoFetch:remainingAttempts - 1 targetVersion:targetVersion];`
`421`	`421`	`}`
`422`	`422`	`} else {`
`423`		`- /// If the template version is it's default value, 0, then we need to exclude the Etag from`
`424`		`- /// the fetch to get a response with the current template version.`
`425`		`- bool excludeEtagHeaderForRealtime =`
`426`		`- [[strongSelf->_configFetch templateVersionNumber] integerValue] == 0;`
`427`	`423`	`[strongSelf->_configFetch`
`428`	`424`	`fetchConfigWithExpirationDuration:0`
`429`	`425`	`completionHandler:^(FIRRemoteConfigFetchStatus status, NSError *error) {`
`@@ -455,8 +451,7 @@ - (void)fetchLatestConfig:(NSInteger)remainingAttempts targetVersion:(NSInteger)`
`455`	`451`	`targetVersion:targetVersion];`
`456`	`452`	`}`
`457`	`453`	`}`
`458`		`- }`
`459`		`- excludeEtagHeaderForRealtime:excludeEtagHeaderForRealtime];`
	`454`	`+ }];`
`460`	`455`	`}`
`461`	`456`	`});`
`462`	`457`	`}`