Test handle universal link (#8793)

* Adding support for '-'  and '_' in regex validation

* Adding new unit test to check handleUniversalLink:url to return YES for valid DDL

Author: eldhosembabu

FirebaseDynamicLinks/CHANGELOG.md

@@ -1,3 +1,6 @@
+# v8.9.0
+- [fixed] [Dynamic links] Shortlink is not handled in 8.8.0. (#8786)
+
 # v8.8.0
 - [fixed] Firebase dynamic links with custom domain will only work if the custom domain has a trailing '/'. (#7087)
 - [fixed] Fix device-only build warning for unused `processIsTranslated` function. (#8694)

FirebaseDynamicLinks/Sources/Utilities/FDLUtilities.m

@@ -248,7 +248,7 @@ BOOL FIRDLIsAValidDLWithFDLDomain(NSURL *_Nullable URL) {
     // Matches the *.page.link and *.app.goo.gl domains.
     matchesRegularExpression =
         ([urlStr rangeOfString:@"^https?://[a-zA-Z0-9]+((\\.app\\.goo\\.gl)|(\\.page\\.link))((\\/"
-                               @"?\\?link=https?.*)|(\\/[a-zA-Z0-9]+)((\\/?\\?.*=.*)?$|$))"
+                               @"?\\?link=https?.*)|(\\/[a-zA-Z0-9-_]+)((\\/?\\?.*=.*)?$|$))"
                        options:NSRegularExpressionSearch]
              .location != NSNotFound);
 

FirebaseDynamicLinks/Tests/Unit/FIRDynamicLinksTest.m

@@ -1369,6 +1369,54 @@ - (void)testHandleUniversalLinkCompletionReturnsNoForNonDDL {
   }];
 }
 
+- (void)testHandleUniversalLinkCompletionReturnsYesForValidDDL {
+  [self.service setUpWithLaunchOptions:nil
+                                apiKey:kAPIKey
+                             urlScheme:kURLScheme
+                          userDefaults:self.userDefaults];
+
+  NSArray<NSString *> *urlStrings = @[
+    @"https://some.page.link/test", @"https://some.page.link/test-test",
+    @"https://some.page.link/test_test", @"https://some.page.link/test_test-test",
+    @"https://some.app.goo.gl/test_test-test"
+  ];
+
+  for (NSString *urlString in urlStrings) {
+    NSURL *url = [NSURL URLWithString:urlString];
+
+    void (^executeRequestBlock)(id, NSDictionary *, NSString *,
+                                FIRNetworkRequestCompletionHandler) =
+        ^(id p1, NSDictionary *requestBody, NSString *requestURLString,
+          FIRNetworkRequestCompletionHandler handler) {
+          NSData *data = FIRDataWithDictionary(@{}, nil);
+          NSHTTPURLResponse *response = [[NSHTTPURLResponse alloc] initWithURL:url
+                                                                    statusCode:200
+                                                                   HTTPVersion:nil
+                                                                  headerFields:nil];
+          handler(data, response, nil);
+        };
+
+    SEL executeRequestSelector = @selector(executeOnePlatformRequest:forURL:completionHandler:);
+    [GULSwizzler swizzleClass:[FIRDynamicLinkNetworking class]
+                     selector:executeRequestSelector
+              isClassSelector:NO
+                    withBlock:executeRequestBlock];
+
+    XCTestExpectation *expectation = [self expectationWithDescription:@"handler called"];
+
+    BOOL handled = [self.service
+        handleUniversalLink:url
+                 completion:^(FIRDynamicLink *_Nullable dynamicLink, NSError *_Nullable error) {
+                   XCTAssertNotNil(dynamicLink, @"Non DDL returned FIRDynamicLink");
+                   [expectation fulfill];
+                 }];
+
+    XCTAssertTrue(handled, @"Valid DDL Universal Link was not handled");
+
+    [self waitForExpectationsWithTimeout:kAsyncTestTimout handler:nil];
+  }
+}
+
 - (void)test_ensureInternalMethodsNotRenamed {
   // sanity check to ensure these methods has not been renamed
   // we relaying on these to be the same for tests to work properly