Skip to content

Remove welcome discovery flag #3972

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
bbirman merged 1 commit into from
Jan 20, 2026
Merged

Remove welcome discovery flag #3972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 0 additions & 4 deletions libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Common/SalesforceSDKManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,10 +237,6 @@ NS_SWIFT_NAME(SalesforceManager)
*/
@property (nonatomic, assign) BOOL useWebServerAuthentication;

/** Whether or not the app supports welcome discovery, this should only be enabled if the connected app is supported.
*/
@property (nonatomic, assign) BOOL supportsWelcomeDiscovery;

/** Whether hybrid authentication flow should be used. Defaults to YES.
*/
@property (nonatomic, assign) BOOL useHybridAuthentication;
Expand Down
1 change: 0 additions & 1 deletion libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Common/SalesforceSDKManager.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,6 @@ - (instancetype)init {
self.useWebServerAuthentication = YES;
self.blockSalesforceIntegrationUser = NO;
self.useHybridAuthentication = YES;
self.supportsWelcomeDiscovery = NO;
[self setupServiceConfiguration];
_snapshotViewControllers = [SFSDKSafeMutableDictionary new];
_nativeLoginViewControllers = [SFSDKSafeMutableDictionary new];
Expand Down
6 changes: 1 addition & 5 deletions libs/SalesforceSDKCore/SalesforceSDKCore/Classes/OAuth/DomainDiscoveryCoordinator.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,7 @@ public class DomainDiscoveryCoordinator: NSObject {
public func isDiscoveryDomain(_ domain: String?) -> Bool {
guard let domain = domain else { return false }
let isDiscovery = domain.lowercased().contains(DomainDiscovery.URLComponent.path.rawValue)
let discoveryEnabled = SalesforceManager.shared.supportsWelcomeDiscovery
if isDiscovery && !discoveryEnabled {
SFSDKCoreLogger.w(classForCoder, message: "\(domain) is a discovery domain, but welcome discovery isn't enabled.")
}
return isDiscovery && discoveryEnabled
return isDiscovery
}
}

Expand Down
11 changes: 0 additions & 11 deletions libs/SalesforceSDKCore/SalesforceSDKCoreTests/DomainDiscoveryCoordinatorTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,15 +155,4 @@ final class DomainDiscoveryCoordinatorTests: XCTestCase {
XCTAssertEqual(results?.myDomain, expectedDomain)
XCTAssertEqual(results?.loginHint, expectedLoginHint)
}

func testDiscoveryFlag() throws {
let coordinator = DomainDiscoveryCoordinator()
let domain = "welcome.salesforce.com/discovery"

SalesforceManager.shared.supportsWelcomeDiscovery = false
XCTAssertFalse(coordinator.isDiscoveryDomain(domain))

SalesforceManager.shared.supportsWelcomeDiscovery = true
XCTAssertTrue(coordinator.isDiscoveryDomain(domain))
}
}
Loading