diff --git a/packages/nodes-base/nodes/Beeminder/Beeminder.node.functions.ts b/packages/nodes-base/nodes/Beeminder/Beeminder.node.functions.ts index cbb3576953..29f2efe055 100644 --- a/packages/nodes-base/nodes/Beeminder/Beeminder.node.functions.ts +++ b/packages/nodes-base/nodes/Beeminder/Beeminder.node.functions.ts @@ -27,7 +27,7 @@ export async function createDatapoint( ) { const endpoint = `/users/me/goals/${data.goalName}/datapoints.json`; - return await beeminderApiRequest.call(this, 'POST', endpoint, data, {}, true); + return await beeminderApiRequest.call(this, 'POST', endpoint, data, {}); } export async function getAllDatapoints( @@ -55,7 +55,7 @@ export async function updateDatapoint( ) { const endpoint = `/users/me/goals/${data.goalName}/datapoints/${data.datapointId}.json`; - return await beeminderApiRequest.call(this, 'PUT', endpoint, data, {}, true); + return await beeminderApiRequest.call(this, 'PUT', endpoint, data, {}); } export async function deleteDatapoint( @@ -80,7 +80,7 @@ export async function createCharge( ...(data.dryrun && { dryrun: data.dryrun }), }; - return await beeminderApiRequest.call(this, 'POST', endpoint, body, {}, true); + return await beeminderApiRequest.call(this, 'POST', endpoint, body, {}); } export async function uncleGoal( @@ -102,7 +102,7 @@ export async function createAllDatapoints( datapoints: data.datapoints, }; - return await beeminderApiRequest.call(this, 'POST', endpoint, body, {}, true); + return await beeminderApiRequest.call(this, 'POST', endpoint, body, {}); } export async function getSingleDatapoint( @@ -162,7 +162,7 @@ export async function createGoal( ) { const endpoint = '/users/me/goals.json'; - return await beeminderApiRequest.call(this, 'POST', endpoint, data, {}, true); + return await beeminderApiRequest.call(this, 'POST', endpoint, data, {}); } export async function updateGoal( @@ -182,7 +182,7 @@ export async function updateGoal( ) { const endpoint = `/users/me/goals/${data.goalName}.json`; - return await beeminderApiRequest.call(this, 'PUT', endpoint, data, {}, true); + return await beeminderApiRequest.call(this, 'PUT', endpoint, data, {}); } export async function refreshGoal( diff --git a/packages/nodes-base/nodes/Beeminder/GenericFunctions.ts b/packages/nodes-base/nodes/Beeminder/GenericFunctions.ts index 133ec8f70d..47a142afe5 100644 --- a/packages/nodes-base/nodes/Beeminder/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Beeminder/GenericFunctions.ts @@ -15,26 +15,6 @@ function isValidAuthenticationMethod(value: unknown): value is 'apiToken' | 'oAu return typeof value === 'string' && ['apiToken', 'oAuth2'].includes(value); } -function convertToFormData(obj: any): Record { - const result: Record = {}; - for (const [key, value] of Object.entries(obj)) { - if (value === null || value === undefined) { - // Skip null/undefined values - continue; - } else if (typeof value === 'boolean') { - result[key] = value.toString(); - } else if (typeof value === 'number') { - result[key] = value.toString(); - } else if (Array.isArray(value)) { - // Handle arrays - convert to JSON string for form data - result[key] = JSON.stringify(value); - } else { - result[key] = String(value); - } - } - return result; -} - export async function beeminderApiRequest( this: IExecuteFunctions | IWebhookFunctions | IHookFunctions | ILoadOptionsFunctions, method: IHttpRequestMethods, @@ -42,7 +22,6 @@ export async function beeminderApiRequest( body: any = {}, query: IDataObject = {}, - useFormData: boolean = false, ): Promise { const authenticationMethod = this.getNodeParameter('authentication', 0, 'apiToken'); @@ -57,23 +36,14 @@ export async function beeminderApiRequest( const options: IRequestOptions = { method, + body, qs: query, uri: `${BEEMINDER_URI}${endpoint}`, json: true, }; - if (useFormData) { - options.formData = convertToFormData(body); - } else { - options.body = body; - } - if (!Object.keys(body as IDataObject).length) { - if (useFormData) { - delete options.formData; - } else { - delete options.body; - } + delete options.body; } if (!Object.keys(query).length) { diff --git a/packages/nodes-base/nodes/Beeminder/test/Beeminder.node.functions.test.ts b/packages/nodes-base/nodes/Beeminder/test/Beeminder.node.functions.test.ts index 64e59a7331..ddba2131d6 100644 --- a/packages/nodes-base/nodes/Beeminder/test/Beeminder.node.functions.test.ts +++ b/packages/nodes-base/nodes/Beeminder/test/Beeminder.node.functions.test.ts @@ -54,7 +54,6 @@ describe('Beeminder Node Functions', () => { '/users/me/goals/testgoal/datapoints.json', data, {}, - true, ); expect(result).toBe(mockResponse); }); @@ -78,7 +77,6 @@ describe('Beeminder Node Functions', () => { '/users/me/goals/testgoal/datapoints.json', data, {}, - true, ); expect(result).toBe(mockResponse); }); @@ -160,7 +158,6 @@ describe('Beeminder Node Functions', () => { '/users/me/goals/testgoal/datapoints/123.json', data, {}, - true, ); expect(result).toBe(mockResponse); }); @@ -184,7 +181,6 @@ describe('Beeminder Node Functions', () => { '/users/me/goals/testgoal/datapoints/123.json', data, {}, - true, ); expect(result).toBe(mockResponse); }); @@ -232,7 +228,6 @@ describe('Beeminder Node Functions', () => { '/users/me/goals/testgoal/datapoints/create_all.json', { datapoints }, {}, - true, ); expect(result).toBe(mockResponse); }); @@ -387,7 +382,6 @@ describe('Beeminder Node Functions', () => { '/users/me/goals.json', data, {}, - true, ); expect(result).toBe(mockResponse); }); @@ -419,7 +413,6 @@ describe('Beeminder Node Functions', () => { '/users/me/goals.json', data, {}, - true, ); expect(result).toBe(mockResponse); }); @@ -442,7 +435,6 @@ describe('Beeminder Node Functions', () => { '/users/me/goals/testgoal.json', data, {}, - true, ); expect(result).toBe(mockResponse); }); @@ -471,7 +463,6 @@ describe('Beeminder Node Functions', () => { '/users/me/goals/testgoal.json', data, {}, - true, ); expect(result).toBe(mockResponse); }); @@ -564,7 +555,6 @@ describe('Beeminder Node Functions', () => { amount: 5, }, {}, - true, ); expect(result).toBe(mockResponse); }); @@ -591,7 +581,6 @@ describe('Beeminder Node Functions', () => { dryrun: true, }, {}, - true, ); expect(result).toBe(mockResponse); }); @@ -616,7 +605,6 @@ describe('Beeminder Node Functions', () => { amount: 5, }, {}, - true, ); expect(result).toBe(mockResponse); });