Merge pull request #1251 from ashitsalesforce/master

Make sfdc.resetUrlOnLogin read-only
forcedotcom · Sep 3, 2024 · 94a0852 · 94a0852
2 parents b09c598 + 4b7fb09
commit 94a0852
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 14 deletions.
diff --git a/rundl.sh b/rundl.sh
@@ -11,7 +11,7 @@ do
       debug="-Xdebug -Xrunjdwp:server=y,transport=dt_socket,address=5005,suspend=y"
       ;;
     b)
-      batchmodeargs="./configs upsertAccounts run.mode=batch"
+      batchmodeargs="./.. upsertAccounts run.mode=batch"
       ;;
     e)
       encryptionargs="run.mode=encrypt"
@@ -27,3 +27,4 @@ jarname="$(find ./target -name 'dataloader-[0-9][0-9].[0-9].[0-9].jar' | tail -1
 
 
 java ${debug} -cp ${jarname} com.salesforce.dataloader.process.DataLoaderRunner ${batchmodeargs} ${configdir} ${encryptionargs} $@
+#java ${debug} -cp ${jarname} com.salesforce.dataloader.action.visitor.RESTTest
diff --git a/src/main/java/com/salesforce/dataloader/config/Config.java b/src/main/java/com/salesforce/dataloader/config/Config.java
@@ -486,6 +486,7 @@ public class Config {
             OAUTH_CLIENTSECRET,
             OAUTH_PREFIX + PROD_ENVIRONMENT_VAL + "." + OAUTH_PARTIAL_CLIENTSECRET,
             OAUTH_PREFIX + SB_ENVIRONMENT_VAL + "." + OAUTH_PARTIAL_CLIENTSECRET,
+            RESET_URL_ON_LOGIN,
     };
 
     /**

diff --git a/src/main/java/com/salesforce/dataloader/ui/AdvancedSettingsDialog.java b/src/main/java/com/salesforce/dataloader/ui/AdvancedSettingsDialog.java
@@ -75,7 +75,6 @@ public class AdvancedSettingsDialog extends BaseDialog {
     private Text textProdEndpoint;
     private Text textSBEndpoint;
     private Button buttonCompression;
-    private Button buttonResetUrl;
     private Text textTimeout;
     private Text textRowToStart;
     private Text textProxyHost;
@@ -609,11 +608,6 @@ public void verifyText(VerifyEvent event) {
         }
         textSBEndpoint.setText(endpoint);
 
-        //reset url on login
-        createLabel(restComp, "resetUrlOnLogin", null, null);
-        buttonResetUrl = new Button(restComp, SWT.CHECK);
-        buttonResetUrl.setSelection(config.getBoolean(Config.RESET_URL_ON_LOGIN));
-
         // enable/disable sort of fields to extract
         createLabel(restComp, "sortQueryFieldsInExtraction", null, null);
         buttonSortExtractFields = new Button(restComp, SWT.CHECK);
@@ -995,7 +989,6 @@ public void widgetSelected(SelectionEvent event) {
                 config.setAuthEndpointForEnv(currentTextSBEndpoint, Config.SB_ENVIRONMENT_VAL);
                 config.setValue(Config.ASSIGNMENT_RULE, textRule.getText());
                 config.setValue(Config.LOAD_ROW_TO_START_AT, textRowToStart.getText());
-                config.setValue(Config.RESET_URL_ON_LOGIN, buttonResetUrl.getSelection());
                 config.setValue(Config.NO_COMPRESSION, buttonCompression.getSelection());
                 config.setValue(Config.TRUNCATE_FIELDS, buttonTruncateFields.getSelection());
                 config.setValue(Config.FORMAT_PHONE_FIELDS, buttonFormatPhoneFields.getSelection());

diff --git a/src/main/resources/config.properties b/src/main/resources/config.properties
@@ -5,7 +5,8 @@ loader.csvComma=true
 loader.csvTab=true
 loader.csvOther=false
 loader.csvOtherValue=
-sfdc.endpoint=https\://login.salesforce.com
+sfdc.endpoint.production=https\://login.salesforce.com
+sfdc.endpoint.sandbox=https\://login.salesforce.com
 sfdc.loadBatchSize=200
 process.loadRowToStartAt=0
 sfdc.timeoutSecs=540
@@ -16,7 +17,6 @@ sfdc.minRetrySleepSecs=2
 sfdc.insertNulls=false
 process.enableExtractStatusOutput=false
 process.enableLastRunOutput=true
-sfdc.resetUrlOnLogin=true
 sfdc.extractionRequestSize=500
 dataAccess.writeBatchSize=500
 dataAccess.readBatchSize=200
@@ -34,10 +34,6 @@ sfdc.oauth.environment=Production
 sfdc.oauth.environments=Production,Sandbox
 sfdc.oauth.Production.bulk.clientid=DataLoaderBulkUI/
 sfdc.oauth.Production.partner.clientid=DataLoaderPartnerUI/
-sfdc.oauth.Production.server=https\://login.salesforce.com/
-sfdc.oauth.Production.redirecturi=https\://login.salesforce.com/services/oauth2/success
 sfdc.oauth.Sandbox.bulk.clientid=DataLoaderBulkUI/
 sfdc.oauth.Sandbox.partner.clientid=DataLoaderPartnerUI/
-sfdc.oauth.Sandbox.server=https\://test.salesforce.com/
-sfdc.oauth.Sandbox.redirecturi=https\://test.salesforce.com/services/oauth2/success
 process.operation=insert