opensource/n8n
3
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2026-09-24 23:22:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(Microsoft OneDrive Node): Don't overwrite filename from node parameters when uploading binary file (#22949)

Browse Source
This commit is contained in:
krisn0x
2025-12-19 19:05:25 +02:00
committed by GitHub
parent ed65ef9231
commit 6ae4999ef9
3 changed files with 191 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/nodes-base/nodes/Microsoft/OneDrive/MicrosoftOneDrive.node.ts
+15 -6
View File
@@ -19,7 +19,7 @@ export class MicrosoftOneDrive implements INodeType {
name: 'microsoftOneDrive',
icon: 'file:oneDrive.svg',
group: ['input'],
version: 1,
version: [1, 1.1],
subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
description: 'Consume Microsoft OneDrive API',
defaults: {
@@ -63,6 +63,7 @@ export class MicrosoftOneDrive implements INodeType {
const items = this.getInputData();
const returnData: INodeExecutionData[] = [];
const length = items.length;
const nodeVersion = this.getNode().typeVersion;
let responseData;
const resource = this.getNodeParameter('resource', 0);
const operation = this.getNodeParameter('operation', 0);
@@ -217,12 +218,20 @@ export class MicrosoftOneDrive implements INodeType {
const body = await this.helpers.getBinaryDataBuffer(i, binaryPropertyName);
let encodedFilename;
if (fileName !== '') {
encodedFilename = encodeURIComponent(fileName);
}
if (nodeVersion >= 1.1) {
if (fileName !== '') {
encodedFilename = encodeURIComponent(fileName);
} else if (binaryData.fileName !== undefined) {
encodedFilename = encodeURIComponent(binaryData.fileName);
}
} else {
if (fileName !== '') {
encodedFilename = encodeURIComponent(fileName);
}
if (binaryData.fileName !== undefined) {
encodedFilename = encodeURIComponent(binaryData.fileName);
if (binaryData.fileName !== undefined) {
encodedFilename = encodeURIComponent(binaryData.fileName);
}
}
responseData = await microsoftApiRequest.call(
packages/nodes-base/nodes/Microsoft/OneDrive/test/node/file.download.test.ts
+11
View File
@@ -30,6 +30,15 @@ describe('Test MicrosoftOneDrive, file > download', () => {
const httpRequest = jest.fn(async () => ({ body: mock<IncomingMessage>() }));
const prepareBinaryData = jest.fn(async () => ({ data: 'testBinary' }));
const mockNode = {
id: 'test-node-id',
name: 'Microsoft OneDrive Test',
type: 'n8n-nodes-base.microsoftOneDrive',
typeVersion: 1.1,
position: [0, 0] as [number, number],
parameters: {},
};
beforeEach(() => {
mockExecuteFunctions = mock<IExecuteFunctions>();
microsoftOneDrive = new MicrosoftOneDrive();
@@ -40,6 +49,8 @@ describe('Test MicrosoftOneDrive, file > download', () => {
returnJsonArray: jest.fn((data) => [data]),
constructExecutionMetaData: jest.fn((data) => data),
} as any;
mockExecuteFunctions.getNode.mockReturnValue(mockNode);
});
afterEach(() => {
packages/nodes-base/nodes/Microsoft/OneDrive/test/node/file.upload.test.ts
+165
View File
@@ -0,0 +1,165 @@
import type { MockProxy } from 'jest-mock-extended';
import { mock } from 'jest-mock-extended';
import type { IExecuteFunctions, IBinaryData } from 'n8n-workflow';
import * as genericFunctions from '../../GenericFunctions';
import { MicrosoftOneDrive } from '../../MicrosoftOneDrive.node';
jest.mock('../../GenericFunctions', () => ({
...jest.requireActual('../../GenericFunctions'),
microsoftApiRequest: jest.fn(async function () {
return JSON.stringify({
id: 'uploadedFileId',
name: 'uploadedFile.txt',
});
}),
}));
describe('Test MicrosoftOneDrive, file > upload', () => {
let mockExecuteFunctions: MockProxy<IExecuteFunctions>;
let microsoftOneDrive: MicrosoftOneDrive;
const getBinaryDataBuffer = jest.fn(async () => Buffer.from('test content'));
const mockNode = {
id: 'test-node-id',
name: 'Microsoft OneDrive Test',
type: 'n8n-nodes-base.microsoftOneDrive',
typeVersion: 1.1,
position: [0, 0] as [number, number],
parameters: {},
};
beforeEach(() => {
mockExecuteFunctions = mock<IExecuteFunctions>();
microsoftOneDrive = new MicrosoftOneDrive();
mockExecuteFunctions.helpers = {
assertBinaryData: jest.fn(() => {
return {
data: 'base64data',
mimeType: 'text/plain',
fileName: 'binaryFileName.txt',
} as IBinaryData;
}),
getBinaryDataBuffer,
returnJsonArray: jest.fn((data) => [data]),
constructExecutionMetaData: jest.fn((data) => data),
} as any;
mockExecuteFunctions.getNode.mockReturnValue(mockNode);
});
afterEach(() => {
jest.clearAllMocks();
});
it('should use filename from node parameters even when binary has a filename (version 1.1+)', async () => {
const items = [{ json: { data: 'test' }, binary: { data: {} as IBinaryData } }];
mockExecuteFunctions.getInputData.mockReturnValue(items);
mockExecuteFunctions.getNodeParameter.mockImplementation((key: string) => {
if (key === 'resource') return 'file';
if (key === 'operation') return 'upload';
if (key === 'parentId') return 'parentFolderId';
if (key === 'fileName') return 'customFileName.txt';
if (key === 'binaryData') return true;
if (key === 'binaryPropertyName') return 'data';
});
await microsoftOneDrive.execute.call(mockExecuteFunctions);
expect(genericFunctions.microsoftApiRequest).toHaveBeenCalledTimes(1);
expect(genericFunctions.microsoftApiRequest).toHaveBeenCalledWith(
'PUT',
'/drive/items/parentFolderId:/customFileName.txt:/content',
expect.any(Buffer),
{},
undefined,
{ 'Content-Type': 'text/plain', 'Content-length': expect.any(Number) },
{},
);
});
it('should use binary filename when node parameter filename is empty', async () => {
const items = [{ json: { data: 'test' }, binary: { data: {} as IBinaryData } }];
mockExecuteFunctions.getInputData.mockReturnValue(items);
mockExecuteFunctions.getNodeParameter.mockImplementation((key: string) => {
if (key === 'resource') return 'file';
if (key === 'operation') return 'upload';
if (key === 'parentId') return 'parentFolderId';
if (key === 'fileName') return '';
if (key === 'binaryData') return true;
if (key === 'binaryPropertyName') return 'data';
});
await microsoftOneDrive.execute.call(mockExecuteFunctions);
expect(genericFunctions.microsoftApiRequest).toHaveBeenCalledTimes(1);
expect(genericFunctions.microsoftApiRequest).toHaveBeenCalledWith(
'PUT',
'/drive/items/parentFolderId:/binaryFileName.txt:/content',
expect.any(Buffer),
{},
undefined,
{ 'Content-Type': 'text/plain', 'Content-length': expect.any(Number) },
{},
);
});
it('should properly encode special characters in filename from node parameters', async () => {
const items = [{ json: { data: 'test' }, binary: { data: {} as IBinaryData } }];
mockExecuteFunctions.getInputData.mockReturnValue(items);
mockExecuteFunctions.getNodeParameter.mockImplementation((key: string) => {
if (key === 'resource') return 'file';
if (key === 'operation') return 'upload';
if (key === 'parentId') return 'parentFolderId';
if (key === 'fileName') return 'file with spaces & special.txt';
if (key === 'binaryData') return true;
if (key === 'binaryPropertyName') return 'data';
});
await microsoftOneDrive.execute.call(mockExecuteFunctions);
expect(genericFunctions.microsoftApiRequest).toHaveBeenCalledTimes(1);
expect(genericFunctions.microsoftApiRequest).toHaveBeenCalledWith(
'PUT',
'/drive/items/parentFolderId:/file%20with%20spaces%20%26%20special.txt:/content',
expect.any(Buffer),
{},
undefined,
{ 'Content-Type': 'text/plain', 'Content-length': expect.any(Number) },
{},
);
});
it('should always use binary filename even when node parameter has a filename (version 1 - legacy bug)', async () => {
mockExecuteFunctions.getNode.mockReturnValue({
...mockNode,
typeVersion: 1,
});
const items = [{ json: { data: 'test' }, binary: { data: {} as IBinaryData } }];
mockExecuteFunctions.getInputData.mockReturnValue(items);
mockExecuteFunctions.getNodeParameter.mockImplementation((key: string) => {
if (key === 'resource') return 'file';
if (key === 'operation') return 'upload';
if (key === 'parentId') return 'parentFolderId';
if (key === 'fileName') return 'customFileName.txt';
if (key === 'binaryData') return true;
if (key === 'binaryPropertyName') return 'data';
});
await microsoftOneDrive.execute.call(mockExecuteFunctions);
expect(genericFunctions.microsoftApiRequest).toHaveBeenCalledTimes(1);
// In version 1, binary filename always overwrites the parameter filename
expect(genericFunctions.microsoftApiRequest).toHaveBeenCalledWith(
'PUT',
'/drive/items/parentFolderId:/binaryFileName.txt:/content',
expect.any(Buffer),
{},
undefined,
{ 'Content-Type': 'text/plain', 'Content-length': expect.any(Number) },
{},
);
});
});