Fix bug with setting proxy settings (#213)

box · Nov 2, 2020 · 38c3450 · 38c3450
1 parent 98a16a2
commit 38c3450
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,12 +4,12 @@
 
 **New Features and Enhancements:**
 
-- Add filter_term parameter to `groups:list`
-- Make commands `collaborations:add`, `shared-links:update`, `shared-links:delete`, `users:search` that were previously hidden, now available
+- Add `filter_term` parameter to `groups:list` ([210](https://github.com/box/boxcli/pull/210))
+- Make commands `collaborations:add`, `shared-links:update`, `shared-links:delete`, `users:search` that were previously hidden, now available ([211](https://github.com/box/boxcli/pull/211))
 
 **Bug Fixes:**
 
-- 
+- Fix bug with setting proxy settings ([213](https://github.com/box/boxcli/pull/213))
 
 ## 2.6.0 [2020-08-20]
 

diff --git a/src/box-command.js b/src/box-command.js
@@ -1051,6 +1051,7 @@ class BoxCommand extends Command {
 		let settings;
 		try {
 			settings = JSON.parse(fs.readFileSync(SETTINGS_FILE_PATH));
+			settings = Object.assign(this._getDefaultSettings(), settings);
 			DEBUG.init('Loaded settings %O', settings);
 		} catch (ex) {
 			throw new BoxCLIError(`Could not read CLI settings file at ${SETTINGS_FILE_PATH}`, ex);
@@ -1086,7 +1087,7 @@ class BoxCommand extends Command {
 			boxReportsFileFormat: 'txt',
 			boxDownloadsFolderPath: path.join(os.homedir(), 'Downloads/Box-Downloads'),
 			outputJson: false,
-			enableProxy: true,
+			enableProxy: false,
 			proxy: {
 				url: null,
 				username: null,