mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2025-03-05 20:50:17 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(Google Drive Node): Fix issue preventing service account from downloading files (#7642)

Browse source
This commit is contained in:
Jon 2024-01-15 15:06:47 +00:00 committed by GitHub
parent 52a2e25a25
commit cf7131d766
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
packages/nodes-base/nodes/Google/Drive/test/v2/node/file/download.test.ts
View file

@ -26,7 +26,7 @@ describe('test GoogleDriveV2: file download', () => {
jest.unmock('../../../../v2/transport'); jest.unmock('../../../../v2/transport');
}); });
it('shuold be called with', async () => { it('should be called with', async () => {
const nodeParameters = { const nodeParameters = {
operation: 'deleteFile', operation: 'deleteFile',
fileId: { fileId: {
@ -58,7 +58,7 @@ describe('test GoogleDriveV2: file download', () => {
{}, {},
{ alt: 'media' }, { alt: 'media' },
undefined, undefined,
{ encoding: null, json: false, resolveWithFullResponse: true, useStream: true }, { encoding: 'arraybuffer', json: false, returnFullResponse: true, useStream: true },
); );
}); });
}); });

4
packages/nodes-base/nodes/Google/Drive/v2/actions/file/download.operation.ts
View file

@ -192,8 +192,8 @@ export async function execute(
const requestOptions = { const requestOptions = {
useStream: true, useStream: true,
resolveWithFullResponse: true, returnFullResponse: true,
encoding: null, encoding: 'arraybuffer',
json: false, json: false,
}; };

8
packages/nodes-base/nodes/Google/Drive/v2/transport/index.ts
View file

@ -29,7 +29,6 @@ export async function googleApiRequest(
headers: { headers: {
'Content-Type': 'application/json', 'Content-Type': 'application/json',
}, },
method, method,
body, body,
qs, qs,
@ -38,7 +37,6 @@ export async function googleApiRequest(
}; };
options = Object.assign({}, options, option); options = Object.assign({}, options, option);
try { try {
if (Object.keys(body).length === 0) { if (Object.keys(body).length === 0) {
delete options.body; delete options.body;
@ -52,7 +50,11 @@ export async function googleApiRequest(
options.headers!.Authorization = `Bearer ${access_token}`; options.headers!.Authorization = `Bearer ${access_token}`;
return await this.helpers.httpRequest(options); return await this.helpers.httpRequest(options);
} else { } else {
return await this.helpers.requestOAuth2.call(this, 'googleDriveOAuth2Api', options); return await this.helpers.httpRequestWithAuthentication.call(
this,
'googleDriveOAuth2Api',
options,
);
} }
} catch (error) { } catch (error) {
if (error.code === 'ERR_OSSL_PEM_NO_START_LINE') { if (error.code === 'ERR_OSSL_PEM_NO_START_LINE') {