From e76ae6920d7fbf6a4c2edd530f1bfb72ac70ff14 Mon Sep 17 00:00:00 2001 From: Brianna Birman Date: Tue, 20 Jan 2026 14:40:09 -0800 Subject: [PATCH] Remove welcome discovery flag --- .../Classes/Common/SalesforceSDKManager.h | 4 ---- .../Classes/Common/SalesforceSDKManager.m | 1 - .../Classes/OAuth/DomainDiscoveryCoordinator.swift | 6 +----- .../DomainDiscoveryCoordinatorTests.swift | 11 ----------- 4 files changed, 1 insertion(+), 21 deletions(-) diff --git a/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Common/SalesforceSDKManager.h b/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Common/SalesforceSDKManager.h index 0b215b4232..5a9bfa2a47 100644 --- a/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Common/SalesforceSDKManager.h +++ b/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Common/SalesforceSDKManager.h @@ -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; diff --git a/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Common/SalesforceSDKManager.m b/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Common/SalesforceSDKManager.m index 664c873bc7..6ae420a28e 100644 --- a/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Common/SalesforceSDKManager.m +++ b/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Common/SalesforceSDKManager.m @@ -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]; diff --git a/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/OAuth/DomainDiscoveryCoordinator.swift b/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/OAuth/DomainDiscoveryCoordinator.swift index 4e37b0ae07..1f49c75b2d 100644 --- a/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/OAuth/DomainDiscoveryCoordinator.swift +++ b/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/OAuth/DomainDiscoveryCoordinator.swift @@ -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 } } diff --git a/libs/SalesforceSDKCore/SalesforceSDKCoreTests/DomainDiscoveryCoordinatorTests.swift b/libs/SalesforceSDKCore/SalesforceSDKCoreTests/DomainDiscoveryCoordinatorTests.swift index c941fe16ce..ea25be0618 100644 --- a/libs/SalesforceSDKCore/SalesforceSDKCoreTests/DomainDiscoveryCoordinatorTests.swift +++ b/libs/SalesforceSDKCore/SalesforceSDKCoreTests/DomainDiscoveryCoordinatorTests.swift @@ -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)) - } }