holm/bruno
1
0
Fork 0
forked from extern/bruno
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#937, #921 improve evaluation of proxy configuration, allow empty proxy port

Browse Source
This commit is contained in:
Mirko Golze 2023-11-12 21:41:25 +01:00
parent e1a74d0652
commit a5ce7e9c9c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/bruno-electron/src/ipc/network/index.js
View File

@ -9,7 +9,7 @@ const Mustache = require('mustache');
const contentDispositionParser = require('content-disposition'); const contentDispositionParser = require('content-disposition');
const mime = require('mime-types'); const mime = require('mime-types');
const { ipcMain } = require('electron'); const { ipcMain } = require('electron');
const { isEmpty, isUndefined, isNull, each, get, compact } = require('lodash'); const { isUndefined, isNull, each, get, compact } = require('lodash');
const { VarsRuntime, AssertRuntime, ScriptRuntime, TestRuntime } = require('@usebruno/js'); const { VarsRuntime, AssertRuntime, ScriptRuntime, TestRuntime } = require('@usebruno/js');
const prepareRequest = require('./prepare-request'); const prepareRequest = require('./prepare-request');
const prepareGqlIntrospectionRequest = require('./prepare-gql-introspection-request'); const prepareGqlIntrospectionRequest = require('./prepare-gql-introspection-request');
@ -126,7 +126,7 @@ const configureRequest = async (
// proxy configuration // proxy configuration
let proxyConfig = get(brunoConfig, 'proxy', {}); let proxyConfig = get(brunoConfig, 'proxy', {});
let proxyEnabled = isEmpty(proxyConfig) ? 'global' : get(proxyConfig, 'enabled', false); let proxyEnabled = get(proxyConfig, 'enabled', 'global');
if (proxyEnabled === 'global') { if (proxyEnabled === 'global') {
proxyConfig = preferencesUtil.getGlobalProxyConfig(); proxyConfig = preferencesUtil.getGlobalProxyConfig();
proxyEnabled = get(proxyConfig, 'enabled', false); proxyEnabled = get(proxyConfig, 'enabled', false);