Skip to content

Commit d3c2d83

Browse files
committed
Revert "Add warning for deprecated API to indicate that the passed in domain name's scheme will deduced as https (#2078)"
This reverts commit ceb8392.
1 parent 50d27eb commit d3c2d83

File tree

4 files changed

+5
-17
lines changed

4 files changed

+5
-17
lines changed

Firebase/DynamicLinks/CHANGELOG.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
# v3.2.0
2-
- Add support for creating and receiving dynamic links from custom domains. This feature is not yet available for public consumption. (#1962, #2017, #2078)
1+
# v3.1.2
32
- Delete deprecated source files. (#2038)
43

54
# v3.1.1

Firebase/DynamicLinks/FDLURLComponents/FDLURLComponents.m

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -452,21 +452,13 @@ @implementation FIRDynamicLinkComponents
452452
#pragma mark Deprecated Initializers.
453453
+ (instancetype)componentsWithLink:(NSURL *)link domain:(NSString *)domain {
454454
NSURL *domainURL = [NSURL URLWithString:domain];
455-
if (!domainURL.scheme) {
456-
FDLLog(FDLLogLevelWarning, FDLLogIdentifierSetupWarnHTTPSScheme,
457-
@"Only https scheme is allowed. The supplied domain's scheme will be treated as https.");
458-
}
459455
NSString *domainURIPrefix =
460456
domainURL.scheme ? domain : [NSString stringWithFormat:@"https://%@", domain];
461457
return [FIRDynamicLinkComponents componentsWithLink:link domainURIPrefix:domainURIPrefix];
462458
}
463459

464460
- (instancetype)initWithLink:(NSURL *)link domain:(NSString *)domain {
465461
NSURL *domainURL = [NSURL URLWithString:domain];
466-
if (!domainURL.scheme) {
467-
FDLLog(FDLLogLevelWarning, FDLLogIdentifierSetupWarnHTTPSScheme,
468-
@"Only https scheme is allowed. The supplied domain's scheme will be treated as https.");
469-
}
470462
NSString *domainURIPrefix =
471463
domainURL.scheme ? domain : [NSString stringWithFormat:@"https://%@", domain];
472464
return [self initWithLink:link domainURIPrefix:domainURIPrefix];
@@ -480,7 +472,7 @@ + (instancetype)componentsWithLink:(NSURL *)link domainURIPrefix:(NSString *)dom
480472
@"Invalid domainURIPrefix. Please input a valid URL.");
481473
return nil;
482474
}
483-
if (![[domainURIPrefixURL.scheme lowercaseString] isEqualToString:@"https"]) {
475+
if (![[domainURIPrefixURL.scheme lowercaseString] hasPrefix:@"https"]) {
484476
FDLLog(FDLLogLevelError, FDLLogIdentifierSetupInvalidDomainURIPrefixScheme,
485477
@"Invalid domainURIPrefix scheme. Scheme needs to be https");
486478
return nil;
@@ -499,7 +491,7 @@ - (instancetype)initWithLink:(NSURL *)link domainURIPrefix:(NSString *)domainURI
499491
@"Invalid domainURIPrefix. Please input a valid URL.");
500492
return nil;
501493
}
502-
if (![[domainURIPrefixURL.scheme lowercaseString] isEqualToString:@"https"]) {
494+
if (![[domainURIPrefixURL.scheme lowercaseString] hasPrefix:@"https"]) {
503495
FDLLog(FDLLogLevelError, FDLLogIdentifierSetupInvalidDomainURIPrefixScheme,
504496
@"Invalid domainURIPrefix scheme. Scheme needs to be https");
505497
return nil;

Firebase/DynamicLinks/Logging/FDLLogging.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ typedef NS_ENUM(NSInteger, FDLLogIdentifier) {
3535
FDLLogIdentifierSetupNonDefaultApp = 2,
3636
FDLLogIdentifierSetupInvalidDomainURIPrefixScheme = 3,
3737
FDLLogIdentifierSetupInvalidDomainURIPrefix = 4,
38-
FDLLogIdentifierSetupWarnHTTPSScheme = 5,
3938
};
4039

4140
/** The appropriate formatter for using NSInteger in FIRLogger. */

Firebase/DynamicLinks/Public/FDLURLComponents.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -512,8 +512,7 @@ FIR_SWIFT_NAME(DynamicLinkComponents)
512512
* @param link Deep link to be stored in created Dynamic link. This link also called "payload" of
513513
* the Dynamic link.
514514
* @param domain Domain of your App. This value must be equal to your assigned domain from Firebase
515-
* Console. (e.g. xyz.page.link). Note that the domain scheme is required to be https and is
516-
* assumed as such by this API.
515+
* Console.
517516
*/
518517
+ (instancetype)componentsWithLink:(NSURL *)link
519518
domain:(NSString *)domain
@@ -528,8 +527,7 @@ FIR_SWIFT_NAME(DynamicLinkComponents)
528527
* @param link Deep link to be stored in created Dynamic link. This link also called "payload" of
529528
* the Dynamic link.
530529
* @param domain Domain of your App. This value must be equal to your assigned domain from Firebase
531-
* Console. (e.g. xyz.page.link). Note that the domain scheme is required to be https and is
532-
* assumed as such by this API.
530+
* Console.
533531
*/
534532
- (instancetype)initWithLink:(NSURL *)link
535533
domain:(NSString *)domain

0 commit comments

Comments
 (0)