Skip to content
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

Jump to bottom

fix: Fix proxy-agent #867

Merged
merged 10 commits into from
Nov 8, 2023
Merged

fix: Fix proxy-agent #867

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
6ee6db5
Update package-lock
congminh1254 Oct 6, 2023
10f72c7
Merge branch 'main' of https://github.com/box/box-node-sdk
congminh1254 Oct 26, 2023
61e9d0e
Fix conflict
congminh1254 Oct 26, 2023
babeb65
Merge branch 'main' of https://github.com/box/box-node-sdk
congminh1254 Nov 3, 2023
97b1efb
Merge branch 'main' of https://github.com/box/box-node-sdk
congminh1254 Nov 3, 2023
897b620
Merge branch 'main' of https://github.com/box/box-node-sdk
congminh1254 Nov 7, 2023
7780711
fix: Fix proxy-agent
congminh1254 Nov 8, 2023
5883e1c
Update code
congminh1254 Nov 8, 2023
ba15a5b
Update code
congminh1254 Nov 8, 2023
5c014ac
Update code
congminh1254 Nov 8, 2023
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
17 changes: 9 additions & 8 deletions src/util/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,18 +199,19 @@ function updateRequestAgent(
Required<Pick<UserConfigurationOptions, 'proxy'>>
) {
if (params.proxy.url) {
let proxyUrl = params.proxy.url;
if (params.proxy.username && params.proxy.password) {
proxyUrl = proxyUrl.replace('://', `://${params.proxy.username}:${params.proxy.password}@`);
}

const ProxyAgent = require('proxy-agent').ProxyAgent;
params.request.agentClass = ProxyAgent;
params.request.agentOptions = Object.assign(
{},
params.request.agentOptions = Object.assign({},
params.request.agentOptions,
url.parse(params.proxy.url)
{
getProxyForUrl: (url: string) => proxyUrl
}
);
if (params.proxy.username && params.proxy.password) {
Object.assign(params.request.agentOptions, {
auth: `${params.proxy.username}:${params.proxy.password}`,
});
}
}
}

Expand Down
Loading