Skip to content

Regex change to accept link query param anywhere in FDL after the FDL domain prefix #8866

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 26, 2021
Merged

Regex change to accept link query param anywhere in FDL after the FDL domain prefix #8866

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff5ed0f
Changing regex to accept "link" query param anywhere in the FDL after…
eldhosembabu Oct 26, 2021
3d5b052
styling
eldhosembabu Oct 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion FirebaseDynamicLinks/Sources/Utilities/FDLUtilities.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
4 changes: 3 additions & 1 deletion FirebaseDynamicLinks/Tests/Unit/FIRDynamicLinksTest.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1378,7 +1378,9 @@ - (void)testHandleUniversalLinkCompletionReturnsYesForValidDDL {
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"
@"https://some.app.goo.gl/test_test-test",
@"https://n8r9f.app.goo.gl/?ibi=com%2Egoogle%2EGCMTestApp%2Edev&amv=0&imv=1%2E0&link=https%3A%2F%2Fwww%2Egoogle%2Ecom",
@"https://n8r9f.app.goo.gl/?link=https%3A%2F%2Fwww%2Egoogle%2Ecom&ibi=com%2Egoogle%2EGCMTestApp%2Edev&amv=0&imv=1%2E0"
];

for (NSString *urlString in urlStrings) {
Expand Down