Mirrors/uppy
1
0
Fork 0
mirror of https://github.com/transloadit/uppy.git synced 2026-07-25 19:23:55 +00:00
Code Issues Projects Releases Wiki Activity

do not use a default upload protocol

Browse source
This commit is contained in:
Mikael Finstad 2022-06-15 13:10:56 -07:00
parent f80f437973
commit c7e61ddfea
No known key found for this signature in database
GPG key ID: 25AB36E3E81CBC26
3 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
packages/@uppy/companion/src/server/Uploader.js
View file

@ -93,9 +93,8 @@ function validateOptions (options) {
}
// validate protocol
// @todo this validation should not be conditional once the protocol field is mandatory
if (options.protocol && !Object.keys(PROTOCOLS).some((key) => PROTOCOLS[key] === options.protocol)) {
throw new ValidationError('unsupported protocol specified')
if (options.protocol == null || !Object.keys(PROTOCOLS).some((key) => PROTOCOLS[key] === options.protocol)) {
throw new ValidationError('please specify a valid protocol')
}
// s3 uploads don't require upload destination
@ -208,8 +207,7 @@ class Uploader {
}
async _uploadByProtocol () {
// @todo a default protocol should not be set. We should ensure that the user specifies their protocol.
const protocol = this.options.protocol || PROTOCOLS.multipart
const { protocol } = this.options
switch (protocol) {
case PROTOCOLS.multipart:

2
packages/@uppy/companion/test/__tests__/companion.js
View file

@ -36,7 +36,7 @@ describe('validate upload data', () => {
protocol: 'tusInvalid',
})
.expect(400)
.then((res) => expect(res.body.message).toBe('unsupported protocol specified'))
.then((res) => expect(res.body.message).toBe('please specify a valid protocol'))
})
test('invalid upload fieldname gets rejected', () => {

7
packages/@uppy/companion/test/__tests__/uploader.js
View file

@ -20,10 +20,13 @@ process.env.COMPANION_DATADIR = './test/output'
process.env.COMPANION_DOMAIN = 'localhost:3020'
const { companionOptions } = standalone()
const protocol = 'tus'
describe('uploader with tus protocol', () => {
test('uploader respects uploadUrls', async () => {
const opts = {
endpoint: 'http://localhost/files',
protocol,
companionOptions: { ...companionOptions, uploadUrls: [/^http:\/\/url.myendpoint.com\//] },
}
@ -33,6 +36,7 @@ describe('uploader with tus protocol', () => {
test('uploader respects uploadUrls, valid', async () => {
const opts = {
endpoint: 'http://url.myendpoint.com/files',
protocol,
companionOptions: { ...companionOptions, uploadUrls: [/^http:\/\/url.myendpoint.com\//] },
}
@ -43,6 +47,7 @@ describe('uploader with tus protocol', () => {
test('uploader respects uploadUrls, localhost', async () => {
const opts = {
endpoint: 'http://localhost:1337/',
protocol,
companionOptions: { ...companionOptions, uploadUrls: [/^http:\/\/localhost:1337\//] },
}
@ -226,6 +231,7 @@ describe('uploader with tus protocol', () => {
const opts = {
companionOptions,
endpoint: 'http://localhost',
protocol,
}
// eslint-disable-next-line no-new
@ -247,6 +253,7 @@ describe('uploader with tus protocol', () => {
test('uploader respects maxFileSize correctly', async () => {
const opts = {
endpoint: 'http://url.myendpoint.com/files',
protocol,
companionOptions: { ...companionOptions, maxFileSize: 100 },
size: 99,
}