Skip to content

Adding "utmParametersDictionary" api to FIRDynamicLink #7505

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.

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 5 commits into from
Feb 18, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
79 changes: 79 additions & 0 deletions FIRDynamicLinkTest.m
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
/*
* Copyright 2021 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

#import <Foundation/Foundation.h>
#import <XCTest/XCTest.h>
#import "FirebaseDynamicLinks/Sources/FIRDynamicLink+Private.h"

@interface FIRDynamicLinkTest : XCTestCase {
}
@end

@implementation FIRDynamicLinkTest

NSMutableDictionary<NSString *, NSString *> *fdlParameters = nil;
NSDictionary<NSString *, NSString *> *linkParameters = nil;
NSDictionary<NSString *, NSString *> *utmParameters = nil;

- (void)setUp {
[super setUp];

linkParameters = @{
@"deep_link_id" : @"https://mmaksym.com/test-app1",
@"match_message" : @"Link is uniquely matched for this device.",
@"match_type" : @"unique",
@"a_parameter" : @"a_value"
};
utmParameters = @{
@"utm_campaign" : @"eldhosembabu Test",
@"utm_medium" : @"test_medium",
@"utm_source" : @"test_source",
};

fdlParameters = [[NSMutableDictionary alloc] initWithDictionary:linkParameters];
[fdlParameters addEntriesFromDictionary:utmParameters];
}

- (void)testDynamicLinkParameters_InitWithParameters {
FIRDynamicLink *dynamicLink = [[FIRDynamicLink alloc] initWithParametersDictionary:fdlParameters];
XCTAssertEqual([fdlParameters count], [[dynamicLink parametersDictionary] count]);
for (NSString *key in fdlParameters) {
NSString *expectedValue = [fdlParameters valueForKey:key];
NSString *derivedValue = [[dynamicLink parametersDictionary] valueForKey:key];
XCTAssertNotNil(derivedValue, @"Cannot be null!");
XCTAssertEqualObjects(derivedValue, expectedValue);
}
}

- (void)testDynamicLinkUtmParameters_InitWithParameters {
FIRDynamicLink *dynamicLink = [[FIRDynamicLink alloc] initWithParametersDictionary:fdlParameters];
XCTAssertEqual([[dynamicLink utmParametersDictionary] count], [utmParameters count]);
for (NSString *key in utmParameters) {
NSString *expectedValue = [utmParameters valueForKey:key];
NSString *derivedValue = [[dynamicLink utmParametersDictionary] valueForKey:key];
XCTAssertNotNil(derivedValue, @"Cannot be null!");
XCTAssertEqualObjects(derivedValue, expectedValue);
}
}

- (void)testDynamicLinkParameters_InitWithNoUtmParameters {
FIRDynamicLink *dynamicLink =
[[FIRDynamicLink alloc] initWithParametersDictionary:linkParameters];
XCTAssertEqual([[dynamicLink parametersDictionary] count], [linkParameters count]);
XCTAssertEqual([[dynamicLink utmParametersDictionary] count], 0);
}

@end
3 changes: 3 additions & 0 deletions FirebaseDynamicLinks/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# v7.7.0
- [added] Added `utmParametersDictionary` property to `DynamicLink`. (#6730)

# v7.6.0
- [fixed] Fixed build warnings introduced with Xcode 12.5. (#7434)

Expand Down
16 changes: 15 additions & 1 deletion FirebaseDynamicLinks/Sources/FIRDynamicLink.m
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@

@implementation FIRDynamicLink

NSString *const FDLUTMParamPrefix = @"utm_";

- (NSString *)description {
return [NSString stringWithFormat:@"<%@: %p, url [%@], match type: %@, minimumAppVersion: %@, "
"match message: %@>",
Expand All @@ -36,7 +38,7 @@ - (instancetype)initWithParametersDictionary:(NSDictionary<NSString *, id> *)par

if (self = [super init]) {
_parametersDictionary = [parameters copy];

_utmParametersDictionary = [[self class] extractUTMParams:parameters];
NSString *urlString = parameters[kFIRDLParameterDeepLinkIdentifier];
_url = [NSURL URLWithString:urlString];
_inviteId = parameters[kFIRDLParameterInviteId];
Expand Down Expand Up @@ -134,6 +136,18 @@ + (FIRDLMatchType)matchTypeWithString:(NSString *)string {
return [matchMap[string] integerValue] ?: FIRDLMatchTypeNone;
}

+ (NSDictionary<NSString *, id> *)extractUTMParams:(NSDictionary<NSString *, id> *)parameters {
NSMutableDictionary<NSString *, id> *utmParamsDictionary = [[NSMutableDictionary alloc] init];

for (NSString *key in parameters) {
if ([key hasPrefix:FDLUTMParamPrefix]) {
[utmParamsDictionary setObject:[parameters valueForKey:key] forKey:key];
}
}

return [[NSDictionary alloc] initWithDictionary:utmParamsDictionary];
}

@end

#endif // TARGET_OS_IOS
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,12 @@ NS_SWIFT_NAME(DynamicLink)
*/
@property(nonatomic, assign, readonly) FIRDLMatchType matchType;

/**
* @property utmParametersDictionary
* @abstract UTM parameters associated with a Firebase Dynamic Link.
*/
@property(nonatomic, copy, readonly) NSDictionary<NSString *, id> *utmParametersDictionary;

/**
* @property minimumAppVersion
* @abstract The minimum iOS application version that supports the Dynamic Link. This is retrieved
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,12 @@ - (void)_showDynamicLinkInfo:(FIRDynamicLink *)dynamicLink {

UIAlertController *alertVC = [UIAlertController
alertControllerWithTitle:@"Got Dynamic Link!"
message:[NSString stringWithFormat:
@"URL [%@], matchType [%ld], minimumAppVersion [%@]",
dynamicLink.url, (unsigned long)dynamicLink.matchType,
dynamicLink.minimumAppVersion]
message:[NSString stringWithFormat:@"URL [%@], matchType [%ld], "
@"minimumAppVersion [%@], utmParams [%@]",
dynamicLink.url,
(unsigned long)dynamicLink.matchType,
dynamicLink.minimumAppVersion,
dynamicLink.utmParametersDictionary]
preferredStyle:UIAlertControllerStyleAlert];
[alertVC addAction:[UIAlertAction actionWithTitle:@"Dismiss"
style:UIAlertActionStyleCancel
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,12 @@ - (void)_showDynamicLinkInfo:(FIRDynamicLink *)dynamicLink {

UIAlertController *alertVC = [UIAlertController
alertControllerWithTitle:@"Got Dynamic Link!"
message:[NSString stringWithFormat:
@"URL [%@], matchType [%ld], minimumAppVersion [%@]",
dynamicLink.url, (unsigned long)dynamicLink.matchType,
dynamicLink.minimumAppVersion]
message:[NSString stringWithFormat:@"URL [%@], matchType [%ld], "
@"minimumAppVersion [%@], utmParams [%@]",
dynamicLink.url,
(unsigned long)dynamicLink.matchType,
dynamicLink.minimumAppVersion,
dynamicLink.utmParametersDictionary]
preferredStyle:UIAlertControllerStyleAlert];
[alertVC addAction:[UIAlertAction actionWithTitle:@"Dismiss"
style:UIAlertActionStyleCancel
Expand Down