Backwards compat.

This commit is contained in:
mike12345567 2024-05-17 14:16:08 +01:00
parent ec2ec4014c
commit 16c69dcc33
4 changed files with 23 additions and 11 deletions

View File

@ -86,8 +86,9 @@ export const createValidatedConfigStore = (integration, config) => {
([$configStore, $errorsStore, $selectedValidatorsStore]) => { ([$configStore, $errorsStore, $selectedValidatorsStore]) => {
const validatedConfig = [] const validatedConfig = []
const allowedRestKeys = ["rejectUnauthorized", "downloadImages"]
Object.entries(integration.datasource).forEach(([key, properties]) => { Object.entries(integration.datasource).forEach(([key, properties]) => {
if (integration.name === "REST" && key !== "rejectUnauthorized") { if (integration.name === "REST" && !allowedRestKeys.includes(key)) {
return return
} }

View File

@ -1,22 +1,22 @@
import { import {
Integration,
DatasourceFieldType, DatasourceFieldType,
QueryType, HttpMethod,
PaginationConfig, Integration,
IntegrationBase, IntegrationBase,
PaginationConfig,
PaginationValues, PaginationValues,
RestQueryFields as RestQuery, QueryType,
RestConfig,
RestAuthType, RestAuthType,
RestBasicAuthConfig, RestBasicAuthConfig,
RestBearerAuthConfig, RestBearerAuthConfig,
HttpMethod, RestConfig,
RestQueryFields as RestQuery,
} from "@budibase/types" } from "@budibase/types"
import get from "lodash/get" import get from "lodash/get"
import * as https from "https" import * as https from "https"
import qs from "querystring" import qs from "querystring"
import fetch from "node-fetch"
import type { Response } from "node-fetch" import type { Response } from "node-fetch"
import fetch from "node-fetch"
import { formatBytes } from "../utilities" import { formatBytes } from "../utilities"
import { performance } from "perf_hooks" import { performance } from "perf_hooks"
import FormData from "form-data" import FormData from "form-data"
@ -87,6 +87,12 @@ const SCHEMA: Integration = {
default: true, default: true,
required: false, required: false,
}, },
downloadImages: {
display: "Download images",
type: DatasourceFieldType.BOOLEAN,
default: true,
required: false,
},
}, },
query: { query: {
create: { create: {
@ -139,7 +145,8 @@ class RestIntegration implements IntegrationBase {
filename: string | undefined filename: string | undefined
const { contentType, contentDisposition } = getAttachmentHeaders( const { contentType, contentDisposition } = getAttachmentHeaders(
response.headers response.headers,
{ downloadImages: this.config.downloadImages }
) )
if ( if (
contentDisposition.includes("filename") || contentDisposition.includes("filename") ||

View File

@ -1,6 +1,9 @@
import type { Headers } from "node-fetch" import type { Headers } from "node-fetch"
export function getAttachmentHeaders(headers: Headers) { export function getAttachmentHeaders(
headers: Headers,
opts?: { downloadImages?: boolean }
) {
const contentType = headers.get("content-type") || "" const contentType = headers.get("content-type") || ""
let contentDisposition = headers.get("content-disposition") || "" let contentDisposition = headers.get("content-disposition") || ""
@ -25,7 +28,7 @@ export function getAttachmentHeaders(headers: Headers) {
} }
// for images which don't supply a content disposition, make one up, as binary // for images which don't supply a content disposition, make one up, as binary
// data for images in REST responses isn't really useful, we should always download them // data for images in REST responses isn't really useful, we should always download them
else if (contentType.startsWith("image/")) { else if (opts?.downloadImages && contentType.startsWith("image/")) {
const format = contentType.split("/")[1] const format = contentType.split("/")[1]
return { return {
contentDisposition: `attachment; filename="image.${format}"`, contentDisposition: `attachment; filename="image.${format}"`,

View File

@ -46,6 +46,7 @@ export interface DynamicVariable {
export interface RestConfig { export interface RestConfig {
url: string url: string
rejectUnauthorized: boolean rejectUnauthorized: boolean
downloadImages?: boolean
defaultHeaders: { defaultHeaders: {
[key: string]: any [key: string]: any
} }