Migrate to using the FDL API for app re-opens (#2238)

* Allow for pasteboard links with trailing slashes as valid custom domain links.

* Example App: Read the correct domainURIPrefix key from paramvalues dictionary.

* Update comment.

* Migrate the Reopen REST endpoint from AppInvite to FDL.

* Only include long FDLs with a trailing /.

* Run style script.

* Fix typo in test.

Author: dmandar

Example/DynamicLinks/Tests/FIRDynamicLinkNetworkingTests.m

@@ -86,6 +86,7 @@ - (void)testResolveShortLinkServiceCompletionDoesntCrashWhenNilDataIsRetrieved {
   XCTestExpectation *expectation = [self expectationWithDescription:@"completion called"];
 
   [self.service resolveShortLink:url
+                   FDLSDKVersion:@"1.0.0"
                       completion:^(NSURL *_Nullable url, NSError *_Nullable error) {
                         [expectation fulfill];
                       }];

Example/DynamicLinks/Tests/FIRDynamicLinksTest.m

@@ -92,7 +92,9 @@ + (instancetype)resolverWithBlock:(FakeShortLinkResolverHandler)resolverHandler
   return resolver;
 }
 
-- (void)resolveShortLink:(NSURL *)url completion:(FIRDynamicLinkResolverHandler)completion {
+- (void)resolveShortLink:(NSURL *)url
+           FDLSDKVersion:(NSString *)FDLSDKVersion
+              completion:(FIRDynamicLinkResolverHandler)completion {
   if (_resolverHandler && completion) {
     NSURL *resolvedLink = _resolverHandler(url);
     completion(resolvedLink, nil);
@@ -129,7 +131,7 @@ static void SwizzleDynamicLinkNetworkingWithMock() {
   id linkResolver = OCMPartialMock([[FIRDynamicLinkNetworking alloc] initWithAPIKey:kAPIKey
                                                                            clientID:kClientID
                                                                           URLScheme:kURLScheme]);
-  [[linkResolver stub] resolveShortLink:OCMOCK_ANY completion:OCMOCK_ANY];
+  [[linkResolver stub] resolveShortLink:OCMOCK_ANY FDLSDKVersion:@"1.0.0" completion:OCMOCK_ANY];
 
   SwizzleDynamicLinkNetworking(linkResolver);
 }
@@ -1027,17 +1029,11 @@ - (void)testValidCustomDomainNames {
   NSArray<NSString *> *urlStrings = @[
     @"https://google.com/mylink",             // Short FDL starting with 'https://google.com'
     @"https://google.com/one",                // Short FDL starting with 'https://google.com'
-    @"https://google.com?link=abcd",          // Long FDL starting with  'https://google.com'
+    @"https://google.com/?link=abcd",         // Long FDL starting with  'https://google.com'
     @"https://google.com/one/mylink",         // Long FDL starting with  'https://google.com/one'
     @"https://a.firebase.com/mypath/mylink",  // Short FDL starting https://a.firebase.com/mypath
-    @"https://a.firebase.com/mypath?link=abcd&test=1",  // Long FDL starting with
-                                                        // https://a.firebase.com/mypath
-    @"https://a.firebase.com/mypath/?link=https://www.google.com&test=1"  // Long FDL coming from
-                                                                          // the app preview page.
-                                                                          // Note that the long FDL
-                                                                          // coming from the
-                                                                          // pasteboard has an extra
-                                                                          // trailing slash.
+    @"https://a.firebase.com/mypath/?link=abcd&test=1",  // Long FDL starting with
+                                                         // https://a.firebase.com/mypath
   ];
 
   for (NSString *urlString in urlStrings) {

Firebase/DynamicLinks/FIRDynamicLinkNetworking.h

@@ -91,7 +91,9 @@ FOUNDATION_EXPORT NSString *const kApiaryRestBaseUrl;
  * @param url A Short Dynamic Link.
  * @param completion Block to be run upon completion.
  */
-- (void)resolveShortLink:(NSURL *)url completion:(FIRDynamicLinkResolverHandler)completion;
+- (void)resolveShortLink:(NSURL *)url
+           FDLSDKVersion:(NSString *)FDLSDKVersion
+              completion:(FIRDynamicLinkResolverHandler)completion;
 
 /**
  * @method

Firebase/DynamicLinks/FIRDynamicLinkNetworking.m

@@ -23,6 +23,7 @@
 NS_ASSUME_NONNULL_BEGIN
 
 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";
@@ -41,11 +42,9 @@
 
 NSString *const kFDLResolvedLinkDeepLinkURLKey = @"deepLink";
 NSString *const kFDLResolvedLinkMinAppVersionKey = @"iosMinAppVersion";
-
-static NSString *const kFDLAnalyticsDataKey = @"durableLinkAnalyticsData";
-static NSString *const kFDLAnalyticsDataSourceKey = @"source";
-static NSString *const kFDLAnalyticsDataMediumKey = @"medium";
-static NSString *const kFDLAnalyticsDataCampaignKey = @"campaign";
+static NSString *const kFDLAnalyticsDataSourceKey = @"utmSource";
+static NSString *const kFDLAnalyticsDataMediumKey = @"utmMedium";
+static NSString *const kFDLAnalyticsDataCampaignKey = @"utmCampaign";
 static NSString *const kHeaderIosBundleIdentifier = @"X-Ios-Bundle-Identifier";
 
 typedef NSDictionary *_Nullable (^FIRDLNetworkingParserBlock)(
@@ -102,14 +101,20 @@ - (instancetype)initWithAPIKey:(NSString *)APIKey
 
 #pragma mark - Public interface
 
-- (void)resolveShortLink:(NSURL *)url completion:(FIRDynamicLinkResolverHandler)handler {
+- (void)resolveShortLink:(NSURL *)url
+           FDLSDKVersion:(NSString *)FDLSDKVersion
+              completion:(FIRDynamicLinkResolverHandler)handler {
   NSParameterAssert(handler);
   if (!url) {
     handler(nil, nil);
     return;
   }
 
-  NSDictionary *requestBody = @{@"link" : url.absoluteString};
+  NSDictionary *requestBody = @{
+    @"requestedLink" : url.absoluteString,
+    @"bundle_id" : [NSBundle mainBundle].bundleIdentifier,
+    @"sdk_version" : FDLSDKVersion
+  };
 
   FIRNetworkRequestCompletionHandler resolveLinkCallback = ^(NSData *data, NSError *error) {
     NSURL *resolvedURL;
@@ -129,10 +134,9 @@ - (void)resolveShortLink:(NSURL *)url completion:(FIRDynamicLinkResolverHandler)
 
         NSString *deepLinkString = result[kFDLResolvedLinkDeepLinkURLKey];
         NSString *minAppVersion = result[kFDLResolvedLinkMinAppVersionKey];
-        NSDictionary *analytics = result[kFDLAnalyticsDataKey];
-        NSString *utmSource = analytics[kFDLAnalyticsDataSourceKey];
-        NSString *utmMedium = analytics[kFDLAnalyticsDataMediumKey];
-        NSString *utmCampaign = analytics[kFDLAnalyticsDataCampaignKey];
+        NSString *utmSource = result[kFDLAnalyticsDataSourceKey];
+        NSString *utmMedium = result[kFDLAnalyticsDataMediumKey];
+        NSString *utmCampaign = result[kFDLAnalyticsDataCampaignKey];
         resolvedURL = FIRDLDeepLinkURLWithInviteID(invitationIDString, deepLinkString, utmSource,
                                                    utmMedium, utmCampaign, NO, nil, minAppVersion,
                                                    self->_URLScheme, nil);
@@ -141,8 +145,9 @@ - (void)resolveShortLink:(NSURL *)url completion:(FIRDynamicLinkResolverHandler)
     handler(resolvedURL, error);
   };
 
-  NSString *requestURLString = [NSString stringWithFormat:@"%@/resolveLink%@", kApiaryRestBaseUrl,
-                                                          FIRDynamicLinkAPIKeyParameter(_APIKey)];
+  NSString *requestURLString =
+      [NSString stringWithFormat:@"%@/reopenAttribution%@", kiOSReopenRestBaseUrl,
+                                 FIRDynamicLinkAPIKeyParameter(_APIKey)];
   [self executeOnePlatformRequest:requestBody
                            forURL:requestURLString
                 completionHandler:resolveLinkCallback];

Firebase/DynamicLinks/FIRDynamicLinks.m

@@ -408,6 +408,7 @@ - (nullable FIRDynamicLink *)dynamicLinkFromUniversalLinkURL:(NSURL *)url {
           // TODO: Create dedicated logging function to prevent this.
           [self.dynamicLinkNetworking
               resolveShortLink:url
+                 FDLSDKVersion:kFIRDLVersion
                     completion:^(NSURL *_Nullable resolverURL, NSError *_Nullable resolverError){
                         // Nothing to do
                     }];
@@ -453,7 +454,9 @@ - (BOOL)handleUniversalLink:(NSURL *)universalLinkURL
 }
 
 - (void)resolveShortLink:(NSURL *)url completion:(FIRDynamicLinkResolverHandler)completion {
-  [self.dynamicLinkNetworking resolveShortLink:url completion:completion];
+  [self.dynamicLinkNetworking resolveShortLink:url
+                                 FDLSDKVersion:kFIRDLVersion
+                                    completion:completion];
 }
 
 - (BOOL)matchesShortLinkFormat:(NSURL *)url {