Skip to content

Add warning for deprecated API to indicate that the passed in domain name's scheme will deduced as https #2078

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 17 commits into from
Nov 14, 2018
Merged

Add warning for deprecated API to indicate that the passed in domain name's scheme will deduced as https #2078

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
61f83b8
Add support for creating DL with custom domain names/paths. The new d…
dmandar Nov 13, 2018
f3122c9
Merge branch 'master' into md-fdl2
dmandar Nov 13, 2018
72e079d
Fix style.
dmandar Nov 13, 2018
0f2b022
style
paulb777 Nov 13, 2018
57f3da3
Fix typo in DEPRECATED_MSG_ATTRIBUTE, other nits.
dmandar Nov 13, 2018
59137d2
Fix styling.
dmandar Nov 13, 2018
6bea846
Check incoming domainURIPrefix for validity using NSURL and check for…
dmandar Nov 13, 2018
a44673e
Merge branch 'master' into md-fdl2
dmandar Nov 14, 2018
d7ef90d
Add extra checks for deprecated domain parameter being incorrectly ca…
dmandar Nov 14, 2018
0bcf156
Log a warning for the deprecated API stating that the scheme for the …
dmandar Nov 14, 2018
4fdbdf6
Merge branch 'master' into md-fdl2
dmandar Nov 14, 2018
4cc7248
Update CHANGELOG for M38.
dmandar Nov 14, 2018
282c5b0
Update changelog for M38
dmandar Nov 14, 2018
8551fad
Update CHANGELOG for M38 release.
dmandar Nov 14, 2018
f043ee8
Capitalize HTTPS.
dmandar Nov 14, 2018
57bbac5
Update CHANGELOG to include PR for removal of deprecated files.
dmandar Nov 14, 2018
8e26357
Capitalize HTTPS.
dmandar Nov 14, 2018
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
12 changes: 10 additions & 2 deletions Firebase/DynamicLinks/FDLURLComponents/FDLURLComponents.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,13 +452,21 @@ @implementation FIRDynamicLinkComponents
#pragma mark Deprecated Initializers.
+ (instancetype)componentsWithLink:(NSURL *)link domain:(NSString *)domain {
NSURL *domainURL = [NSURL URLWithString:domain];
if (!domainURL.scheme) {
FDLLog(FDLLogLevelWarning, FDLLogIdentifierSetupWarnHttpsScheme,
@"Only https scheme is allowed. The supplied domain's scheme will be treated as https.");
}
NSString *domainURIPrefix =
domainURL.scheme ? domain : [NSString stringWithFormat:@"https://%@", domain];
return [FIRDynamicLinkComponents componentsWithLink:link domainURIPrefix:domainURIPrefix];
}

- (instancetype)initWithLink:(NSURL *)link domain:(NSString *)domain {
NSURL *domainURL = [NSURL URLWithString:domain];
if (!domainURL.scheme) {
FDLLog(FDLLogLevelWarning, FDLLogIdentifierSetupWarnHttpsScheme,
@"Only https scheme is allowed. The supplied domain's scheme will be treated as https.");
}
NSString *domainURIPrefix =
domainURL.scheme ? domain : [NSString stringWithFormat:@"https://%@", domain];
return [self initWithLink:link domainURIPrefix:domainURIPrefix];
Expand All @@ -472,7 +480,7 @@ + (instancetype)componentsWithLink:(NSURL *)link domainURIPrefix:(NSString *)dom
@"Invalid domainURIPrefix. Please input a valid URL.");
return nil;
}
if (![[domainURIPrefixURL.scheme lowercaseString] hasPrefix:@"https"]) {
if (![[domainURIPrefixURL.scheme lowercaseString] isEqualToString:@"https"]) {
FDLLog(FDLLogLevelError, FDLLogIdentifierSetupInvalidDomainURIPrefixScheme,
@"Invalid domainURIPrefix scheme. Scheme needs to be https");
return nil;
Expand All @@ -491,7 +499,7 @@ - (instancetype)initWithLink:(NSURL *)link domainURIPrefix:(NSString *)domainURI
@"Invalid domainURIPrefix. Please input a valid URL.");
return nil;
}
if (![[domainURIPrefixURL.scheme lowercaseString] hasPrefix:@"https"]) {
if (![[domainURIPrefixURL.scheme lowercaseString] isEqualToString:@"https"]) {
FDLLog(FDLLogLevelError, FDLLogIdentifierSetupInvalidDomainURIPrefixScheme,
@"Invalid domainURIPrefix scheme. Scheme needs to be https");
return nil;
Expand Down
1 change: 1 addition & 0 deletions Firebase/DynamicLinks/Logging/FDLLogging.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ typedef NS_ENUM(NSInteger, FDLLogIdentifier) {
FDLLogIdentifierSetupNonDefaultApp = 2,
FDLLogIdentifierSetupInvalidDomainURIPrefixScheme = 3,
FDLLogIdentifierSetupInvalidDomainURIPrefix = 4,
FDLLogIdentifierSetupWarnHttpsScheme = 5,
};

/** The appropriate formatter for using NSInteger in FIRLogger. */
Expand Down
6 changes: 4 additions & 2 deletions Firebase/DynamicLinks/Public/FDLURLComponents.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -512,7 +512,8 @@ FIR_SWIFT_NAME(DynamicLinkComponents)
* @param link Deep link to be stored in created Dynamic link. This link also called "payload" of
* the Dynamic link.
* @param domain Domain of your App. This value must be equal to your assigned domain from Firebase
* Console.
* Console. (e.g. xyz.page.link). Note that the domain scheme is required to be https and is
* assumed as such by this API.
*/
+ (instancetype)componentsWithLink:(NSURL *)link
domain:(NSString *)domain
Expand All @@ -527,7 +528,8 @@ FIR_SWIFT_NAME(DynamicLinkComponents)
* @param link Deep link to be stored in created Dynamic link. This link also called "payload" of
* the Dynamic link.
* @param domain Domain of your App. This value must be equal to your assigned domain from Firebase
* Console.
* Console. (e.g. xyz.page.link). Note that the domain scheme is required to be https and is
* assumed as such by this API.
*/
- (instancetype)initWithLink:(NSURL *)link
domain:(NSString *)domain
Expand Down