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

Disable HTTP proxy #173

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Disable HTTP proxy #173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions lib/api/discovery/bridge-validation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ module.exports.getBridgeConfig = (bridge, timeout) => {
return axios.request({
method: 'get',
url: `http://${ipAddress}/api/config`,
proxy: false,
timeout: timeout | DATA_TIMEOUT,
json: true,
})
Expand Down
1 change: 1 addition & 0 deletions lib/api/discovery/nupnp.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ module.exports.nupnp = function () {

return axios.get('https://discovery.meethue.com', {
headers: {accept: 'application/json'},
proxy: false,
httpsAgent: caChain.getDiscoveryMeetHueHttpsAgent()
})
.catch(err => {
Expand Down
4 changes: 2 additions & 2 deletions lib/api/http/LocalBootstrap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ module.exports = class LocalBootstrap {
, baseUrl = self.baseUrl
;

return axios.get(`${baseUrl}/api/config`, {httpsAgent: new https.Agent({rejectUnauthorized: false})})
return axios.get(`${baseUrl}/api/config`, {proxy: false, httpsAgent: new https.Agent({rejectUnauthorized: false})})
.then(res => {
const bridgeId = res.data.bridgeid.toLowerCase();

Expand Down Expand Up @@ -99,7 +99,7 @@ module.exports = class LocalBootstrap {
})
.then(agent => {
const apiBaseUrl = `${baseUrl}/api`
, transport = new Transport(username, axios.create({baseURL: apiBaseUrl, httpsAgent: agent}))
, transport = new Transport(username, axios.create({baseURL: apiBaseUrl, proxy: false, httpsAgent: agent}))
, config = {
remote: false,
baseUrl: apiBaseUrl,
Expand Down
1 change: 1 addition & 0 deletions lib/api/http/RemoteApi.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,7 @@ module.exports = class RemoteApi {
Authorization: `Bearer ${accessToken}`,
'Content-Type': 'application/json'
},
proxy: false,
responseType: 'json'
});

Expand Down
1 change: 1 addition & 0 deletions lib/api/http/RemoteBootstrap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ module.exports = class RemoteBootstrap {
headers: {
Authorization: `Bearer ${self.remoteApi.accessToken}`
},
proxy: false,
timeout: getTimeout(timeout)
}
, transport = new Transport(username, axios.create(axiosConfig))
Expand Down
2 changes: 2 additions & 0 deletions lib/api/http/endpoints/endpoint.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,8 @@ class ApiEndpoint {

data.url = replacePlaceholders(data.url, data.placeholders, parameters);

data.proxy = false;

if (data._payloadFn) {
let payload = data._payloadFn(parameters)
, headers = data.headers
Expand Down