CodeMirror/budibase
1
0
Fork 0
mirror of synced 2024-06-13 16:05:06 +12:00
Code Issues Projects Releases Wiki Activity

Deprecate legacyHttpParser, fix rest tests

Browse source
This commit is contained in:
Rory Powell 2022-10-12 11:05:16 +01:00
parent 40d204fbb2
commit cabfe00ef5
3 changed files with 41 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
packages/server/src/api/controllers/query/index.ts
View file

@ -56,6 +56,7 @@ const _import = async (ctx: any) => {
config: {
url: info.url,
defaultHeaders: [],
rejectUnauthorized: true,
},
name: info.name,
}

8
packages/server/src/integrations/rest.ts
View file

@ -78,16 +78,11 @@ const SCHEMA: Integration = {
default: {},
},
rejectUnauthorized: {
display: "Reject Unauthorized",
type: DatasourceFieldType.BOOLEAN,
default: true,
required: false,
},
legacyHttpParser: {
display: "Legacy HTTP Support",
type: DatasourceFieldType.BOOLEAN,
required: false,
default: false,
},
},
query: {
create: {
@ -397,6 +392,7 @@ class RestIntegration implements IntegrationBase {
})
}
// Deprecated by rejectUnauthorized
if (this.config.legacyHttpParser) {
// https://github.com/nodejs/node/issues/43798
input.extraHttpOptions = { insecureHTTPParser: true }

60
packages/server/src/integrations/tests/rest.spec.ts
View file

@ -1,17 +1,16 @@
jest.mock("node-fetch", () =>
jest.fn(() => ({
headers: {
raw: () => {
return { "content-type": ["application/json"] }
},
get: () => ["application/json"],
const mockFetch = jest.fn(() => ({
headers: {
raw: () => {
return { "content-type": ["application/json"] }
},
json: jest.fn(() => ({
my_next_cursor: 123,
})),
text: jest.fn(),
}))
)
get: () => ["application/json"],
},
json: jest.fn(() => ({
my_next_cursor: 123,
})),
text: jest.fn(),
}))
jest.mock("node-fetch", () => mockFetch)
import fetch from "node-fetch"
import { default as RestIntegration } from "../rest"
const FormData = require("form-data")
@ -256,7 +255,7 @@ describe("REST Integration", () => {
authConfigId: "c59c14bd1898a43baa08da68959b24686",
}
await config.integration.read(query)
expect(fetch).toHaveBeenCalledWith(`${BASE_URL}/?`, {
expect(fetch).toHaveBeenCalledWith(`${BASE_URL}/`, {
method: "GET",
headers: {
Authorization: "Basic dXNlcjpwYXNzd29yZA==",
@ -269,7 +268,7 @@ describe("REST Integration", () => {
authConfigId: "0d91d732f34e4befabeff50b392a8ff3",
}
await config.integration.read(query)
expect(fetch).toHaveBeenCalledWith(`${BASE_URL}/?`, {
expect(fetch).toHaveBeenCalledWith(`${BASE_URL}/`, {
method: "GET",
headers: {
Authorization: "Bearer mytoken",
@ -327,7 +326,7 @@ describe("REST Integration", () => {
},
}
await config.integration.create(query)
expect(fetch).toHaveBeenCalledWith(`${BASE_URL}/api?`, {
expect(fetch).toHaveBeenCalledWith(`${BASE_URL}/api`, {
body: JSON.stringify({
[pageParam]: pageValue,
[sizeParam]: sizeValue,
@ -359,7 +358,7 @@ describe("REST Integration", () => {
},
}
await config.integration.create(query)
expect(fetch).toHaveBeenCalledWith(`${BASE_URL}/api?`, {
expect(fetch).toHaveBeenCalledWith(`${BASE_URL}/api`, {
body: expect.any(FormData),
headers: {},
method: "POST",
@ -390,7 +389,7 @@ describe("REST Integration", () => {
},
}
await config.integration.create(query)
expect(fetch).toHaveBeenCalledWith(`${BASE_URL}/api?`, {
expect(fetch).toHaveBeenCalledWith(`${BASE_URL}/api`, {
body: expect.any(URLSearchParams),
headers: {},
method: "POST",
@ -456,7 +455,7 @@ describe("REST Integration", () => {
},
}
const res = await config.integration.create(query)
expect(fetch).toHaveBeenCalledWith(`${BASE_URL}/api?`, {
expect(fetch).toHaveBeenCalledWith(`${BASE_URL}/api`, {
body: JSON.stringify({
[pageParam]: pageValue,
[sizeParam]: sizeValue,
@ -490,7 +489,7 @@ describe("REST Integration", () => {
},
}
const res = await config.integration.create(query)
expect(fetch).toHaveBeenCalledWith(`${BASE_URL}/api?`, {
expect(fetch).toHaveBeenCalledWith(`${BASE_URL}/api`, {
body: expect.any(FormData),
headers: {},
method: "POST",
@ -523,7 +522,7 @@ describe("REST Integration", () => {
},
}
const res = await config.integration.create(query)
expect(fetch).toHaveBeenCalledWith(`${BASE_URL}/api?`, {
expect(fetch).toHaveBeenCalledWith(`${BASE_URL}/api`, {
body: expect.any(URLSearchParams),
headers: {},
method: "POST",
@ -563,7 +562,7 @@ describe("REST Integration", () => {
legacyHttpParser: true,
})
await config.integration.read({})
expect(fetch).toHaveBeenCalledWith(`${BASE_URL}/?`, {
expect(fetch).toHaveBeenCalledWith(`${BASE_URL}/`, {
method: "GET",
headers: {},
extraHttpOptions: {
@ -572,4 +571,21 @@ describe("REST Integration", () => {
})
})
})
it("Attaches custom agent when Reject Unauthorized option is false", async () => {
config = new TestConfiguration({
url: BASE_URL,
rejectUnauthorized: false,
})
await config.integration.read({})
const calls: any = mockFetch.mock.calls[0]
const url = calls[0]
expect(url).toBe(`${BASE_URL}/`)
const calledConfig = calls[1]
expect(calledConfig.method).toBe("GET")
expect(calledConfig.headers).toEqual({})
expect(calledConfig.agent.options.rejectUnauthorized).toBe(false)
})
})