From 2bc480c6cfe1ec7a6e6ff5b14368f49fdab12e73 Mon Sep 17 00:00:00 2001 From: ashitsalesforce Date: Tue, 6 Feb 2024 13:51:11 -0800 Subject: [PATCH 1/2] comment regarding OAuth flow used for browser login comment regarding device flow, the OAuth flow used for browser login --- .../com/salesforce/dataloader/util/OAuthBrowserLoginRunner.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/salesforce/dataloader/util/OAuthBrowserLoginRunner.java b/src/main/java/com/salesforce/dataloader/util/OAuthBrowserLoginRunner.java index 77db889e..f6597f16 100644 --- a/src/main/java/com/salesforce/dataloader/util/OAuthBrowserLoginRunner.java +++ b/src/main/java/com/salesforce/dataloader/util/OAuthBrowserLoginRunner.java @@ -99,6 +99,7 @@ private void retryBrowserLoginWithDefaultURL(Config config, boolean skipUserCode startBrowserLogin(config, skipUserCodePage); } + // Browser login uses OAuth 2.0 Device Flow - https://help.salesforce.com/s/articleView?id=sf.remoteaccess_oauth_device_flow.htm&type=5 private void startBrowserLogin(Config config, boolean skipUserCodePage) throws IOException, ParameterLoadException, OAuthBrowserLoginRunnerException { setLoginStatus(LoginStatus.WAIT); this.config = config; From 4f4e46041581e4250270fe275bb18ae3cadf0a76 Mon Sep 17 00:00:00 2001 From: ashitsalesforce Date: Wed, 7 Feb 2024 09:57:11 -0800 Subject: [PATCH 2/2] make "keep account team" and "use bulk API" mutually exclusive "keep account team" feature is not supported in Bulk API. So, make "keep account team" checkbox and "use bulk API" checkbox mutually exclusive. --- .../com/salesforce/dataloader/ui/AdvancedSettingsDialog.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/com/salesforce/dataloader/ui/AdvancedSettingsDialog.java b/src/main/java/com/salesforce/dataloader/ui/AdvancedSettingsDialog.java index 0a3f8697..53eba9ee 100644 --- a/src/main/java/com/salesforce/dataloader/ui/AdvancedSettingsDialog.java +++ b/src/main/java/com/salesforce/dataloader/ui/AdvancedSettingsDialog.java @@ -525,6 +525,7 @@ public void widgetSelected(SelectionEvent e) { super.widgetSelected(e); boolean enabled = buttonKeepAccountTeam.getSelection(); // make sure the appropriate check boxes are enabled or disabled + buttonUseBulkApi.setSelection(!enabled); setBulkSettings(!enabled); } }); @@ -551,8 +552,10 @@ public void widgetSelected(SelectionEvent e) { textBatch.setText(String.valueOf(newDefaultBatchSize)); // make sure the appropriate check boxes are enabled or disabled setBulkSettings(enabled); + buttonKeepAccountTeam.setSelection(!enabled); } }); + buttonKeepAccountTeam.setSelection(!buttonUseBulkApi.getSelection()); // Bulk API serial concurrency mode setting Label labelBulkApiSerialMode = new Label(restComp, SWT.RIGHT | SWT.WRAP);