Skip to content

App google domain support #10249

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 6 commits into from
Sep 22, 2022
Merged

App google domain support #10249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f432aa3
Adding new 1p domain "app.google" support in FDL SDK
eldhosembabu Sep 22, 2022
21e233b
Formating
eldhosembabu Sep 22, 2022
7d80dcd
Changeling entry
eldhosembabu Sep 22, 2022
019b7a8
Merge remote-tracking branch 'refs/remotes/origin/master'
eldhosembabu Sep 22, 2022
1c0dd10
Correcting changelog
eldhosembabu Sep 22, 2022
36c92c6
Changelog correction.
eldhosembabu Sep 22, 2022
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
1 change: 1 addition & 0 deletions FirebaseDynamicLinks/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# 10.0.0
- [removed] Removed bare initializer from `DynamicLink`. (#10000)
- [fixed] Added app.google (1p domain) support in FDL SDK which was missing.

# 9.0.0
- [fixed] Fixed async/await crash when retrieving a dynamic link from a universal link fails. (#9612)
Expand Down
20 changes: 13 additions & 7 deletions FirebaseDynamicLinks/Sources/Utilities/FDLUtilities.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,11 +253,14 @@ BOOL FIRDLIsAValidDLWithFDLDomain(NSURL *_Nullable URL) {
BOOL matchesRegularExpression = false;
NSString *urlStr = URL.absoluteString;

if ([URL.host containsString:@".page.link"] || [URL.host containsString:@".app.goo.gl"]) {
if ([URL.host containsString:@".page.link"] || [URL.host containsString:@".app.goo.gl"] ||
[URL.host containsString:@".app.google"]) {
// 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-_]+)((\\/?\\?.*=.*)?$|$))"
([urlStr rangeOfString:
@"^https?://"
@"[a-zA-Z0-9]+((\\.app\\.goo\\.gl)|(\\.page\\.link)|(\\.app\\.google))((\\/"
@"?\\?.*link=https?.*)|(\\/[a-zA-Z0-9-_]+)((\\/?\\?.*=.*)?$|$))"
options:NSRegularExpressionSearch]
.location != NSNotFound);

Expand All @@ -266,9 +269,11 @@ BOOL FIRDLIsAValidDLWithFDLDomain(NSURL *_Nullable URL) {
// Checks whether the URL is of the format :
// http(s)://$DOMAIN(.page.link or .app.goo.gl)/i/$ANYTHING
matchesRegularExpression =
([urlStr rangeOfString:
@"^https?:\\/\\/[a-zA-Z0-9]+((\\.app\\.goo\\.gl)|(\\.page\\.link))\\/i\\/.*$"
options:NSRegularExpressionSearch]
([urlStr
rangeOfString:
@"^https?:\\/\\/"
@"[a-zA-Z0-9]+((\\.app\\.goo\\.gl)|(\\.page\\.link)|(\\.app\\.google))\\/i\\/.*$"
options:NSRegularExpressionSearch]
.location != NSNotFound);
}
}
Expand All @@ -286,7 +291,8 @@ BOOL FIRDLIsAValidDLWithFDLDomain(NSURL *_Nullable URL) {
BOOL FIRDLCanParseUniversalLinkURL(NSURL *_Nullable URL) {
// Handle universal links with format |https://goo.gl/app/<appcode>?<parameters>|.
// Also support page.link format.
BOOL isDDLWithAppcodeInPath = ([URL.host isEqual:@"goo.gl"] || [URL.host isEqual:@"page.link"]) &&
BOOL isDDLWithAppcodeInPath = ([URL.host isEqual:@"goo.gl"] || [URL.host isEqual:@"page.link"] ||
[URL.host isEqual:@"app.google"]) &&
[URL.path hasPrefix:@"/app"];

return isDDLWithAppcodeInPath || FIRDLIsAValidDLWithFDLDomain(URL) ||
Expand Down
33 changes: 27 additions & 6 deletions FirebaseDynamicLinks/Tests/Unit/FIRDynamicLinksTest.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1100,17 +1100,27 @@ - (void)testResolveLinkRespectsResponseErrorStatusCode {

- (void)testPassMatchesShortLinkFormatForDDLDomains {
NSArray<NSString *> *urlStrings = @[
@"https://someapp.app.goo.gl/somepath", @"https://someapp.app.goo.gl/link",
@"https://someapp.app.goo.gl/somepath",
@"https://someapp.app.goo.gl/link",
@"https://someapp.app.goo.gl/somepath?link=https://somedomain",
@"https://someapp.app.goo.gl/somepath?somekey=somevalue",
@"https://someapp.app.goo.gl/somepath/?link=https://somedomain",
@"https://someapp.app.goo.gl/somepath/?somekey=somevalue",
@"https://someapp.page.link/somepath", @"https://someapp.page.link/link",
@"https://someapp.app.google/somepath",
@"https://someapp.app.google/link",
@"https://someapp.app.google/somepath?link=https://somedomain",
@"https://someapp.app.google/somepath?somekey=somevalue",
@"https://someapp.app.google/somepath/?link=https://somedomain",
@"https://someapp.app.google/somepath/?somekey=somevalue",
@"https://someapp.page.link/somepath",
@"https://someapp.page.link/link",
@"https://someapp.page.link/somepath?link=https://somedomain",
@"https://someapp.page.link/somepath?somekey=somevalue",
@"https://someapp.page.link/somepath/?link=https://somedomain",
@"https://someapp.page.link/somepath/?somekey=somevalue", @"http://someapp.page.link/somepath",
@"http://someapp.page.link/link", @"http://someapp.page.link/somepath?link=https://somedomain",
@"https://someapp.page.link/somepath/?somekey=somevalue",
@"http://someapp.page.link/somepath",
@"http://someapp.page.link/link",
@"http://someapp.page.link/somepath?link=https://somedomain",
@"http://someapp.page.link/somepath?somekey=somevalue",
@"http://someapp.page.link/somepath/?link=http://somedomain",
@"http://someapp.page.link/somepath/?somekey=somevalue"
Expand All @@ -1136,6 +1146,15 @@ - (void)testFailMatchesShortLinkFormat {
@"https://someapp.app.goo.gl/somepath/somepath2",
@"https://someapp.app.goo.gl/somepath/somepath2?somekey=somevalue",
@"https://someapp.app.goo.gl/somepath/somepath2?link=https://somedomain",
@"https://someapp.app.google",
@"https://someapp.app.google/",
@"https://someapp.app.google?",
@"https://someapp.app.google/?",
@"https://someapp.app.google?somekey=somevalue",
@"https://someapp.app.google/?somekey=somevalue",
@"https://someapp.app.google/somepath/somepath2",
@"https://someapp.app.google/somepath/somepath2?somekey=somevalue",
@"https://someapp.app.google/somepath/somepath2?link=https://somedomain",
@"https://someapp.page.link",
@"https://someapp.page.link/",
@"https://someapp.page.link?",
Expand Down Expand Up @@ -1376,9 +1395,11 @@ - (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://some.app.google/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"
@"https://n8r9f.app.goo.gl/?link=https%3A%2F%2Fwww%2Egoogle%2Ecom&ibi=com%2Egoogle%2EGCMTestApp%2Edev&amv=0&imv=1%2E0",
@"https://n8r9f.app.google/?ibi=com%2Egoogle%2EGCMTestApp%2Edev&amv=0&imv=1%2E0&link=https%3A%2F%2Fwww%2Egoogle%2Ecom",
@"https://n8r9f.app.google/?link=https%3A%2F%2Fwww%2Egoogle%2Ecom&ibi=com%2Egoogle%2EGCMTestApp%2Edev&amv=0&imv=1%2E0"
];

for (NSString *urlString in urlStrings) {
Expand Down