From e8691215c1c13a48aa47b60fb3cf3653ae74cd4c Mon Sep 17 00:00:00 2001 From: Brianna Birman Date: Mon, 20 Apr 2026 12:44:17 -0700 Subject: [PATCH] Remove deprecated code --- SalesforceSDKCommon.podspec | 2 +- SalesforceSDKCore.podspec | 2 +- .../project.pbxproj | 8 --- .../Classes/Util/SFTestContext.h | 66 ----------------- .../Classes/Util/SFTestContext.m | 62 ---------------- .../SalesforceSDKCommon/SalesforceSDKCommon.h | 1 - .../project.pbxproj | 8 --- .../Classes/Common/WebViewStateManager.swift | 28 -------- .../Classes/OAuth/SFOAuthCoordinator.h | 7 -- .../Classes/OAuth/SFOAuthCoordinator.m | 7 -- .../Classes/OAuth/SFSDKAuthRequest.h | 1 - .../Classes/OAuth/SFSDKAuthSession.m | 6 -- .../Classes/Test/SFSDKAsyncProcessListener.h | 50 ------------- .../Classes/Test/SFSDKAsyncProcessListener.m | 71 ------------------- .../Classes/Util/SFSDKOAuth2.h | 11 +-- .../Classes/Util/SFSDKOAuth2.m | 7 +- .../SalesforceSDKCore/SalesforceSDKCore.h | 1 - .../SalesforceSDKManagerTests.m | 6 -- .../WebViewStateManagerTests.swift | 6 -- 19 files changed, 6 insertions(+), 344 deletions(-) delete mode 100644 libs/SalesforceSDKCommon/SalesforceSDKCommon/Classes/Util/SFTestContext.h delete mode 100644 libs/SalesforceSDKCommon/SalesforceSDKCommon/Classes/Util/SFTestContext.m delete mode 100644 libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Test/SFSDKAsyncProcessListener.h delete mode 100644 libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Test/SFSDKAsyncProcessListener.m diff --git a/SalesforceSDKCommon.podspec b/SalesforceSDKCommon.podspec index 872de0bf16..02b1676470 100644 --- a/SalesforceSDKCommon.podspec +++ b/SalesforceSDKCommon.podspec @@ -19,7 +19,7 @@ Pod::Spec.new do |s| s.subspec 'SalesforceSDKCommon' do |sdkcommon| sdkcommon.source_files = 'libs/SalesforceSDKCommon/SalesforceSDKCommon/Classes/**/*.{h,m,swift}', 'libs/SalesforceSDKCommon/SalesforceSDKCommon/SalesforceSDKCommon.h' - sdkcommon.public_header_files = 'libs/SalesforceSDKCommon/SalesforceSDKCommon/Classes/Logger/SFDefaultLogger.h', 'libs/SalesforceSDKCommon/SalesforceSDKCommon/Classes/Logger/SFLogger.h', 'libs/SalesforceSDKCommon/SalesforceSDKCommon/Classes/Util/NSUserDefaults+SFAdditions.h', 'libs/SalesforceSDKCommon/SalesforceSDKCommon/Classes/Util/SFFileProtectionHelper.h', 'libs/SalesforceSDKCommon/SalesforceSDKCommon/Classes/Util/SFJsonUtils.h', 'libs/SalesforceSDKCommon/SalesforceSDKCommon/Classes/Util/SFPathUtil.h', 'libs/SalesforceSDKCommon/SalesforceSDKCommon/Classes/Util/SFSDKDatasharingHelper.h', 'libs/SalesforceSDKCommon/SalesforceSDKCommon/Classes/Util/SFSDKReachability.h', 'libs/SalesforceSDKCommon/SalesforceSDKCommon/Classes/Util/SFSDKSafeMutableArray.h', 'libs/SalesforceSDKCommon/SalesforceSDKCommon/Classes/Util/SFSDKSafeMutableDictionary.h', 'libs/SalesforceSDKCommon/SalesforceSDKCommon/Classes/Util/SFSDKSafeMutableSet.h', 'libs/SalesforceSDKCommon/SalesforceSDKCommon/Classes/Util/SFSwiftDetectUtil.h', 'libs/SalesforceSDKCommon/SalesforceSDKCommon/Classes/Util/SFTestContext.h', 'libs/SalesforceSDKCommon/SalesforceSDKCommon/SalesforceSDKCommon.h' + sdkcommon.public_header_files = 'libs/SalesforceSDKCommon/SalesforceSDKCommon/Classes/Logger/SFDefaultLogger.h', 'libs/SalesforceSDKCommon/SalesforceSDKCommon/Classes/Logger/SFLogger.h', 'libs/SalesforceSDKCommon/SalesforceSDKCommon/Classes/Util/NSUserDefaults+SFAdditions.h', 'libs/SalesforceSDKCommon/SalesforceSDKCommon/Classes/Util/SFFileProtectionHelper.h', 'libs/SalesforceSDKCommon/SalesforceSDKCommon/Classes/Util/SFJsonUtils.h', 'libs/SalesforceSDKCommon/SalesforceSDKCommon/Classes/Util/SFPathUtil.h', 'libs/SalesforceSDKCommon/SalesforceSDKCommon/Classes/Util/SFSDKDatasharingHelper.h', 'libs/SalesforceSDKCommon/SalesforceSDKCommon/Classes/Util/SFSDKReachability.h', 'libs/SalesforceSDKCommon/SalesforceSDKCommon/Classes/Util/SFSDKSafeMutableArray.h', 'libs/SalesforceSDKCommon/SalesforceSDKCommon/Classes/Util/SFSDKSafeMutableDictionary.h', 'libs/SalesforceSDKCommon/SalesforceSDKCommon/Classes/Util/SFSDKSafeMutableSet.h', 'libs/SalesforceSDKCommon/SalesforceSDKCommon/Classes/Util/SFSwiftDetectUtil.h', 'libs/SalesforceSDKCommon/SalesforceSDKCommon/SalesforceSDKCommon.h' sdkcommon.prefix_header_contents = '' sdkcommon.resource_bundles = { 'SalesforceSDKCommon' => [ 'libs/SalesforceSDKCommon/SalesforceSDKCommon/PrivacyInfo.xcprivacy' ] } sdkcommon.requires_arc = true diff --git a/SalesforceSDKCore.podspec b/SalesforceSDKCore.podspec index 2ec93aeaba..2e368d539e 100644 --- a/SalesforceSDKCore.podspec +++ b/SalesforceSDKCore.podspec @@ -25,7 +25,7 @@ Pod::Spec.new do |s| sdkcore.resources = ['shared/resources/SalesforceSDKAssets.xcassets'] sdkcore.source_files = 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/**/*.{h,m,swift}', 'libs/SalesforceSDKCore/SalesforceSDKCore/SalesforceSDKCore.h' # public_header_files is automatically populated by update_podspec_headers.sh which is run when building SalesforceSDKCore - sdkcore.public_header_files = 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Analytics/SFSDKAILTNPublisher.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Analytics/SFSDKAnalyticsPublisher.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Analytics/SFSDKEventBuilderHelper.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Analytics/SFSDKSalesforceAnalyticsManager.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Common/NSData+SFAdditions.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Common/NSData+SFSDKUtils.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Common/NSDictionary+SFAdditions.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Common/NSString+SFAdditions.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Common/NSURL+SFAdditions.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Common/NSURLResponse+SFAdditions.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Common/SalesforceSDKConstants.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Common/SalesforceSDKManager.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Common/SFFormatUtils.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Common/SFSDKAppConfig.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Common/SFSDKAppFeatureMarkers.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Common/UIDevice+SFHardware.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Common/UIScreen+SFAdditions.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Identity/SFIdentityCoordinator.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Identity/SFIdentityData.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/IDP/SFSDKLoginFlowSelectionView.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/IDP/SFSDKUITableViewCell.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/IDP/SFSDKUserSelectionNavViewController.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/IDP/SFSDKUserSelectionTableViewController.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/IDP/SFSDKUserSelectionView.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Login/LoginHost/SFSDKLoginHost.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Login/LoginHost/SFSDKLoginHostDelegate.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Login/LoginHost/SFSDKLoginHostListViewController.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Login/LoginHost/SFSDKLoginHostStorage.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Login/SFLoginViewController.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Login/SFSDKLoginViewControllerConfig.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/OAuth/SFOAuthCoordinator.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/OAuth/SFOAuthCredentials.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/OAuth/SFOAuthInfo.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/OAuth/SFOAuthOrgAuthConfiguration.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/OAuth/SFOAuthSessionRefresher.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/PushNotification/SFSDKPushNotificationDecryption.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/PushNotification/SFSDKPushNotificationError.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/PushNotification/SFSDKPushNotificationFieldsConstants.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFNetwork.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFRestAPI.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFRestAPI+Blocks.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFRestAPI+Files.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFRestAPI+Notifications.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFRestAPI+QueryBuilder.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFRestRequest.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFSDKBatchRequest.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFSDKBatchResponse.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFSDKCollectionResponse.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFSDKCompositeRequest.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFSDKCompositeResponse.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFSDKPrimingRecordsResponse.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFSObjectTree.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Security/SFSDKCryptoUtils.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Test/SFSDKAsyncProcessListener.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Test/SFSDKTestCredentialsData.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Test/SFSDKTestRequestListener.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Test/TestSetupUtils.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/UserAccount/SFAuthErrorHandlerList.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/UserAccount/SFUserAccount.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/UserAccount/SFUserAccountConstants.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/UserAccount/SFUserAccountIdentity.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/UserAccount/SFUserAccountManager.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/UserAccount/ViewControllers/SFDefaultUserManagementDetailViewController.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/UserAccount/ViewControllers/SFDefaultUserManagementListViewController.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/UserAccount/ViewControllers/SFDefaultUserManagementViewController.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Util/NSURL+SFStringUtils.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Util/SalesforceSDKCoreDefines.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Util/SFApplicationHelper.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Util/SFDirectoryManager.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Util/SFManagedPreferences.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Util/SFPreferences.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Util/SFSDKAuthConfigUtil.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Util/SFSDKAuthHelper.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Util/SFSDKCoreLogger.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Util/SFSDKOAuth2.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Util/SFSDKOAuthConstants.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Util/SFSDKResourceUtils.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Util/SFSDKSoqlBuilder.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Util/SFSDKSoslBuilder.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Util/SFSDKSoslReturningBuilder.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Util/SFSDKViewControllerConfig.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Util/SFSDKWebUtils.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Util/UIColor+SFColors.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Views/SFSDKAlertMessage.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Views/SFSDKAlertMessageBuilder.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Views/SFSDKNavigationController.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Views/SFSDKViewController.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Views/SFSDKWindowContainer.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Views/SFSDKWindowManager.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/SalesforceSDKCore.h' + sdkcore.public_header_files = 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Analytics/SFSDKAILTNPublisher.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Analytics/SFSDKAnalyticsPublisher.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Analytics/SFSDKEventBuilderHelper.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Analytics/SFSDKSalesforceAnalyticsManager.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Common/NSData+SFAdditions.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Common/NSData+SFSDKUtils.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Common/NSDictionary+SFAdditions.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Common/NSString+SFAdditions.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Common/NSURL+SFAdditions.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Common/NSURLResponse+SFAdditions.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Common/SFFormatUtils.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Common/SFSDKAppConfig.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Common/SFSDKAppFeatureMarkers.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Common/SalesforceSDKConstants.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Common/SalesforceSDKManager.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Common/UIDevice+SFHardware.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Common/UIScreen+SFAdditions.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/IDP/SFSDKLoginFlowSelectionView.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/IDP/SFSDKUITableViewCell.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/IDP/SFSDKUserSelectionNavViewController.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/IDP/SFSDKUserSelectionTableViewController.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/IDP/SFSDKUserSelectionView.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Identity/SFIdentityCoordinator.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Identity/SFIdentityData.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Login/LoginHost/SFSDKLoginHost.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Login/LoginHost/SFSDKLoginHostDelegate.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Login/LoginHost/SFSDKLoginHostListViewController.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Login/LoginHost/SFSDKLoginHostStorage.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Login/SFLoginViewController.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Login/SFSDKLoginViewControllerConfig.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/OAuth/SFOAuthCoordinator.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/OAuth/SFOAuthCredentials.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/OAuth/SFOAuthInfo.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/OAuth/SFOAuthOrgAuthConfiguration.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/OAuth/SFOAuthSessionRefresher.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/PushNotification/SFSDKPushNotificationDecryption.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/PushNotification/SFSDKPushNotificationError.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/PushNotification/SFSDKPushNotificationFieldsConstants.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFNetwork.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFRestAPI+Blocks.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFRestAPI+Files.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFRestAPI+Notifications.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFRestAPI+QueryBuilder.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFRestAPI.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFRestRequest.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFSDKBatchRequest.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFSDKBatchResponse.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFSDKCollectionResponse.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFSDKCompositeRequest.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFSDKCompositeResponse.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFSDKPrimingRecordsResponse.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFSObjectTree.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Security/SFSDKCryptoUtils.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Test/SFSDKTestCredentialsData.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Test/SFSDKTestRequestListener.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Test/TestSetupUtils.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/UserAccount/SFAuthErrorHandlerList.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/UserAccount/SFUserAccount.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/UserAccount/SFUserAccountConstants.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/UserAccount/SFUserAccountIdentity.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/UserAccount/SFUserAccountManager.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/UserAccount/ViewControllers/SFDefaultUserManagementDetailViewController.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/UserAccount/ViewControllers/SFDefaultUserManagementListViewController.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/UserAccount/ViewControllers/SFDefaultUserManagementViewController.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Util/NSURL+SFStringUtils.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Util/SFApplicationHelper.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Util/SFDirectoryManager.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Util/SFManagedPreferences.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Util/SFPreferences.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Util/SFSDKAuthConfigUtil.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Util/SFSDKAuthHelper.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Util/SFSDKCoreLogger.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Util/SFSDKOAuth2.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Util/SFSDKOAuthConstants.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Util/SFSDKResourceUtils.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Util/SFSDKSoqlBuilder.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Util/SFSDKSoslBuilder.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Util/SFSDKSoslReturningBuilder.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Util/SFSDKViewControllerConfig.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Util/SFSDKWebUtils.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Util/SalesforceSDKCoreDefines.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Util/UIColor+SFColors.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Views/SFSDKAlertMessage.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Views/SFSDKAlertMessageBuilder.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Views/SFSDKNavigationController.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Views/SFSDKViewController.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Views/SFSDKWindowContainer.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Views/SFSDKWindowManager.h', 'libs/SalesforceSDKCore/SalesforceSDKCore/SalesforceSDKCore.h' sdkcore.requires_arc = true sdkcore.prefix_header_contents = '#import "SFSDKCoreLogger.h"', '#import "SalesforceSDKConstants.h"' diff --git a/libs/SalesforceSDKCommon/SalesforceSDKCommon.xcodeproj/project.pbxproj b/libs/SalesforceSDKCommon/SalesforceSDKCommon.xcodeproj/project.pbxproj index cc63d18df8..de5690d7e3 100644 --- a/libs/SalesforceSDKCommon/SalesforceSDKCommon.xcodeproj/project.pbxproj +++ b/libs/SalesforceSDKCommon/SalesforceSDKCommon.xcodeproj/project.pbxproj @@ -38,8 +38,6 @@ B77F5D152170FFEE004F3005 /* SFFileProtectionHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = B77F5D102170FFED004F3005 /* SFFileProtectionHelper.m */; }; B77F5D172170FFEE004F3005 /* SFPathUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = B77F5D112170FFED004F3005 /* SFPathUtil.m */; }; B77F5D192170FFEE004F3005 /* SFFileProtectionHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = B77F5D122170FFEE004F3005 /* SFFileProtectionHelper.h */; settings = {ATTRIBUTES = (Public, ); }; }; - B77F5D1F2171021F004F3005 /* SFTestContext.m in Sources */ = {isa = PBXBuildFile; fileRef = B77F5D1B2171021E004F3005 /* SFTestContext.m */; }; - B77F5D212171021F004F3005 /* SFTestContext.h in Headers */ = {isa = PBXBuildFile; fileRef = B77F5D1C2171021E004F3005 /* SFTestContext.h */; settings = {ATTRIBUTES = (Public, ); }; }; B77F5D232171021F004F3005 /* SFSwiftDetectUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = B77F5D1D2171021F004F3005 /* SFSwiftDetectUtil.m */; }; B77F5D252171021F004F3005 /* SFSwiftDetectUtil.h in Headers */ = {isa = PBXBuildFile; fileRef = B77F5D1E2171021F004F3005 /* SFSwiftDetectUtil.h */; settings = {ATTRIBUTES = (Public, ); }; }; B78898BC218D0329006E0C77 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B78898BB218D0329006E0C77 /* Foundation.framework */; }; @@ -107,8 +105,6 @@ B77F5D102170FFED004F3005 /* SFFileProtectionHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SFFileProtectionHelper.m; sourceTree = ""; }; B77F5D112170FFED004F3005 /* SFPathUtil.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SFPathUtil.m; sourceTree = ""; }; B77F5D122170FFEE004F3005 /* SFFileProtectionHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SFFileProtectionHelper.h; sourceTree = ""; }; - B77F5D1B2171021E004F3005 /* SFTestContext.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SFTestContext.m; sourceTree = ""; }; - B77F5D1C2171021E004F3005 /* SFTestContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SFTestContext.h; sourceTree = ""; }; B77F5D1D2171021F004F3005 /* SFSwiftDetectUtil.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SFSwiftDetectUtil.m; sourceTree = ""; }; B77F5D1E2171021F004F3005 /* SFSwiftDetectUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SFSwiftDetectUtil.h; sourceTree = ""; }; B78898BB218D0329006E0C77 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; @@ -236,8 +232,6 @@ 4F5DDEB421A4B2520024E7F3 /* SFJsonUtils.m */, B77F5D1E2171021F004F3005 /* SFSwiftDetectUtil.h */, B77F5D1D2171021F004F3005 /* SFSwiftDetectUtil.m */, - B77F5D1C2171021E004F3005 /* SFTestContext.h */, - B77F5D1B2171021E004F3005 /* SFTestContext.m */, B77F5D122170FFEE004F3005 /* SFFileProtectionHelper.h */, B77F5D102170FFED004F3005 /* SFFileProtectionHelper.m */, B77F5D0F2170FFED004F3005 /* SFPathUtil.h */, @@ -316,7 +310,6 @@ B7136D31216686EB00F6A221 /* SFSDKReachability.h in Headers */, B7136D34216686EB00F6A221 /* SFSDKDatasharingHelper.h in Headers */, B77F5CF22170FF74004F3005 /* SFSDKSafeMutableDictionary.h in Headers */, - B77F5D212171021F004F3005 /* SFTestContext.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -505,7 +498,6 @@ B7136D5821669F7C00F6A221 /* SFDefaultLogger.m in Sources */, B7136D32216686EB00F6A221 /* NSUserDefaults+SFAdditions.m in Sources */, B77F5D172170FFEE004F3005 /* SFPathUtil.m in Sources */, - B77F5D1F2171021F004F3005 /* SFTestContext.m in Sources */, B77F5CF82170FF74004F3005 /* SFSDKSafeMutableArray.m in Sources */, B77B6CA4260D261C0074BA3C /* KeychainHelper.swift in Sources */, F2F4222528B6CBF40010EF0F /* KeychainItemManager.swift in Sources */, diff --git a/libs/SalesforceSDKCommon/SalesforceSDKCommon/Classes/Util/SFTestContext.h b/libs/SalesforceSDKCommon/SalesforceSDKCommon/Classes/Util/SFTestContext.h deleted file mode 100644 index f9b601388d..0000000000 --- a/libs/SalesforceSDKCommon/SalesforceSDKCommon/Classes/Util/SFTestContext.h +++ /dev/null @@ -1,66 +0,0 @@ -/* - Copyright (c) 2015-present, salesforce.com, inc. All rights reserved. - - Redistribution and use of this software in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright notice, this list of conditions - and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, this list of - conditions and the following disclaimer in the documentation and/or other materials provided - with the distribution. - * Neither the name of salesforce.com, inc. nor the names of its contributors may be used to - endorse or promote products derived from this software without specific prior written - permission of salesforce.com, inc. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR - IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY - WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -// This class is intended to be used to set the application in testing context or -// live context. It could be used by application to implement mock logic under -// testing context so that application can be run without live connection - -#import - -NS_ASSUME_NONNULL_BEGIN - -/**Helps determine whether we're currently running tests or not. - */ -__attribute__((deprecated("Deprecated in Salesforce Mobile SDK 13.2 and will be removed in Salesforce Mobile SDK 14.0."))); -@interface SFTestContext : NSObject { - -} -/**Return YES if is running test - */ -+ (BOOL)isRunningTests; - -/**Update SFTestContext to indicate whether it is in testing context or live context - @param runningTests Yes if code is running under testing context - */ -+ (void)setIsRunningTests:(BOOL)runningTests; - -/** Sets an arbitrary object into the test context - @param object The object or nil to remove the object - @param key The key - */ -+ (void)setObject:(nullable id)object forKey:(id)key; - -/** Returns an arbitrary object from the test context - @param key The key - @return The object - */ -+ (id)objectForKey:(id)key; - -/** Removes all the stored objects - */ -+ (void)clearObjects; - -@end - -NS_ASSUME_NONNULL_END diff --git a/libs/SalesforceSDKCommon/SalesforceSDKCommon/Classes/Util/SFTestContext.m b/libs/SalesforceSDKCommon/SalesforceSDKCommon/Classes/Util/SFTestContext.m deleted file mode 100644 index 6248f279a2..0000000000 --- a/libs/SalesforceSDKCommon/SalesforceSDKCommon/Classes/Util/SFTestContext.m +++ /dev/null @@ -1,62 +0,0 @@ -/* - Copyright (c) 2015-present, salesforce.com, inc. All rights reserved. - - Redistribution and use of this software in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright notice, this list of conditions - and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, this list of - conditions and the following disclaimer in the documentation and/or other materials provided - with the distribution. - * Neither the name of salesforce.com, inc. nor the names of its contributors may be used to - endorse or promote products derived from this software without specific prior written - permission of salesforce.com, inc. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR - IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY - WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#import "SFTestContext.h" - -static BOOL runningTests = NO; -static NSMutableDictionary *objects = nil; - -@implementation SFTestContext - -+ (void)initialize { - if (self == [SFTestContext class]) { - objects = [[NSMutableDictionary alloc] init]; - } -} - -+ (BOOL)isRunningTests { - return runningTests; -} - -+ (void)setIsRunningTests:(BOOL)newRunningTests { - runningTests = newRunningTests; -} - -+ (void)setObject:(id)object forKey:(id)key { - if (object) { - objects[key] = object; - } else { - [objects removeObjectForKey:key]; - } -} - -+ (id)objectForKey:(id)key { - return objects[key]; -} - -+ (void)clearObjects { - [objects removeAllObjects]; -} - -@end diff --git a/libs/SalesforceSDKCommon/SalesforceSDKCommon/SalesforceSDKCommon.h b/libs/SalesforceSDKCommon/SalesforceSDKCommon/SalesforceSDKCommon.h index 7a7f80b97a..ca0baca1a1 100644 --- a/libs/SalesforceSDKCommon/SalesforceSDKCommon/SalesforceSDKCommon.h +++ b/libs/SalesforceSDKCommon/SalesforceSDKCommon/SalesforceSDKCommon.h @@ -28,7 +28,6 @@ */ #import -#import #import #import #import diff --git a/libs/SalesforceSDKCore/SalesforceSDKCore.xcodeproj/project.pbxproj b/libs/SalesforceSDKCore/SalesforceSDKCore.xcodeproj/project.pbxproj index 07182a7896..9ace3b7572 100644 --- a/libs/SalesforceSDKCore/SalesforceSDKCore.xcodeproj/project.pbxproj +++ b/libs/SalesforceSDKCore/SalesforceSDKCore.xcodeproj/project.pbxproj @@ -365,8 +365,6 @@ CE4CE3941C0E526A009F6029 /* SFUserAccountManager+Internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F96FD291BFD32140022F021 /* SFUserAccountManager+Internal.h */; }; CE4CE3951C0E526A009F6029 /* SFUserAccountManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F96FD2A1BFD32140022F021 /* SFUserAccountManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; CE4CE3961C0E526A009F6029 /* SFUserAccountManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 4F96FD2B1BFD32140022F021 /* SFUserAccountManager.m */; }; - CE4CE3991C0E5272009F6029 /* SFSDKAsyncProcessListener.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F96FD2F1BFD32140022F021 /* SFSDKAsyncProcessListener.h */; settings = {ATTRIBUTES = (Public, ); }; }; - CE4CE39A1C0E5272009F6029 /* SFSDKAsyncProcessListener.m in Sources */ = {isa = PBXBuildFile; fileRef = 4F96FD301BFD32140022F021 /* SFSDKAsyncProcessListener.m */; }; CE4CE39B1C0E5272009F6029 /* SFSDKTestCredentialsData.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F96FD311BFD32140022F021 /* SFSDKTestCredentialsData.h */; settings = {ATTRIBUTES = (Public, ); }; }; CE4CE39C1C0E5272009F6029 /* SFSDKTestCredentialsData.m in Sources */ = {isa = PBXBuildFile; fileRef = 4F96FD321BFD32140022F021 /* SFSDKTestCredentialsData.m */; }; CE4CE39D1C0E5272009F6029 /* SFSDKTestRequestListener.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F96FD331BFD32140022F021 /* SFSDKTestRequestListener.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -669,8 +667,6 @@ 4F96FD291BFD32140022F021 /* SFUserAccountManager+Internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "SFUserAccountManager+Internal.h"; sourceTree = ""; }; 4F96FD2A1BFD32140022F021 /* SFUserAccountManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SFUserAccountManager.h; sourceTree = ""; }; 4F96FD2B1BFD32140022F021 /* SFUserAccountManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SFUserAccountManager.m; sourceTree = ""; }; - 4F96FD2F1BFD32140022F021 /* SFSDKAsyncProcessListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SFSDKAsyncProcessListener.h; sourceTree = ""; }; - 4F96FD301BFD32140022F021 /* SFSDKAsyncProcessListener.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SFSDKAsyncProcessListener.m; sourceTree = ""; }; 4F96FD311BFD32140022F021 /* SFSDKTestCredentialsData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SFSDKTestCredentialsData.h; sourceTree = ""; }; 4F96FD321BFD32140022F021 /* SFSDKTestCredentialsData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SFSDKTestCredentialsData.m; sourceTree = ""; }; 4F96FD331BFD32140022F021 /* SFSDKTestRequestListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SFSDKTestRequestListener.h; sourceTree = ""; }; @@ -1263,8 +1259,6 @@ 4F96FD2E1BFD32140022F021 /* Test */ = { isa = PBXGroup; children = ( - 4F96FD2F1BFD32140022F021 /* SFSDKAsyncProcessListener.h */, - 4F96FD301BFD32140022F021 /* SFSDKAsyncProcessListener.m */, 4F96FD311BFD32140022F021 /* SFSDKTestCredentialsData.h */, 4F96FD321BFD32140022F021 /* SFSDKTestCredentialsData.m */, 4F96FD331BFD32140022F021 /* SFSDKTestRequestListener.h */, @@ -1810,7 +1804,6 @@ CE4CE3431C0E5252009F6029 /* SFOAuthCoordinator.h in Headers */, B7C5125920C188AE00B39DAA /* SFSDKViewController.h in Headers */, B7895D192345304800765D85 /* SFSDKCompositeResponse.h in Headers */, - CE4CE3991C0E5272009F6029 /* SFSDKAsyncProcessListener.h in Headers */, CE4CE3251C0E523B009F6029 /* UIScreen+SFAdditions.h in Headers */, CE4CE38E1C0E526A009F6029 /* SFUserAccount.h in Headers */, B7FB26C71F78094A00FB25A2 /* SFSDKUserSelectionTableViewController.h in Headers */, @@ -2359,7 +2352,6 @@ B7CD6D671F79CFC900F99F81 /* SFUserAccountManager+URLHandlers.m in Sources */, 69848CB62363FA3E00893E57 /* SFSDKPushNotificationError.m in Sources */, 23CAB1312DD515B500B8929B /* SFLoginViewController+Deep-Linking.swift in Sources */, - CE4CE39A1C0E5272009F6029 /* SFSDKAsyncProcessListener.m in Sources */, B7A20F861F25850E00D1E4B0 /* SFSDKWindowContainer.m in Sources */, B7FB26C41F78094A00FB25A2 /* SFSDKLoginFlowSelectionViewController.m in Sources */, CE4CE36D1C0E526A009F6029 /* SFEncryptionKey.m in Sources */, diff --git a/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Common/WebViewStateManager.swift b/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Common/WebViewStateManager.swift index c670fd75c4..7b78abe249 100644 --- a/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Common/WebViewStateManager.swift +++ b/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Common/WebViewStateManager.swift @@ -36,20 +36,6 @@ public class SFSDKWebViewStateManager: NSObject { } } - @objc - @MainActor - @available(*, deprecated, renamed: "resetSessionCookie", message: "Deprecated in Salesforce Mobile SDK 13.2 and will be removed in Salesforce Mobile SDK 14.0. Use resetSessionCookie instead.") - public static func removeSession() { - if sessionCookieManagementDisabled { - SFSDKCoreLogger.d(SFSDKWebViewStateManager.self, message: "[\(Self.self) removeSession]: Cookie Management disabled. Will do nothing.") - return - } - - Task { - await removeWKWebViewCookies() - } - } - @objc @MainActor public static func resetSessionCookie() { @@ -93,20 +79,6 @@ public class SFSDKWebViewStateManager: NSObject { await removeWKWebViewCookies() } - - @available(*, deprecated, message: "Deprecated in Salesforce Mobile SDK 13.2 and will be removed in Salesforce Mobile SDK 14.0. WKProcessPool creation has no effect on iOS 15+ and this property will be removed.") - @objc - @MainActor - public static var sharedProcessPool: WKProcessPool? { - get { - // WKProcessPool creation is deprecated since iOS 15 and has no effect. - return nil - } - set { - // Do nothing - } - } - @MainActor private static func removeWKWebViewCookies() async { let dataStore = WKWebsiteDataStore.default() diff --git a/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/OAuth/SFOAuthCoordinator.h b/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/OAuth/SFOAuthCoordinator.h index 883ad1ad91..7de4875cec 100644 --- a/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/OAuth/SFOAuthCoordinator.h +++ b/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/OAuth/SFOAuthCoordinator.h @@ -260,13 +260,6 @@ typedef void (^SFOAuthBrowserFlowCallbackBlock)(BOOL); */ @property (nonatomic, readonly, null_unspecified) ASWebAuthenticationSession *asWebAuthenticationSession; -/** - The user agent string that will be used for authentication. While this property will persist throughout - the lifetime of the coordinator object, the user agent configured for the system will be reset back to - its original value in between authentication requests. - */ -@property (nonatomic, copy) NSString *userAgentForAuth SFSDK_DEPRECATED(13.2, 14.0, "Not used, will be removed."); - /** An array of additional keys (NSString) to parse during OAuth */ diff --git a/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/OAuth/SFOAuthCoordinator.m b/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/OAuth/SFOAuthCoordinator.m index 9019222aa7..907c0c833b 100644 --- a/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/OAuth/SFOAuthCoordinator.m +++ b/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/OAuth/SFOAuthCoordinator.m @@ -78,7 +78,6 @@ @implementation SFOAuthCoordinator @synthesize scopes = _scopes; @synthesize codeVerifier = _codeVerifier; @synthesize authInfo = _authInfo; -@synthesize userAgentForAuth = _userAgentForAuth; @synthesize origWebUserAgent = _origWebUserAgent; @@ -619,12 +618,6 @@ - (void)beginTokenEndpointFlow { request.refreshToken = self.credentials.refreshToken; request.redirectURI = self.credentials.redirectUri; request.serverURL = [self.credentials overrideDomainIfNeeded]; - - // TODO: Remove in Mobile SDK 14.0 - #pragma clang diagnostic push - #pragma clang diagnostic ignored "-Wdeprecated-declarations" - request.userAgentForAuth = self.userAgentForAuth; - #pragma clang diagnostic pop __weak typeof (self) weakSelf = self; if (self.approvalCode) { diff --git a/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/OAuth/SFSDKAuthRequest.h b/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/OAuth/SFSDKAuthRequest.h index e886007652..9c0fc0ece9 100644 --- a/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/OAuth/SFSDKAuthRequest.h +++ b/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/OAuth/SFSDKAuthRequest.h @@ -43,7 +43,6 @@ NS_ASSUME_NONNULL_BEGIN @property (nonatomic,strong) SFSDKLoginViewControllerConfig *loginViewControllerConfig; @property (nullable, nonatomic, strong) UIScene *scene; @property (nonatomic, copy) NSString *jwtToken; -@property (nonatomic, copy, nullable) NSString *userAgentForAuth; //IDP flow related properties (SPApp related properties) @property (nonatomic, readonly, assign) BOOL idpEnabled; diff --git a/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/OAuth/SFSDKAuthSession.m b/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/OAuth/SFSDKAuthSession.m index 9d7ab24b20..aeb60e9815 100644 --- a/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/OAuth/SFSDKAuthSession.m +++ b/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/OAuth/SFSDKAuthSession.m @@ -62,12 +62,6 @@ -(void)initCoordinator { self.oauthCoordinator.brandLoginPath = self.oauthRequest.brandLoginPath; self.oauthCoordinator.useBrowserAuth = self.oauthRequest.useBrowserAuth; - // TODO: Remove in Mobile SDK 14.0 - #pragma clang diagnostic push - #pragma clang diagnostic ignored "-Wdeprecated-declarations" - self.oauthCoordinator.userAgentForAuth = self.oauthRequest.userAgentForAuth; - #pragma clang diagnostic pop - if (_spAppCredentials && _spAppCredentials.domain) { self.oauthCoordinator.credentials.domain = _spAppCredentials.domain; } diff --git a/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Test/SFSDKAsyncProcessListener.h b/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Test/SFSDKAsyncProcessListener.h deleted file mode 100644 index cdaa296def..0000000000 --- a/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Test/SFSDKAsyncProcessListener.h +++ /dev/null @@ -1,50 +0,0 @@ -/* - Copyright (c) 2015-present, salesforce.com, inc. All rights reserved. - - Redistribution and use of this software in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright notice, this list of conditions - and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, this list of - conditions and the following disclaimer in the documentation and/or other materials provided - with the distribution. - * Neither the name of salesforce.com, inc. nor the names of its contributors may be used to - endorse or promote products derived from this software without specific prior written - permission of salesforce.com, inc. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR - IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY - WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#import -#import - -NS_ASSUME_NONNULL_BEGIN - -SFSDK_DEPRECATED(13.2, 14.0, "No longer used, will be removed") -@interface SFSDKAsyncProcessListener : NSObject - -/** - Designated initializer. Initialize the process listener with an expected status and a block that - will return status updates when called. - @param expectedStatus The expected return status upon completion. - @param actualStatusBlock The block that will return the actual status when called. - @param timeout The amount of time before the asynchronous process is considered to time out. - */ -- (id)initWithExpectedStatus:(id)expectedStatus actualStatusBlock:(id (^)(void))actualStatusBlock timeout:(NSTimeInterval)timeout; - -/** - Waits for the asynchronous process to complete. - @return The actual status at the time the process completes, or times out. - */ -- (id)waitForCompletion; - -@end - -NS_ASSUME_NONNULL_END diff --git a/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Test/SFSDKAsyncProcessListener.m b/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Test/SFSDKAsyncProcessListener.m deleted file mode 100644 index f25185d0ab..0000000000 --- a/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Test/SFSDKAsyncProcessListener.m +++ /dev/null @@ -1,71 +0,0 @@ -/* - Copyright (c) 2015-present, salesforce.com, inc. All rights reserved. - - Redistribution and use of this software in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright notice, this list of conditions - and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, this list of - conditions and the following disclaimer in the documentation and/or other materials provided - with the distribution. - * Neither the name of salesforce.com, inc. nor the names of its contributors may be used to - endorse or promote products derived from this software without specific prior written - permission of salesforce.com, inc. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR - IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY - WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#import "SFSDKAsyncProcessListener.h" - -static NSTimeInterval const kDefaultWaitTimeout = 5.0; - -@interface SFSDKAsyncProcessListener () - -@property (nonatomic, strong) id exectedStatus; -@property (nonatomic, copy) id (^actualStatusBlock)(void); -@property (nonatomic, assign) NSTimeInterval timeout; - -@end - -@implementation SFSDKAsyncProcessListener - -@synthesize exectedStatus = _exectedStatus; -@synthesize actualStatusBlock = _actualStatusBlock; -@synthesize timeout = _timeout; - -- (id)initWithExpectedStatus:(id)expectedStatus actualStatusBlock:(id (^)(void))actualStatusBlock timeout:(NSTimeInterval)timeout { - self = [super init]; - if (self) { - NSAssert(expectedStatus != nil, @"expectedStatus value should be non-nil"); - NSAssert(actualStatusBlock != NULL, @"Must specify a block to return the actual status."); - self.exectedStatus = expectedStatus; - self.actualStatusBlock = actualStatusBlock; - self.timeout = (timeout > 0 ? timeout : kDefaultWaitTimeout); - } - return self; -} - -- (id)waitForCompletion { - NSDate *startTime = [NSDate date]; - id actualStatus = self.actualStatusBlock(); - while (![self.exectedStatus isEqual:actualStatus]) { - NSTimeInterval elapsed = [[NSDate date] timeIntervalSinceDate:startTime]; - if (elapsed > self.timeout) { - [SFSDKCoreLogger d:[self class] format:@"%@|%@: Async process took too long (> %f secs) to complete.", NSStringFromClass([self class]), NSStringFromSelector(_cmd), elapsed]; - return actualStatus; - } - [SFSDKCoreLogger d:[self class] format:@"%@|%@: Expected %@, got %@. ## sleeping...", NSStringFromClass([self class]), NSStringFromSelector(_cmd), self.exectedStatus, actualStatus]; - [[NSRunLoop currentRunLoop] runUntilDate:[NSDate dateWithTimeIntervalSinceNow:0.1]]; - actualStatus = self.actualStatusBlock(); - } - return actualStatus; -} - -@end diff --git a/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Util/SFSDKOAuth2.h b/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Util/SFSDKOAuth2.h index 0a6829c9a7..0473d4f80d 100644 --- a/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Util/SFSDKOAuth2.h +++ b/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Util/SFSDKOAuth2.h @@ -93,7 +93,6 @@ NS_ASSUME_NONNULL_BEGIN @interface SFSDKOAuthTokenEndpointRequest : NSObject @property (nonatomic, copy) NSString *refreshToken; -@property (nonatomic, copy, nullable) NSString *userAgentForAuth; @property (nonatomic, copy) NSString *redirectURI; @property (nonatomic, copy) NSString *clientID; @property (nonatomic, copy, nullable) NSString *approvalCode; @@ -145,15 +144,9 @@ NS_ASSUME_NONNULL_BEGIN - (void)revokeRefreshToken:(SFOAuthCredentials *)credentials reason:(SFLogoutReason)reason; @end -SFSDK_DEPRECATED(13.2, 14.0, "Will be removed.") -@protocol SFSDKOAuthSessionManaging -- (NSURLSession *)createURLSessionWithIdentifier:(nonnull NSString *)identifier; -@end -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wdeprecated-declarations" -@interface SFSDKOAuth2 : NSObject -#pragma clang diagnostic pop + +@interface SFSDKOAuth2 : NSObject + (NSMutableURLRequest *)requestForRevokeRefreshToken:(SFOAuthCredentials *)credentials reason:(SFLogoutReason)reason; diff --git a/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Util/SFSDKOAuth2.m b/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Util/SFSDKOAuth2.m index 8e472f4253..8ef1f50591 100644 --- a/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Util/SFSDKOAuth2.m +++ b/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Util/SFSDKOAuth2.m @@ -341,13 +341,13 @@ - (void)openIDTokenForRefresh:(SFSDKOAuthTokenEndpointRequest *)endpointReq comp }]; } -#pragma mark - SFSDKOAuthSessionManaging +#pragma mark - private + - (NSURLSession *)createURLSessionWithIdentifier:(NSString *)identifier { SFNetwork *network = [SFNetwork sharedEphemeralInstanceWithIdentifier:identifier]; return network.activeSession; } -#pragma mark - private - (NSMutableURLRequest *)prepareBasicRequest:(SFSDKOAuthTokenEndpointRequest *)endpointReq { NSString *protocolHost = endpointReq.serverURL.absoluteString; NSMutableString *url = [[NSMutableString alloc] initWithFormat:@"%@%@", protocolHost, kSFOAuthEndPointToken]; @@ -359,9 +359,6 @@ - (NSMutableURLRequest *)prepareBasicRequest:(SFSDKOAuthTokenEndpointRequest *)e timeoutInterval:endpointReq.timeout]; [request setHTTPMethod:kHttpMethodPost]; [request setValue:kHttpPostContentType forHTTPHeaderField:kHttpHeaderContentType]; - if (endpointReq.userAgentForAuth != nil) { - [request setValue:endpointReq.userAgentForAuth forHTTPHeaderField:kHttpHeaderUserAgent]; - } [request setHTTPShouldHandleCookies:NO]; return request; } diff --git a/libs/SalesforceSDKCore/SalesforceSDKCore/SalesforceSDKCore.h b/libs/SalesforceSDKCore/SalesforceSDKCore/SalesforceSDKCore.h index 78eb20eb72..e6123a9de3 100644 --- a/libs/SalesforceSDKCore/SalesforceSDKCore/SalesforceSDKCore.h +++ b/libs/SalesforceSDKCore/SalesforceSDKCore/SalesforceSDKCore.h @@ -41,7 +41,6 @@ #import #import #import -#import #import #import #import diff --git a/libs/SalesforceSDKCore/SalesforceSDKCoreTests/SalesforceSDKManagerTests.m b/libs/SalesforceSDKCore/SalesforceSDKCoreTests/SalesforceSDKManagerTests.m index 1ef00bb709..920d8128cf 100644 --- a/libs/SalesforceSDKCore/SalesforceSDKCoreTests/SalesforceSDKManagerTests.m +++ b/libs/SalesforceSDKCore/SalesforceSDKCoreTests/SalesforceSDKManagerTests.m @@ -316,12 +316,6 @@ - (void)testNativeLoginManager #pragma mark - Process Pool Tests -- (void)testProcessPoolIsNil -{ - // TODO remove this test in 14.0 when we remove sharedProcessPool from SFSDKWebViewStateManager - XCTAssertNil(SFSDKWebViewStateManager.sharedProcessPool); -} - - (void)testBrandedLoginPath { NSString *brandPath = @"/BRAND/"; diff --git a/libs/SalesforceSDKCore/SalesforceSDKCoreTests/WebViewStateManagerTests.swift b/libs/SalesforceSDKCore/SalesforceSDKCoreTests/WebViewStateManagerTests.swift index cfbf1d9a24..d6ee560e83 100644 --- a/libs/SalesforceSDKCore/SalesforceSDKCoreTests/WebViewStateManagerTests.swift +++ b/libs/SalesforceSDKCore/SalesforceSDKCoreTests/WebViewStateManagerTests.swift @@ -13,12 +13,6 @@ final class WebViewStateManagerTests: XCTestCase { try await super.tearDown() } - @MainActor - func testProcessPoolIsNil() { - // TODO remove this test in 14.0 when we remove sharedProcessPool from SFSDKWebViewStateManager - XCTAssertNil(SFSDKWebViewStateManager.sharedProcessPool) - } - @MainActor func testRemoveSessionForcefullyCallsCompletion() async { await SFSDKWebViewStateManager.removeSessionForcefully()