Skip to content
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

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

Merged
merged 17 commits into from
Nov 14, 2018
Merged
Show file tree
Hide file tree
Changes from 14 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
3 changes: 3 additions & 0 deletions Firebase/DynamicLinks/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# v3.2.0
- Add support for creating and receiving dynamic links from custom domains. This feature is not yet available for public consumption. (#1962, #2017, #2078)

# v3.1.2
dmandar marked this conversation as resolved.
Show resolved Hide resolved
- Delete deprecated source files. (#2038)

Expand Down
12 changes: 10 additions & 2 deletions Firebase/DynamicLinks/FDLURLComponents/FDLURLComponents.m
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
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,
dmandar marked this conversation as resolved.
Show resolved Hide resolved
};

/** The appropriate formatter for using NSInteger in FIRLogger. */
Expand Down
6 changes: 4 additions & 2 deletions Firebase/DynamicLinks/Public/FDLURLComponents.h
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