Skip to content

Remove welcome from default server list #3973

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
bbirman merged 1 commit into from
Jan 22, 2026
Merged

Remove welcome from default server list #3973

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 1 addition & 3 deletions libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Login/LoginHost/SFSDKLoginHostStorage.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,11 @@ - (id)init {
SFManagedPreferences *managedPreferences = [SFManagedPreferences sharedPreferences];
SFSDKLoginHost *production = [SFSDKLoginHost hostWithName:[SFSDKResourceUtils localizedString:@"LOGIN_SERVER_PRODUCTION"] host:@"login.salesforce.com" deletable:NO];
SFSDKLoginHost *sandbox = [SFSDKLoginHost hostWithName:[SFSDKResourceUtils localizedString:@"LOGIN_SERVER_SANDBOX"] host:@"test.salesforce.com" deletable:NO];
SFSDKLoginHost *welcome = [SFSDKLoginHost hostWithName:[SFSDKResourceUtils localizedString:@"LOGIN_SERVER_WELCOME"] host:@"welcome.salesforce.com/discovery" deletable:NO];

// Add the Production, Sandbox and Welcome login hosts, unless an MDM policy explicitly forbids this.
// Add the Production and Sandbox login hosts, unless an MDM policy explicitly forbids this.
if (!(managedPreferences.hasManagedPreferences && managedPreferences.onlyShowAuthorizedHosts)) {
[self.loginHostList addObject:production];
[self.loginHostList addObject:sandbox];
[self.loginHostList addObject:welcome];
}

// Load from managed preferences (e.g. MDM).
Expand Down
1 change: 0 additions & 1 deletion shared/resources/SalesforceSDKResources.bundle/en.lproj/Localizable.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@
"TITLE_LOGIN" = "Log In";
"LOGIN_SERVER_PRODUCTION" = "Production";
"LOGIN_SERVER_SANDBOX" = "Sandbox";
"LOGIN_SERVER_WELCOME" = "Welcome";
"LOGIN_CHOOSE_SERVER" = "Choose Connection";
"LOGIN_ADD_SERVER" = "Add Connection";
"LOGIN_SERVER_URL" = "Host";
Expand Down
Loading