Skip to content

Commit

Permalink
refactor(files): remove redundant file property names (#7340)
Browse files Browse the repository at this point in the history
  • Loading branch information
ckohen authored Jan 25, 2022
1 parent 5ccdb0a commit 6725038
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
10 changes: 5 additions & 5 deletions packages/rest/__tests__/REST.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ test('postFile empty', async () => {
test('postFile file (string)', async () => {
expect(
await api.post('/postFile', {
files: [{ fileName: 'out.txt', fileData: 'Hello' }],
files: [{ name: 'out.txt', data: 'Hello' }],
}),
).toStrictEqual({
body: [
Expand All @@ -134,7 +134,7 @@ test('postFile file (string)', async () => {
test('postFile file and JSON', async () => {
expect(
await api.post('/postFile', {
files: [{ fileName: 'out.txt', fileData: Buffer.from('Hello') }],
files: [{ name: 'out.txt', data: Buffer.from('Hello') }],
body: { foo: 'bar' },
}),
).toStrictEqual({
Expand All @@ -154,8 +154,8 @@ test('postFile files and JSON', async () => {
expect(
await api.post('/postFile', {
files: [
{ fileName: 'out.txt', fileData: Buffer.from('Hello') },
{ fileName: 'out.txt', fileData: Buffer.from('Hi') },
{ name: 'out.txt', data: Buffer.from('Hello') },
{ name: 'out.txt', data: Buffer.from('Hi') },
],
body: { files: [{ id: 0, description: 'test' }] },
}),
Expand All @@ -179,7 +179,7 @@ test('postFile files and JSON', async () => {
test('postFile sticker and JSON', async () => {
expect(
await api.post('/postFile', {
files: [{ key: 'file', fileName: 'sticker.png', fileData: Buffer.from('Sticker') }],
files: [{ key: 'file', name: 'sticker.png', data: Buffer.from('Sticker') }],
body: { foo: 'bar' },
appendToFormData: true,
}),
Expand Down
6 changes: 3 additions & 3 deletions packages/rest/src/lib/RequestManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export interface RawFile {
/**
* The name of the file
*/
fileName: string;
name: string;
/**
* An explicit key to use for key of the formdata field for this file.
* When not provided, the index of the file in the files array is used in the form `files[${index}]`.
Expand All @@ -27,7 +27,7 @@ export interface RawFile {
/**
* The actual data for the file
*/
fileData: string | number | boolean | Buffer;
data: string | number | boolean | Buffer;
}

/**
Expand Down Expand Up @@ -366,7 +366,7 @@ export class RequestManager extends EventEmitter {

// Attach all files to the request
for (const [index, file] of request.files.entries()) {
formData.append(file.key ?? `files[${index}]`, file.fileData, file.fileName);
formData.append(file.key ?? `files[${index}]`, file.data, file.name);
}

// If a JSON body was added as well, attach it to the form data, using payload_json unless otherwise specified
Expand Down

0 comments on commit 6725038

Please sign in to comment.