Skip to content

Commit 37eafc5

Browse files
committed
Add test
1 parent 7ca3101 commit 37eafc5

File tree

3 files changed

+20
-3
lines changed

3 files changed

+20
-3
lines changed

libs/SalesforceSDKCore/SalesforceSDKCore/Classes/OAuth/DomainDiscoveryCoordinator.swift

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,13 @@ public class DomainDiscoveryCoordinator: NSObject {
7878
}
7979

8080
@objc
81+
@available(*, deprecated, renamed: "isDiscoveryDomain(domain:)")
8182
public func isDiscoveryDomain(_ domain: String?, clientId: String?) -> Bool {
83+
return isDiscoveryDomain(domain)
84+
}
85+
86+
@objc
87+
public func isDiscoveryDomain(_ domain: String?) -> Bool {
8288
guard let domain = domain else { return false }
8389
let isDiscovery = domain.lowercased().contains(DomainDiscovery.URLComponent.path.rawValue)
8490
let discoveryEnabled = SalesforceManager.shared.useWelcomeDiscovery

libs/SalesforceSDKCore/SalesforceSDKCore/Classes/OAuth/SFOAuthCoordinator.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
#import "SFSDKIDPConstants.h"
5050
#import "SFSDKAuthSession.h"
5151
#import "SFSDKAuthRequest.h"
52+
#import <SalesforceSDKCore/SalesforceSDKCore-Swift.h>
5253
#import <SalesforceSDKCommon/SalesforceSDKCommon-Swift.h>
5354
#import <SalesforceSDKCommon/SFSDKDatasharingHelper.h>
5455
#import <LocalAuthentication/LocalAuthentication.h>
@@ -213,8 +214,7 @@ - (void)authenticate {
213214

214215
- (void)authenticateWithCredentials:(SFOAuthCredentials *)credentials {
215216
self.credentials = credentials;
216-
if ([self.domainDiscoveryCoordinator isDiscoveryDomain:self.credentials.domain
217-
clientId:self.credentials.clientId]) {
217+
if ([self.domainDiscoveryCoordinator isDiscoveryDomain:self.credentials.domain]) {
218218
[self runMyDomainDiscoveryAndAuthenticate];
219219
return;
220220
}

libs/SalesforceSDKCore/SalesforceSDKCoreTests/DomainDiscoveryCoordinatorTests.swift

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,4 +155,15 @@ final class DomainDiscoveryCoordinatorTests: XCTestCase {
155155
XCTAssertEqual(results?.myDomain, expectedDomain)
156156
XCTAssertEqual(results?.loginHint, expectedLoginHint)
157157
}
158-
}
158+
159+
func testDiscoveryFlag() throws {
160+
let coordinator = DomainDiscoveryCoordinator()
161+
let domain = "welcome.salesforce.com/discovery"
162+
163+
SalesforceManager.shared.useWelcomeDiscovery = false
164+
XCTAssertFalse(coordinator.isDiscoveryDomain(domain))
165+
166+
SalesforceManager.shared.useWelcomeDiscovery = true
167+
XCTAssertTrue(coordinator.isDiscoveryDomain(domain))
168+
}
169+
}

0 commit comments

Comments
 (0)