Skip to content

feat(W-23159740): use per-user UA string in SFHybridViewController #314

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
wmathurin merged 3 commits into from
Jun 29, 2026
Merged

feat(W-23159740): use per-user UA string in SFHybridViewController #314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
95e2382
feat(W-23159740): use per-user UA string in SFHybridViewController
wmathurin Jun 25, 2026
f9a046a
Latest from iOS submodule
wmathurin Jun 29, 2026
a71762e
Merge upstream/dev into W-21167151-feature-flags-per-user
wmathurin Jun 29, 2026
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
2 changes: 1 addition & 1 deletion external/SalesforceMobileSDK-iOS
Open in desktop
Submodule SalesforceMobileSDK-iOS updated 74 files
+7 −1 .github/DangerFiles/TestOrchestrator.rb
+4 −0 .github/workflows/nightly.yaml
+10 −0 .github/workflows/pr.yaml
+25 −1 .github/workflows/reusable-ui-test-workflow.yaml
+2 −0 .github/workflows/ui-test-nightly.yaml
+1 −1 SalesforceSDKCore.podspec
+5 −48 libs/MobileSync/MobileSync.xcodeproj/project.pbxproj
+1 −1 libs/MobileSync/MobileSync/Classes/Manager/SFMobileSyncSyncManager.m
+0 −17 libs/MobileSync/MobileSyncTestApp/AppDelegate.h
+0 −45 libs/MobileSync/MobileSyncTestApp/AppDelegate.m
+0 −27 libs/MobileSync/MobileSyncTestApp/Base.lproj/LaunchScreen.storyboard
+0 −25 libs/MobileSync/MobileSyncTestApp/Base.lproj/Main.storyboard
+12 −4 libs/MobileSync/MobileSyncTestApp/Info.plist
+38 −0 libs/MobileSync/MobileSyncTestApp/MobileSyncTestApp.swift
+0 −15 libs/MobileSync/MobileSyncTestApp/ViewController.h
+0 −27 libs/MobileSync/MobileSyncTestApp/ViewController.m
+0 −16 libs/MobileSync/MobileSyncTestApp/main.m
+5 −32 libs/SalesforceAnalytics/SalesforceAnalytics.xcodeproj/project.pbxproj
+0 −31 libs/SalesforceAnalytics/SalesforceAnalyticsTestApp/AppDelegate.h
+0 −62 libs/SalesforceAnalytics/SalesforceAnalyticsTestApp/AppDelegate.m
+0 −25 libs/SalesforceAnalytics/SalesforceAnalyticsTestApp/Base.lproj/Main_iPad.storyboard
+0 −25 libs/SalesforceAnalytics/SalesforceAnalyticsTestApp/Base.lproj/Main_iPhone.storyboard
+12 −4 libs/SalesforceAnalytics/SalesforceAnalyticsTestApp/SalesforceAnalyticsTestApp-Info.plist
+38 −0 libs/SalesforceAnalytics/SalesforceAnalyticsTestApp/SalesforceAnalyticsTestApp.swift
+0 −29 libs/SalesforceAnalytics/SalesforceAnalyticsTestApp/ViewController.h
+0 −45 libs/SalesforceAnalytics/SalesforceAnalyticsTestApp/ViewController.m
+0 −34 libs/SalesforceAnalytics/SalesforceAnalyticsTestApp/main.m
+5 −45 libs/SalesforceSDKCore/SalesforceSDKCore.xcodeproj/project.pbxproj
+34 −3 libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Common/SFSDKAppFeatureMarkers.h
+62 −0 libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Common/SFSDKAppFeatureMarkers.m
+1 −0 libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Common/SalesforceSDKManager+Internal.h
+8 −0 libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Common/SalesforceSDKManager.h
+38 −23 libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Common/SalesforceSDKManager.m
+49 −5 libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Login/SFLoginViewController.m
+9 −2 libs/SalesforceSDKCore/SalesforceSDKCore/Classes/OAuth/DomainDiscoveryCoordinator.swift
+1 −1 libs/SalesforceSDKCore/SalesforceSDKCore/Classes/OAuth/SFOAuthCoordinator.m
+12 −0 libs/SalesforceSDKCore/SalesforceSDKCore/Classes/OAuth/SFSDKAuthRequest.h
+4 −0 libs/SalesforceSDKCore/SalesforceSDKCore/Classes/UserAccount/SFUserAccount.h
+3 −0 libs/SalesforceSDKCore/SalesforceSDKCore/Classes/UserAccount/SFUserAccount.m
+6 −0 libs/SalesforceSDKCore/SalesforceSDKCore/Classes/UserAccount/SFUserAccountManager.h
+83 −12 libs/SalesforceSDKCore/SalesforceSDKCore/Classes/UserAccount/SFUserAccountManager.m
+0 −26 libs/SalesforceSDKCore/SalesforceSDKCoreTestApp/Base.lproj/Main_iPad.storyboard
+0 −26 libs/SalesforceSDKCore/SalesforceSDKCoreTestApp/Base.lproj/Main_iPhone.storyboard
+14 −6 libs/SalesforceSDKCore/SalesforceSDKCoreTestApp/SalesforceSDKCoreTestApp-Info.plist
+38 −0 libs/SalesforceSDKCore/SalesforceSDKCoreTestApp/SalesforceSDKCoreTestApp.swift
+0 −29 libs/SalesforceSDKCore/SalesforceSDKCoreTestApp/ViewController.h
+0 −45 libs/SalesforceSDKCore/SalesforceSDKCoreTestApp/ViewController.m
+255 −0 libs/SalesforceSDKCore/SalesforceSDKCoreTests/LoginForAdminTests.swift
+216 −0 libs/SalesforceSDKCore/SalesforceSDKCoreTests/SFSDKAppFeatureMarkersTests.m
+23 −0 libs/SalesforceSDKCore/SalesforceSDKCoreTests/SFUserAccountManagerTests.m
+3 −1 libs/SalesforceSDKCore/SalesforceSDKCoreTests/SalesforceRestAPITests.m
+8 −0 libs/SalesforceSDKCore/SalesforceSDKCoreTests/SalesforceSDKCoreTests-Bridging-Header.h
+65 −0 libs/SalesforceSDKCore/SalesforceSDKCoreTests/SalesforceSDKManagerTests.m
+34 −1 libs/SalesforceSDKCore/SalesforceSDKCoreTests/WelcomeDiscoveryLoginHostTests.swift
+5 −48 libs/SmartStore/SmartStore.xcodeproj/project.pbxproj
+1 −1 libs/SmartStore/SmartStore/Classes/SFSmartStore.m
+0 −17 libs/SmartStore/SmartStoreTestApp/AppDelegate.h
+0 −45 libs/SmartStore/SmartStoreTestApp/AppDelegate.m
+0 −27 libs/SmartStore/SmartStoreTestApp/Base.lproj/LaunchScreen.storyboard
+0 −25 libs/SmartStore/SmartStoreTestApp/Base.lproj/Main.storyboard
+12 −4 libs/SmartStore/SmartStoreTestApp/Info.plist
+38 −0 libs/SmartStore/SmartStoreTestApp/SmartStoreTestApp.swift
+0 −15 libs/SmartStore/SmartStoreTestApp/ViewController.h
+0 −27 libs/SmartStore/SmartStoreTestApp/ViewController.m
+0 −16 libs/SmartStore/SmartStoreTestApp/main.m
+2 −2 native/SampleApps/AuthFlowTester/AuthFlowTester.xctestplan
+22 −3 native/SampleApps/AuthFlowTester/AuthFlowTester/Views/UserCredentialsView.swift
+12 −3 native/SampleApps/AuthFlowTester/AuthFlowTesterUITests/PageObjects/AuthFlowTesterMainPageObject.swift
+38 −2 native/SampleApps/AuthFlowTester/AuthFlowTesterUITests/Tests/LoginWithRestartTests.swift
+35 −0 native/SampleApps/AuthFlowTester/AuthFlowTesterUITests/Tests/MultiUserLoginTests.swift
+6 −4 native/SampleApps/AuthFlowTester/AuthFlowTesterUITests/Tests/RTRLoginTests.swift
+4 −2 native/SampleApps/AuthFlowTester/AuthFlowTesterUITests/Tests/RefreshTokenMigrationWithRestartTests.swift
+149 −35 native/SampleApps/AuthFlowTester/AuthFlowTesterUITests/Util/BaseAuthFlowTester.swift
+17 −15 native/SampleApps/AuthFlowTester/AuthFlowTesterUITests/overview.md
10 changes: 3 additions & 7 deletions libs/SalesforceHybridSDK/SalesforceHybridSDK/Classes/SFHybridViewController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,13 +379,9 @@
- (NSString *)sfHybridViewUserAgentString
{
NSString *userAgentString = @"";
if ([SalesforceSDKManager sharedManager].userAgentString != NULL) {
if (_hybridViewConfig.isLocal) {
userAgentString = [SalesforceSDKManager sharedManager].userAgentString(@"Local");
} else {
userAgentString = [SalesforceSDKManager sharedManager].userAgentString(@"Remote");
}
}
SFUserAccount *currentUser = [SFUserAccountManager sharedInstance].currentUser;
NSString *qualifier = _hybridViewConfig.isLocal ? @"Local" : @"Remote";
userAgentString = [[SalesforceSDKManager sharedManager] userAgentString:qualifier forUser:currentUser];
return userAgentString;
}

Expand Down Expand Up @@ -476,7 +472,7 @@

- (NSURL *)fullFileUrlForPage:(NSString *)page
{
NSString *fullPath = [[[[NSBundle mainBundle] resourcePath] stringByAppendingPathComponent:self.wwwFolderName] stringByAppendingPathComponent:page];

Check warning on line 475 in libs/SalesforceHybridSDK/SalesforceHybridSDK/Classes/SFHybridViewController.m

View workflow job for this annotation

GitHub Actions / hybrid-samples-pr (AccountEditor) / build-ios 

'wwwFolderName' is deprecated: Deprecated in Cordova 8.0.0. Use webContentFolderName instead [-Wdeprecated-declarations]

Check warning on line 475 in libs/SalesforceHybridSDK/SalesforceHybridSDK/Classes/SFHybridViewController.m

View workflow job for this annotation

GitHub Actions / hybrid-samples-pr (MobileSyncExplorerHybrid) / build-ios 

'wwwFolderName' is deprecated: Deprecated in Cordova 8.0.0. Use webContentFolderName instead [-Wdeprecated-declarations]

Check warning on line 475 in libs/SalesforceHybridSDK/SalesforceHybridSDK/Classes/SFHybridViewController.m

View workflow job for this annotation

GitHub Actions / ios-pr (SalesforceHybridSDK, ^26) / test-ios 

'wwwFolderName' is deprecated: Deprecated in Cordova 8.0.0. Use webContentFolderName instead [-Wdeprecated-declarations]
NSFileManager *manager = [[NSFileManager alloc] init];
if (![manager fileExistsAtPath:fullPath]) {
return nil;
Expand Down
Loading