Merge pull request forcedotcom#3948 from bbirman/settings-follow-up

bbirman · web-flow · commit c3b9d387b96b · 2025-11-04T16:19:42.000-06:00
Fixes for settings menu
diff --git a/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Login/LoginHost/SFSDKLoginHostStorage.m b/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Login/LoginHost/SFSDKLoginHostStorage.m
@@ -107,7 +107,7 @@ - (id)init {
              */
             if (![self loginHostForHostAddress:customHost]) {
                 [self.loginHostList removeAllObjects];
-                if ([SFUserAccountManager sharedInstance].loginViewControllerConfig.showSettingsIcon) {
+                if ([SFUserAccountManager sharedInstance].loginViewControllerConfig.showSettingsIcon && [SFUserAccountManager sharedInstance].loginViewControllerConfig.showServerPicker) {
                     [self.loginHostList addObject:production];
                     [self.loginHostList addObject:sandbox];
                 }
diff --git a/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/UserAccount/SFUserAccountManager.m b/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/UserAccount/SFUserAccountManager.m
@@ -1055,13 +1055,15 @@ - (void)loginViewController:(SFLoginViewController *)loginViewController didChan
 }
 
 - (void)loginViewControllerDidClearCache:(SFLoginViewController *)loginViewController {
-    [SFSDKWebViewStateManager clearCacheWithCompletionHandler:^{}];
-    [self restartAuthenticationForViewController:loginViewController];
+    [SFSDKWebViewStateManager clearCacheWithCompletionHandler:^{
+        [self restartAuthenticationForViewController:loginViewController];
+    }];
 }
 
 - (void)loginViewControllerDidClearCookies:(SFLoginViewController *)loginViewController {
-    [SFSDKWebViewStateManager removeSessionForcefullyWithCompletionHandler:^{}];
-    [self restartAuthenticationForViewController:loginViewController];
+    [SFSDKWebViewStateManager removeSessionForcefullyWithCompletionHandler:^{
+        [self restartAuthenticationForViewController:loginViewController];
+    }];
 }
 
 - (void)loginViewControllerDidReload:(SFLoginViewController *)loginViewController {
diff --git a/libs/SalesforceSDKCore/SalesforceSDKCoreTests/WebViewStateManagerTests.swift b/libs/SalesforceSDKCore/SalesforceSDKCoreTests/WebViewStateManagerTests.swift
@@ -35,38 +35,4 @@ final class WebViewStateManagerTests: XCTestCase {
         SFSDKWebViewStateManager.sessionCookieManagementDisabled = false
         XCTAssertFalse(SFSDKWebViewStateManager.sessionCookieManagementDisabled)
     }
-    
-    @MainActor
-    func testClearCache() async throws {
-        // Add some test data
-        let html = "<html><body><script>localStorage.setItem('test', 'value');</script></body></html>"
-        let webView = WKWebView(frame: CGRect(x: 0, y: 0, width: 100, height: 100), configuration: WKWebViewConfiguration())
-        
-        // Load HTML and wait for JavaScript to execute
-        webView.loadHTMLString(html, baseURL: URL(string: "https://test.salesforce.com"))
-        try await Task.sleep(for: .seconds(1))
-        
-        // Define data types to check
-        let dataTypes: Set<String> = [WKWebsiteDataTypeDiskCache,
-                                      WKWebsiteDataTypeMemoryCache,
-                                      WKWebsiteDataTypeFetchCache,
-                                      WKWebsiteDataTypeLocalStorage,
-                                      WKWebsiteDataTypeSessionStorage,
-                                      WKWebsiteDataTypeIndexedDBDatabases,
-                                      WKWebsiteDataTypeWebSQLDatabases,
-                                      WKWebsiteDataTypeOfflineWebApplicationCache,
-                                      WKWebsiteDataTypeServiceWorkerRegistrations]
-        
-        let dataStore = WKWebsiteDataStore.default()
-        // Verify data exists before clearing
-        let initialRecords = await dataStore.dataRecords(ofTypes: dataTypes)
-        XCTAssertFalse(initialRecords.isEmpty, "Expected data to exist before clearing")
-        
-        // Clear the cache
-        await SFSDKWebViewStateManager.clearCache()
-        
-        // Verify data was cleared
-        let records = await dataStore.dataRecords(ofTypes: dataTypes)
-        XCTAssertTrue(records.isEmpty, "Expected data to be cleared")
-    }
 }

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ - (id)init {`
`107`	`107`	`*/`
`108`	`108`	`if (![self loginHostForHostAddress:customHost]) {`
`109`	`109`	`[self.loginHostList removeAllObjects];`
`110`		`- if ([SFUserAccountManager sharedInstance].loginViewControllerConfig.showSettingsIcon) {`
	`110`	`+ if ([SFUserAccountManager sharedInstance].loginViewControllerConfig.showSettingsIcon && [SFUserAccountManager sharedInstance].loginViewControllerConfig.showServerPicker) {`
`111`	`111`	`[self.loginHostList addObject:production];`
`112`	`112`	`[self.loginHostList addObject:sandbox];`
`113`	`113`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1055,13 +1055,15 @@ - (void)loginViewController:(SFLoginViewController *)loginViewController didChan`
`1055`	`1055`	`}`
`1056`	`1056`
`1057`	`1057`	`- (void)loginViewControllerDidClearCache:(SFLoginViewController *)loginViewController {`
`1058`		`- [SFSDKWebViewStateManager clearCacheWithCompletionHandler:^{}];`
`1059`		`- [self restartAuthenticationForViewController:loginViewController];`
	`1058`	`+ [SFSDKWebViewStateManager clearCacheWithCompletionHandler:^{`
	`1059`	`+ [self restartAuthenticationForViewController:loginViewController];`
	`1060`	`+ }];`
`1060`	`1061`	`}`
`1061`	`1062`
`1062`	`1063`	`- (void)loginViewControllerDidClearCookies:(SFLoginViewController *)loginViewController {`
`1063`		`- [SFSDKWebViewStateManager removeSessionForcefullyWithCompletionHandler:^{}];`
`1064`		`- [self restartAuthenticationForViewController:loginViewController];`
	`1064`	`+ [SFSDKWebViewStateManager removeSessionForcefullyWithCompletionHandler:^{`
	`1065`	`+ [self restartAuthenticationForViewController:loginViewController];`
	`1066`	`+ }];`
`1065`	`1067`	`}`
`1066`	`1068`
`1067`	`1069`	`- (void)loginViewControllerDidReload:(SFLoginViewController *)loginViewController {`