Add Login Options to Dev Menu

libs/MobileSync/Configuration/MobileSync-Common.xcconfig

@@ -13,7 +13,7 @@ GCC_PREFIX_HEADER = $(PROJECT_NAME)/$(PROJECT_NAME)-Prefix.pch
 
 PRODUCT_NAME = MobileSync
 
-LIBRARY_SEARCH_PATHS = $(SRCROOT)/../../external/ThirdPartyDependencies/sqlcipher $(inherited)
+LIBRARY_SEARCH_PATHS = $(inherited)
 
 // Make sure to use only API that are safe for application extensions
 APPLICATION_EXTENSION_API_ONLY = YES

libs/MobileSync/MobileSync.xcodeproj/project.pbxproj

@@ -1610,6 +1610,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
+				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-framework",
@@ -1640,6 +1641,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
+				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-framework",

libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Common/SalesforceSDKManager+Internal.h

@@ -34,4 +34,6 @@ API_UNAVAILABLE(visionos)
 - (BOOL)isSnapshotPresented:(nonnull UIScene *)scene API_UNAVAILABLE(visionos);
 - (void)dismissSnapshot:(nonnull UIScene *)scene completion:(void (^ __nullable)(void))completion API_UNAVAILABLE(visionos);
 
+- (nonnull NSArray<SFSDKDevAction *> *)getDevActions:(nonnull UIViewController *)presentedViewController;
+
 @end

libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Common/SalesforceSDKManager.m

@@ -29,8 +29,8 @@
 #import "SFManagedPreferences.h"
 #import "SFApplicationHelper.h"
 #import "SFSDKAppFeatureMarkers.h"
-#import "SFSDKDevInfoViewController.h"
 #import "SFDefaultUserManagementViewController.h"
+#import "SFSDKAuthRootController.h"
 #import <SalesforceSDKCommon/SFSwiftDetectUtil.h>
 #import "SFSDKEncryptedURLCache.h"
 #import "SFSDKNullURLCache.h"
@@ -471,25 +471,66 @@ - (NSString *)devInfoTitleString
 
 - (NSArray<SFSDKDevAction *>*) getDevActions:(UIViewController *)presentedViewController
 {
-    return @[
-             [[SFSDKDevAction alloc]initWith:@"Show dev info" handler:^{
-                 SFSDKDevInfoViewController *devInfo = [[SFSDKDevInfoViewController alloc] init];
-                 [presentedViewController presentViewController:devInfo animated:NO completion:nil];
-             }],
-             [[SFSDKDevAction alloc]initWith:@"Logout" handler:^{
-                 [[SFUserAccountManager  sharedInstance] logout:SFLogoutReasonUserInitiated];
-             }],
-             [[SFSDKDevAction alloc]initWith:@"Switch user" handler:^{
-                 SFDefaultUserManagementViewController *umvc = [[SFDefaultUserManagementViewController alloc] initWithCompletionBlock:^(SFUserManagementAction action) {
-                     [presentedViewController dismissViewControllerAnimated:YES completion:nil];
-                 }];
-                 [presentedViewController presentViewController:umvc animated:YES completion:nil];
-             }],
-             [[SFSDKDevAction alloc]initWith:@"Inspect Key-Value Store" handler:^{
-                 UIViewController *keyValueStoreInspector = [[SFSDKKeyValueEncryptedFileStoreViewController new] createUI];
-                 [presentedViewController presentViewController:keyValueStoreInspector animated:YES completion:nil];
-             }]
-    ];
+    NSMutableArray<SFSDKDevAction *> *actions = [NSMutableArray array];
+    SFUserAccountManager *userAccountManager = [SFUserAccountManager sharedInstance];
+    SFUserAccount *currentUser = userAccountManager.currentUser;
+
+    // Check if we're showing the login screen
+    BOOL isShowingLogin = [presentedViewController isKindOfClass:[SFLoginViewController class]];
+    // TODO uncomment to support advanced auth case (once we add code to restart auth in that case below)
+    // || [presentedViewController.presentingViewController isKindOfClass:[SFSDKAuthRootController class]];
+
+    // Show dev info - always available
+    [actions addObject:[[SFSDKDevAction alloc]initWith:@"Show dev info" handler:^{
+        UIViewController *devInfo = [SFSDKDevInfoViewController makeViewController];
+        [presentedViewController presentViewController:devInfo animated:YES completion:nil];
+    }]];
+
+    // Login Options - only show on login screen
+    if (isShowingLogin) {
+        [actions addObject:[[SFSDKDevAction alloc]initWith:@"Login Options" handler:^{
+            UIViewController *configPicker = [BootConfigPickerViewController makeViewControllerOnConfigurationCompleted:^{
+                [presentedViewController dismissViewControllerAnimated:YES completion:^{
+                    // Restart authentication with the updated configuration
+                    if ([presentedViewController isKindOfClass:[SFLoginViewController class]]) {
+                        [[SFUserAccountManager sharedInstance] restartAuthenticationForViewController:(SFLoginViewController *)presentedViewController];
+                    }
+                    // TODO support advanced auth case
+                }];
+            }];
+            [presentedViewController presentViewController:configPicker animated:YES completion:nil];
+        }]];
+    }
+
+    // Logout - only show if there's a current user and not on login screen
+    if (currentUser && !isShowingLogin) {
+        [actions addObject:[[SFSDKDevAction alloc]initWith:@"Logout" handler:^{
+            [[SFUserAccountManager sharedInstance] logout:SFLogoutReasonUserInitiated];
+        }]];
+    }
+
+    // Switch user - only show if there's a current user and not on login screen
+    if (currentUser && !isShowingLogin) {
+        [actions addObject:[[SFSDKDevAction alloc]initWith:@"Switch user" handler:^{
+            SFDefaultUserManagementViewController *umvc = [[SFDefaultUserManagementViewController alloc] initWithCompletionBlock:^(SFUserManagementAction action) {
+                [presentedViewController dismissViewControllerAnimated:YES completion:nil];
+            }];
+            [presentedViewController presentViewController:umvc animated:YES completion:nil];
+        }]];
+    }
+
+    // Inspect Key-Value Store - only show if there are stores
+    BOOL hasGlobalStores = [SFSDKKeyValueEncryptedFileStore allGlobalStoreNames].count > 0;
+    BOOL hasUserStores = currentUser && [SFSDKKeyValueEncryptedFileStore allStoreNames].count > 0;
+
+    if (hasGlobalStores || hasUserStores) {
+        [actions addObject:[[SFSDKDevAction alloc]initWith:@"Inspect Key-Value Store" handler:^{
+            UIViewController *keyValueStoreInspector = [[SFSDKKeyValueEncryptedFileStoreViewController new] createUI];
+            [presentedViewController presentViewController:keyValueStoreInspector animated:YES completion:nil];
+        }]];
+    }
+
+    return [actions copy];
 }
 
 - (NSArray<NSString *>*) getDevSupportInfos
@@ -498,25 +539,62 @@ - (NSString *)devInfoTitleString
     NSMutableArray * devInfos = [NSMutableArray arrayWithArray:@[
             @"SDK Version", SALESFORCE_SDK_VERSION,
             @"App Type", [self getAppTypeAsString],
-            @"User Agent", self.userAgentString(@""),
+            @"User Agent", self.userAgentString(@"")
+    ]];
+    NSArray* allUsers = userAccountManager.allUserAccounts;
+    if ([allUsers count] > 0) {
+        [devInfos addObjectsFromArray:@[
+            @"Authenticated Users", [self usersToString:allUsers]
+        ]];
+    }
+
+    // Auth configuration
+    [devInfos addObject:@"section:Auth Config"];
+    [devInfos addObjectsFromArray:@[
             @"Use Web Server Authentication", [self useWebServerAuthentication]  ? @"YES" : @"NO",
+            @"Use Hybrid Authentication", [self useHybridAuthentication]  ? @"YES" : @"NO",
+            @"Supports Welcome Discovery", [self supportsWelcomeDiscovery]  ? @"YES" : @"NO",
             @"Browser Login Enabled", [SFUserAccountManager sharedInstance].useBrowserAuth? @"YES" : @"NO",
             @"IDP Enabled", [self idpEnabled] ? @"YES" : @"NO",
-            @"Identity Provider", [self isIdentityProvider] ? @"YES" : @"NO",
-            @"Current User", [self userToString:userAccountManager.currentUser],
-            @"Scopes", [userAccountManager.currentUser.credentials.scopes componentsJoinedByString:@" "],
-            @"Access Token Expiration", [self accessTokenExpiration],
-            @"Authenticated Users", [self usersToString:userAccountManager.allUserAccounts],
-            @"User Key-Value Stores", [self safeJoin:[SFSDKKeyValueEncryptedFileStore allStoreNames] separator:@", "],
-            @"Global Key-Value Stores", [self safeJoin:[SFSDKKeyValueEncryptedFileStore allGlobalStoreNames] separator:@", "]
+            @"Identity Provider", [self isIdentityProvider] ? @"YES" : @"NO"
     ]];
 
-    [devInfos addObjectsFromArray:[self dictToDevInfos:self.appConfig.configDict keyPrefix:@"BootConfig"]];
+    // Static bootconfig
+    [devInfos addObject:@"section:Bootconfig"];
+    [devInfos addObjectsFromArray:[self dictToDevInfos:self.appConfig.configDict]];
+
+    // Current user info
+    SFUserAccount* currentUser = userAccountManager.currentUser;
+    if (currentUser) {
+        SFOAuthCredentials* creds = currentUser.credentials;
+        [devInfos addObject:@"section:Current User"];
+        [devInfos addObjectsFromArray:@[
+            @"Username", [self userToString:currentUser],
+            @"Consumer Key", creds.clientId ?: @"(nil)",
+            @"Redirect URI", creds.redirectUri ?: @"(nil)",
+            @"Scopes", [self scopesToString:currentUser],
+            @"Instance URL", [creds.instanceUrl absoluteString] ?: @"(nil)",
+            @"Token format", [creds.tokenFormat isEqualToString:@"jwt"] ? @"jwt" : @"opaque",
+            @"Access Token Expiration", [self accessTokenExpiration],
+            @"Beacon Child Consumer Key", creds.beaconChildConsumerKey ?: @"(empty)"
+        ]];
+    }
 
+    // Key Value Stores
+    NSArray<NSString*>* globalKeyValueStores = [SFSDKKeyValueEncryptedFileStore allGlobalStoreNames];
+    NSArray<NSString*>* userKeyValueStores = [SFSDKKeyValueEncryptedFileStore allStoreNames];
+    if ([userKeyValueStores count] > 0 || [globalKeyValueStores count] > 0) {
+        [devInfos addObject:@"section:Key Value Stores"];
+        [devInfos addObjectsFromArray:@[@"Global stores", [self safeJoin:globalKeyValueStores separator:@", "]]];
+        [devInfos addObjectsFromArray:@[@"User stores", [self safeJoin:globalKeyValueStores separator:@", "]]];
+    }
+
+    // Managed prefs
     SFManagedPreferences *managedPreferences = [SFManagedPreferences sharedPreferences];
-    [devInfos addObjectsFromArray:@[@"Managed", [managedPreferences hasManagedPreferences] ? @"YES" : @"NO"]];
     if ([managedPreferences hasManagedPreferences]) {
-        [devInfos addObjectsFromArray:[self dictToDevInfos:managedPreferences.rawPreferences keyPrefix:@"Managed Pref"]];
+        [devInfos addObject:@"section:Managed Pref"];
+        [devInfos addObjectsFromArray:@[@"Managed", [managedPreferences hasManagedPreferences] ? @"YES" : @"NO"]];
+        [devInfos addObjectsFromArray:[self dictToDevInfos:managedPreferences.rawPreferences]];
     }
 
     return devInfos;
@@ -542,21 +620,31 @@ - (NSString *) accessTokenExpiration {
 }
 
 - (NSString*) userToString:(SFUserAccount*)user {
-    return user ? user.idData.username : @"";
+    return user.idData.username != nil ? user.idData.username : @"";
+}
+
+- (NSString*) scopesToString:(SFUserAccount*)user {
+    return user.credentials.scopes != nil ? [user.credentials.scopes componentsJoinedByString:@" "] : @"";
 }
 
 - (NSString*) usersToString:(NSArray<SFUserAccount*>*)userAccounts {
+    if (userAccounts == nil) {
+        return @"";
+    }
     NSMutableArray* usernames = [NSMutableArray new];
     for (SFUserAccount *userAccount in userAccounts) {
         [usernames addObject:[self userToString:userAccount]];
     }
     return [usernames componentsJoinedByString:@", "];
 }
 
-- (NSArray*) dictToDevInfos:(NSDictionary*)dict keyPrefix:(NSString*)keyPrefix {
+- (NSArray*) dictToDevInfos:(NSDictionary*)dict {
+    if (dict == nil) {
+        return @[];
+    }
     NSMutableArray * devInfos = [NSMutableArray new];
     [dict enumerateKeysAndObjectsUsingBlock:^(id key, id obj, BOOL *stop) {
-        [devInfos addObject:[NSString stringWithFormat:@"%@ - %@", keyPrefix, key]];
+        [devInfos addObject:key];
         [devInfos addObject:[[NSString stringWithFormat:@"%@", obj] stringByReplacingOccurrencesOfString:@"\n" withString:@""]];
     }];
     return devInfos;

native/SampleApps/AuthFlowTester/AuthFlowTester/Views/FlowTypesView.swift → libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Login/DevConfig/AuthFlowTypesView.swift

@@ -1,6 +1,6 @@
 /*
- FlowTypesView.swift
- AuthFlowTester
+ AuthFlowTypesView.swift
+ SalesforceSDKCore
 
  Copyright (c) 2025-present, salesforce.com, inc. All rights reserved.
 
@@ -26,18 +26,19 @@
  */
 
 import SwiftUI
-import SalesforceSDKCore
 
-struct FlowTypesView: View {
+public struct AuthFlowTypesView: View {
     @State private var useWebServerFlow: Bool
     @State private var useHybridFlow: Bool
+    @State private var supportsWelcomeDiscovery: Bool
 
-    init() {
+    public init() {
         _useWebServerFlow = State(initialValue: SalesforceManager.shared.useWebServerAuthentication)
         _useHybridFlow = State(initialValue: SalesforceManager.shared.useHybridAuthentication)
+        _supportsWelcomeDiscovery = State(initialValue: SalesforceManager.shared.supportsWelcomeDiscovery)
     }
 
-    var body: some View {
+    public var body: some View {
         VStack(alignment: .leading, spacing: 12) {
             Text("Authentication Flow Types")
                 .font(.headline)
@@ -48,7 +49,7 @@ struct FlowTypesView: View {
                     Text("Use Web Server Flow")
                         .font(.body)
                 }
-                .onChange(of: useWebServerFlow) { newValue in
+                .onChange(of: useWebServerFlow) { _, newValue in
                     SalesforceManager.shared.useWebServerAuthentication = newValue
                 }
                 .padding(.horizontal)
@@ -57,10 +58,19 @@ struct FlowTypesView: View {
                     Text("Use Hybrid Flow")
                         .font(.body)
                 }
-                .onChange(of: useHybridFlow) { newValue in
+                .onChange(of: useHybridFlow) { _, newValue in
                     SalesforceManager.shared.useHybridAuthentication = newValue
                 }
                 .padding(.horizontal)
+
+                Toggle(isOn: $supportsWelcomeDiscovery) {
+                    Text("Support Welcome Discovery")
+                        .font(.body)
+                }
+                .onChange(of: supportsWelcomeDiscovery) { _, newValue in
+                    SalesforceManager.shared.supportsWelcomeDiscovery = newValue
+                }
+                .padding(.horizontal)
             }
         }
         .padding(.vertical)

native/SampleApps/AuthFlowTester/AuthFlowTester/Views/BootConfigEditor.swift → libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Login/DevConfig/BootConfigEditor.swift

@@ -1,6 +1,6 @@
 /*
  BootConfigEditor.swift
- AuthFlowTester
+ SalesforceSDKCore
 
  Copyright (c) 2025-present, salesforce.com, inc. All rights reserved.
 
@@ -26,9 +26,8 @@
  */
 
 import SwiftUI
-import SalesforceSDKCore
 
-struct BootConfigEditor: View {
+public struct BootConfigEditor: View {
     let title: String
     let buttonLabel: String
     let buttonColor: Color
@@ -40,7 +39,29 @@ struct BootConfigEditor: View {
     let initiallyExpanded: Bool
     @State private var isExpanded: Bool = false
 
-    var body: some View {
+    public init(
+        title: String,
+        buttonLabel: String,
+        buttonColor: Color,
+        consumerKey: Binding<String>,
+        callbackUrl: Binding<String>,
+        scopes: Binding<String>,
+        isLoading: Bool,
+        onUseConfig: @escaping () -> Void,
+        initiallyExpanded: Bool
+    ) {
+        self.title = title
+        self.buttonLabel = buttonLabel
+        self.buttonColor = buttonColor
+        self._consumerKey = consumerKey
+        self._callbackUrl = callbackUrl
+        self._scopes = scopes
+        self.isLoading = isLoading
+        self.onUseConfig = onUseConfig
+        self.initiallyExpanded = initiallyExpanded
+    }
+
+    public var body: some View {
         VStack(alignment: .leading, spacing: 12) {
             Button(action: {
                 withAnimation {