Ipv4 ipv6 fix (#6428)

eldhosembabu · web-flow · commit c5501e6641b1 · 2020-09-14T15:21:43.000-07:00
Recreating PR #5966 Instead of using firebasedynamiclinks-ipv4.googleapis.com and firebasedynamiclinks-ipv6.googleapis.com for doing attribution calls, we are moving towards using firebasedynamiclinks.googleapis.com. Fixes #5032 -changed ipv4 and ipv6 attribution calls with a single direct url. -Removed and refactored code to get rid of code to handle consolidated results from ipv4 and ipv6 result. -Made changes to Test app to show alert dialog when universal linking when app is not in background case and also for fresh start case.
diff --git a/FirebaseDynamicLinks/CHANGELOG.md b/FirebaseDynamicLinks/CHANGELOG.md
@@ -1,5 +1,6 @@
 # v4.3.1
 - [changed] Client id usage in api call and respective checks in the code.
+- [fixed] Fix attempts to connect to invalid ipv6 domain by updating ipv4 and ipv6 to use a single, valid endpoint (#5032)
 
 # v4.3.0
 - [changed] Functionally neutral public header refactor to enable Swift Package
diff --git a/FirebaseDynamicLinks/Sources/FIRDLDefaultRetrievalProcessV2.m b/FirebaseDynamicLinks/Sources/FIRDLDefaultRetrievalProcessV2.m
@@ -26,9 +26,6 @@
 #import "FirebaseDynamicLinks/Sources/FIRDynamicLinkNetworking.h"
 #import "FirebaseDynamicLinks/Sources/Utilities/FDLUtilities.h"
 
-// The maximum number of successful fingerprint api calls.
-const static NSUInteger kMaximumNumberOfSuccessfulFingerprintAPICalls = 2;
-
 // Reason for this string to ensure that only FDL links, copied to clipboard by AppPreview Page
 // JavaScript code, are recognized and used in copy-unique-match process. If user copied FDL to
 // clipboard by himself, that link must not be used in copy-unique-match process.
@@ -40,8 +37,6 @@
 
 @interface FIRDLDefaultRetrievalProcessV2 () <FIRDLJavaScriptExecutorDelegate>
 
-@property(atomic, strong) NSMutableArray *requestResults;
-
 @end
 
 @implementation FIRDLDefaultRetrievalProcessV2 {
@@ -71,8 +66,6 @@ - (instancetype)initWithNetworkingService:(FIRDynamicLinkNetworking *)networking
     _URLScheme = [URLScheme copy];
     _APIKey = [APIKey copy];
     _FDLSDKVersion = [FDLSDKVersion copy];
-    self.requestResults =
-        [[NSMutableArray alloc] initWithCapacity:kMaximumNumberOfSuccessfulFingerprintAPICalls];
     _delegate = delegate;
   }
   return self;
@@ -88,10 +81,6 @@ - (void)retrievePendingDynamicLink {
   }
 }
 
-- (BOOL)isCompleted {
-  return self.requestResults.count >= kMaximumNumberOfSuccessfulFingerprintAPICalls;
-}
-
 #pragma mark - FIRDLJavaScriptExecutorDelegate
 
 - (void)javaScriptExecutor:(FIRDLJavaScriptExecutor *)executor
@@ -130,11 +119,6 @@ - (void)retrievePendingDynamicLinkInternal {
         if (!strongSelf) {
           return;
         }
-        if (strongSelf.completed) {
-          // we may abort process and return previously found dynamic link before all requests
-          // completed
-          return;
-        }
 
         FIRDynamicLink *dynamicLink;
         if (dynamicLinkParameters.count) {
@@ -146,8 +130,7 @@ - (void)retrievePendingDynamicLinkInternal {
                                                              message:matchMessage
                                                          matchSource:nil];
 
-        [strongSelf.requestResults addObject:result];
-        [strongSelf handleRequestResultsUpdated];
+        [strongSelf handleRetrievalProcessWithResult:result];
         if (!error) {
           [strongSelf clearUsedUniqueMatchLinkToCheckFromClipboard];
         }
@@ -156,8 +139,7 @@ - (void)retrievePendingDynamicLinkInternal {
   // Disable deprecated warning for internal methods.
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
-  // If not unique match, we send request twice, since there are two server calls:
-  // one for IPv4, another for IPV6.
+  // If there is not a unique match, we will send an additional request for fingerprinting.
   [_networkingService
       retrievePendingDynamicLinkWithIOSVersion:[UIDevice currentDevice].systemVersion
                               resolutionHeight:resolutionHeight
@@ -177,94 +159,17 @@ - (void)retrievePendingDynamicLinkInternal {
 #pragma clang pop
 }
 
-- (NSArray<FIRDLRetrievalProcessResult *> *)foundResultsWithDynamicLinks {
-  NSPredicate *predicate =
-      [NSPredicate predicateWithBlock:^BOOL(id _Nullable evaluatedObject,
-                                            NSDictionary<NSString *, id> *_Nullable bindings) {
-        if ([evaluatedObject isKindOfClass:[FIRDLRetrievalProcessResult class]]) {
-          FIRDLRetrievalProcessResult *result = (FIRDLRetrievalProcessResult *)evaluatedObject;
-          return result.dynamicLink.url != nil;
-        }
-        return NO;
-      }];
-  return [self.requestResults filteredArrayUsingPredicate:predicate];
-}
-
-- (NSArray<FIRDLRetrievalProcessResult *> *)resultsWithErrors {
-  NSPredicate *predicate =
-      [NSPredicate predicateWithBlock:^BOOL(id _Nullable evaluatedObject,
-                                            NSDictionary<NSString *, id> *_Nullable bindings) {
-        if ([evaluatedObject isKindOfClass:[FIRDLRetrievalProcessResult class]]) {
-          FIRDLRetrievalProcessResult *result = (FIRDLRetrievalProcessResult *)evaluatedObject;
-          return result.error != nil;
-        }
-        return NO;
-      }];
-  return [self.requestResults filteredArrayUsingPredicate:predicate];
-}
-
-- (NSArray<FIRDLRetrievalProcessResult *> *)results {
-  NSPredicate *predicate =
-      [NSPredicate predicateWithBlock:^BOOL(id _Nullable evaluatedObject,
-                                            NSDictionary<NSString *, id> *_Nullable bindings) {
-        return [evaluatedObject isKindOfClass:[FIRDLRetrievalProcessResult class]];
-      }];
-  return [self.requestResults filteredArrayUsingPredicate:predicate];
-}
-
-- (nullable FIRDLRetrievalProcessResult *)resultWithUniqueMatchedDynamicLink {
-  // return result with unique-matched dynamic link if found
-  NSArray<FIRDLRetrievalProcessResult *> *foundResultsWithDynamicLinks =
-      [self foundResultsWithDynamicLinks];
-  for (FIRDLRetrievalProcessResult *result in foundResultsWithDynamicLinks) {
-    if (result.dynamicLink.matchType == FIRDLMatchTypeUnique) {
-      return result;
-    }
-  }
-  return nil;
-}
-
-- (void)handleRequestResultsUpdated {
-  FIRDLRetrievalProcessResult *resultWithUniqueMatchedDynamicLink =
-      [self resultWithUniqueMatchedDynamicLink];
-  if (resultWithUniqueMatchedDynamicLink) {
-    [self markCompleted];
-    [self.delegate retrievalProcess:self completedWithResult:resultWithUniqueMatchedDynamicLink];
-  } else if (self.completed) {
-    NSArray<FIRDLRetrievalProcessResult *> *foundResultsWithDynamicLinks =
-        [self foundResultsWithDynamicLinks];
-    NSArray<FIRDLRetrievalProcessResult *> *resultsThatEncounteredErrors = [self resultsWithErrors];
-    if (foundResultsWithDynamicLinks.count) {
-      // return any result if no unique-matched URL is available
-      // TODO: Merge match message from all results
-      [self.delegate retrievalProcess:self
-                  completedWithResult:foundResultsWithDynamicLinks.firstObject];
-    } else if (resultsThatEncounteredErrors.count > 0) {
-      // TODO: Merge match message and errors from all results
-      [self.delegate retrievalProcess:self
-                  completedWithResult:resultsThatEncounteredErrors.firstObject];
-    } else {
-      // dynamic link not found
-      // TODO: Merge match message from all results
-      FIRDLRetrievalProcessResult *result = [[self results] firstObject];
-      if (!result) {
-        // if we did not get any results, construct one
-        NSString *message = NSLocalizedString(@"Pending dynamic link not found",
-                                              @"Message when dynamic link was not found");
-        result = [[FIRDLRetrievalProcessResult alloc] initWithDynamicLink:nil
-                                                                    error:nil
-                                                                  message:message
-                                                              matchSource:nil];
-      }
-      [self.delegate retrievalProcess:self completedWithResult:result];
-    }
-  }
-}
-
-- (void)markCompleted {
-  while (!self.completed) {
-    [self.requestResults addObject:[NSNull null]];
+- (void)handleRetrievalProcessWithResult:(FIRDLRetrievalProcessResult *)result {
+  if (!result) {
+    // if we did not get any results, construct one
+    NSString *message = NSLocalizedString(@"Pending dynamic link not found",
+                                          @"Message when dynamic link was not found");
+    result = [[FIRDLRetrievalProcessResult alloc] initWithDynamicLink:nil
+                                                                error:nil
+                                                              message:message
+                                                          matchSource:nil];
   }
+  [self.delegate retrievalProcess:self completedWithResult:result];
 }
 
 - (nullable NSURL *)uniqueMatchLinkToCheck {
diff --git a/FirebaseDynamicLinks/Sources/FIRDLRetrievalProcessProtocols.h b/FirebaseDynamicLinks/Sources/FIRDLRetrievalProcessProtocols.h
@@ -31,7 +31,6 @@ NS_ASSUME_NONNULL_BEGIN
 @protocol FIRDLRetrievalProcessProtocol <NSObject>
 
 @property(weak, nonatomic, readonly) id<FIRDLRetrievalProcessDelegate> delegate;
-@property(nonatomic, readonly, getter=isCompleted) BOOL completed;
 
 - (void)retrievePendingDynamicLink;
 
diff --git a/FirebaseDynamicLinks/Sources/FIRDynamicLinkNetworking.m b/FirebaseDynamicLinks/Sources/FIRDynamicLinkNetworking.m
@@ -28,16 +28,8 @@
 NSString *const kApiaryRestBaseUrl = @"https://appinvite-pa.googleapis.com/v1";
 static NSString *const kiOSReopenRestBaseUrl = @"https://firebasedynamiclinks.googleapis.com/v1";
 
-// IPv4 and IPv6 Endpoints.
-static NSString *const kApiaryRestBaseUrlIPV4 = @"https://appinvite-ipv4-pa.googleapis.com/v1";
-static NSString *const kApiaryRestBaseUrlIPV6 = @"https://appinvite-ipv6-pa.googleapis.com/v1";
-
-// IPv4 and IPv6 Endpoints for default retrieval process V2. (Endpoint version is V1)
-static NSString *const kIosPostInstallAttributionRestBaseUrlIPV4 =
-    @"https://firebasedynamiclinks-ipv4.googleapis.com/v1";
-static NSString *const kIosPostInstallAttributionRestBaseUrlIPV6 =
-    @"https://firebasedynamiclinks-ipv6.googleapis.com/v1";
-static NSString *const kIosPostInstallAttributionRestBaseUrlUniqueMatch =
+// Endpoint for default retrieval process V2. (Endpoint version is V1)
+static NSString *const kIosPostInstallAttributionRestBaseUrl =
     @"https://firebasedynamiclinks.googleapis.com/v1";
 
 static NSString *const kReasonString = @"reason";
@@ -230,19 +222,11 @@ - (void)retrievePendingDynamicLinkWithIOSVersion:(NSString *)IOSVersion
     return [dynamicLinkParameters copy];
   };
 
-  // If uniqueMatch link available send to the unique match endpoint,
-  // else send requests to both IPv4 and IPv6 endpoints.
-  NSArray *baseURLs =
-      uniqueMatchLinkToCheck ? @[ kIosPostInstallAttributionRestBaseUrlUniqueMatch ] : @[
-        kIosPostInstallAttributionRestBaseUrlIPV4, kIosPostInstallAttributionRestBaseUrlIPV6
-      ];
-  for (NSString *baseURL in baseURLs) {
-    [self sendRequestWithBaseURLString:baseURL
-                           requestBody:requestBody
-                          endpointPath:@"installAttribution"
-                           parserBlock:responseParserBlock
-                            completion:handler];
-  }
+  [self sendRequestWithBaseURLString:kIosPostInstallAttributionRestBaseUrl
+                         requestBody:requestBody
+                        endpointPath:@"installAttribution"
+                         parserBlock:responseParserBlock
+                          completion:handler];
 }
 
 - (void)convertInvitation:(NSString *)invitationID
@@ -285,54 +269,24 @@ - (void)sendRequestWithBaseURLString:(NSString *)baseURL
   NSString *requestURLString = [NSString
       stringWithFormat:@"%@/%@%@", baseURL, endpointPath, FIRDynamicLinkAPIKeyParameter(_APIKey)];
 
-  FIRNetworkRequestCompletionHandler completeInvitationByDeviceCallback = ^(NSData *data,
-                                                                            NSError *error) {
-    if (error || !data) {
-      dispatch_async(dispatch_get_main_queue(), ^{
-        handler(nil, nil, error);
-      });
-      return;
-    }
-    NSString *matchMessage = nil;
-    NSError *parsingError = nil;
-    NSDictionary *parsedDynamicLinkParameters =
-        parserBlock(requestURLString, data, &matchMessage, &parsingError);
-
-    // If request was made with pasteboard contents, verify if we got a unique match. If we got
-    // a "none" match, we were unable to get a unique match or deduce using fingerprinting.
-    // In this case, resend requests to IPV4 and IPV6 endpoints for fingerprinting. b/79704203
-    if (requestBody[@"uniqueMatchLinkToCheck"] && parsedDynamicLinkParameters &&
-        (!parsedDynamicLinkParameters[kFIRDLParameterMatchType] ||
-         [parsedDynamicLinkParameters[kFIRDLParameterMatchType] isEqualToString:@"none"])) {
-      NSMutableDictionary *requestBodyMutable = [requestBody mutableCopy];
-      [requestBodyMutable removeObjectForKey:@"uniqueMatchLinkToCheck"];
-      NSMutableArray *baseURLs =
-          [@[ kIosPostInstallAttributionRestBaseUrlIPV4, kIosPostInstallAttributionRestBaseUrlIPV6 ]
-              mutableCopy];
-      if (parsedDynamicLinkParameters[kFIRDLParameterRequestIPVersion]) {
-        if ([parsedDynamicLinkParameters[kFIRDLParameterRequestIPVersion]
-                isEqualToString:@"IP_V4"]) {
-          [baseURLs removeObject:kIosPostInstallAttributionRestBaseUrlIPV4];
-        } else if ([parsedDynamicLinkParameters[kFIRDLParameterRequestIPVersion]
-                       isEqualToString:@"IP_V6"]) {
-          [baseURLs removeObject:kIosPostInstallAttributionRestBaseUrlIPV6];
+  FIRNetworkRequestCompletionHandler completeInvitationByDeviceCallback =
+      ^(NSData *data, NSError *error) {
+        if (error || !data) {
+          dispatch_async(dispatch_get_main_queue(), ^{
+            handler(nil, nil, error);
+          });
+          return;
         }
-      }
 
-      for (NSString *baseURL in baseURLs) {
-        [self sendRequestWithBaseURLString:baseURL
-                               requestBody:requestBodyMutable
-                              endpointPath:@"installAttribution"
-                               parserBlock:parserBlock
-                                completion:handler];
-      }
-    }
-    // We want to return out the result of the unique match check irrespective of success/failure as
-    // it is the first fingerprinting request as well.
-    dispatch_async(dispatch_get_main_queue(), ^{
-      handler(parsedDynamicLinkParameters, matchMessage, parsingError);
-    });
-  };
+        NSString *matchMessage = nil;
+        NSError *parsingError = nil;
+        NSDictionary *parsedDynamicLinkParameters =
+            parserBlock(requestURLString, data, &matchMessage, &parsingError);
+
+        dispatch_async(dispatch_get_main_queue(), ^{
+          handler(parsedDynamicLinkParameters, matchMessage, parsingError);
+        });
+      };
 
   [self executeOnePlatformRequest:requestBody
                            forURL:requestURLString
diff --git a/FirebaseDynamicLinks/Tests/Sample/FDLBuilderTestAppObjC/AppDelegate.m b/FirebaseDynamicLinks/Tests/Sample/FDLBuilderTestAppObjC/AppDelegate.m
@@ -92,7 +92,10 @@ - (void)_showDynamicLinkInfo:(FIRDynamicLink *)dynamicLink {
   [alertVC addAction:[UIAlertAction actionWithTitle:@"Dismiss"
                                               style:UIAlertActionStyleCancel
                                             handler:NULL]];
-  [self.window.rootViewController presentViewController:alertVC animated:YES completion:NULL];
+
+  [[UIApplication sharedApplication].keyWindow.rootViewController presentViewController:alertVC
+                                                                               animated:YES
+                                                                             completion:NULL];
 }
 
 @end
diff --git a/FirebaseDynamicLinks/Tests/Sample/FDLBuilderTestAppObjC/SceneDelegate.m b/FirebaseDynamicLinks/Tests/Sample/FDLBuilderTestAppObjC/SceneDelegate.m
@@ -31,6 +31,10 @@ - (void)scene:(UIScene *)scene
   // UIWindowScene `scene`. If using a storyboard, the `window` property will automatically be
   // initialized and attached to the scene. This delegate does not imply the connecting scene or
   // session are new (see `application:configurationForConnectingSceneSession` instead).
+  if (connectionOptions.userActivities && connectionOptions.userActivities.count > 0) {
+    NSUserActivity *userActivity = connectionOptions.userActivities.allObjects.firstObject;
+    [self handleDynamicLinkFromActivity:userActivity];
+  }
 }
 
 - (void)sceneDidDisconnect:(UIScene *)scene {
@@ -64,6 +68,13 @@ - (void)sceneDidEnterBackground:(UIScene *)scene {
 }
 
 - (void)scene:(UIScene *)scene continueUserActivity:(NSUserActivity *)userActivity {
+  [self handleDynamicLinkFromActivity:userActivity];
+}
+
+- (void)handleDynamicLinkFromActivity:(NSUserActivity *)userActivity {
+  if (!userActivity) {
+    return;
+  }
   BOOL handled = [[FIRDynamicLinks dynamicLinks]
       handleUniversalLink:userActivity.webpageURL
                completion:^(FIRDynamicLink *_Nullable dynamicLink, NSError *_Nullable error) {
