admin/n8n-enterprise-unlocked
1
0
Fork 0
mirror of https://github.com/Abdulazizzn/n8n-enterprise-unlocked.git synced 2025-12-18 02:21:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

N8N-4134 Add AWS cred testing and http custom calls with credentials (#3924)

Browse Source 
* ✨ Add Aws testing and http custom api
This commit is contained in:
agobrech
2022-08-23 19:02:32 +02:00
committed by GitHub
parent a85d565ffc
commit 5285fc1de6
10 changed files with 196 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
packages/nodes-base/nodes/Aws/Comprehend/GenericFunctions.ts
View File

@@ -13,22 +13,7 @@ import {
IWebhookFunctions,
} from 'n8n-core';
import { ICredentialDataDecryptedObject, NodeApiError, NodeOperationError } from 'n8n-workflow';
function getEndpointForService(
service: string,
credentials: ICredentialDataDecryptedObject,
): string {
let endpoint;
if (service === 'lambda' && credentials.lambdaEndpoint) {
endpoint = credentials.lambdaEndpoint;
} else if (service === 'sns' && credentials.snsEndpoint) {
endpoint = credentials.snsEndpoint;
} else {
endpoint = `https://${service}.${credentials.region}.amazonaws.com`;
}
return (endpoint as string).replace('{region}', credentials.region as string);
}
import { ICredentialDataDecryptedObject, IHttpRequestOptions, NodeApiError, NodeOperationError } from 'n8n-workflow';
export async function awsApiRequest(
this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
@@ -41,30 +26,19 @@ export async function awsApiRequest(
): Promise<any> {
const credentials = await this.getCredentials('aws');
// Concatenate path and instantiate URL object so it parses correctly query strings
const endpoint = new URL(getEndpointForService(service, credentials) + path);
// Sign AWS API request with the user credentials
const signOpts = { headers: headers || {}, host: endpoint.host, method, path, body } as Request;
const securityHeaders = {
accessKeyId: `${credentials.accessKeyId}`.trim(),
secretAccessKey: `${credentials.secretAccessKey}`.trim(),
sessionToken: credentials.temporaryCredentials
? `${credentials.sessionToken}`.trim()
: undefined,
};
sign(signOpts, securityHeaders);
const options: OptionsWithUri = {
headers: signOpts.headers,
const requestOptions = {
qs: {
service,
path,
},
method,
uri: endpoint.href,
body: signOpts.body,
};
body,
url: '',
headers,
region: credentials?.region as string,
} as IHttpRequestOptions;
try {
return await this.helpers.request!(options);
return await this.helpers.requestWithAuthentication.call(this, 'aws', requestOptions);
} catch (error) {
throw new NodeApiError(this.getNode(), error); // no XML parsing needed
}

60
packages/nodes-base/nodes/Aws/DynamoDB/GenericFunctions.ts
View File

@@ -1,7 +1,3 @@
import { URL } from 'url';
import { sign } from 'aws4';
import {
IExecuteFunctions,
IHookFunctions,
@@ -9,25 +5,15 @@ import {
IWebhookFunctions,
} from 'n8n-core';
import { ICredentialDataDecryptedObject, IDataObject, INodeExecutionData } from 'n8n-workflow';
import {
ICredentialDataDecryptedObject,
IDataObject,
IHttpRequestOptions,
INodeExecutionData,
} from 'n8n-workflow';
import { IRequestBody } from './types';
function getEndpointForService(
service: string,
credentials: ICredentialDataDecryptedObject,
): string {
let endpoint;
if (service === 'lambda' && credentials.lambdaEndpoint) {
endpoint = credentials.lambdaEndpoint;
} else if (service === 'sns' && credentials.snsEndpoint) {
endpoint = credentials.snsEndpoint;
} else {
endpoint = `https://${service}.${credentials.region}.amazonaws.com`;
}
return (endpoint as string).replace('{region}', credentials.region as string);
}
export async function awsApiRequest(
this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
service: string,
@@ -38,32 +24,22 @@ export async function awsApiRequest(
// tslint:disable-next-line:no-any
): Promise<any> {
const credentials = await this.getCredentials('aws');
// Concatenate path and instantiate URL object so it parses correctly query strings
const endpoint = new URL(getEndpointForService(service, credentials) + path);
const securityHeaders = {
accessKeyId: `${credentials.accessKeyId}`.trim(),
secretAccessKey: `${credentials.secretAccessKey}`.trim(),
sessionToken: credentials.temporaryCredentials
? `${credentials.sessionToken}`.trim()
: undefined,
};
const options = sign(
{
// @ts-ignore
uri: endpoint,
const requestOptions = {
qs: {
service,
region: credentials.region as string,
method,
path: '/',
headers: { ...headers },
body: JSON.stringify(body),
path,
},
securityHeaders,
);
method,
body: JSON.stringify(body),
url: '',
headers,
region: credentials?.region as string,
} as IHttpRequestOptions;
try {
return JSON.parse(await this.helpers.request!(options));
return JSON.parse(
await this.helpers.requestWithAuthentication.call(this, 'aws', requestOptions),
);
} catch (error) {
const errorMessage =
(error.response && error.response.body && error.response.body.message) ||

52
packages/nodes-base/nodes/Aws/GenericFunctions.ts
View File

@@ -10,24 +10,7 @@ import {
IWebhookFunctions,
} from 'n8n-core';
import { ICredentialDataDecryptedObject, NodeApiError, NodeOperationError } from 'n8n-workflow';
function getEndpointForService(
service: string,
credentials: ICredentialDataDecryptedObject,
): string {
let endpoint;
if (service === 'lambda' && credentials.lambdaEndpoint) {
endpoint = credentials.lambdaEndpoint;
} else if (service === 'sns' && credentials.snsEndpoint) {
endpoint = credentials.snsEndpoint;
} else if (service === 'sqs' && credentials.sqsEndpoint) {
endpoint = credentials.sqsEndpoint;
} else {
endpoint = `https://${service}.${credentials.region}.amazonaws.com`;
}
return (endpoint as string).replace('{region}', credentials.region as string);
}
import { ICredentialDataDecryptedObject, IHttpRequestOptions, NodeApiError, NodeOperationError } from 'n8n-workflow';
export async function awsApiRequest(
this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
@@ -39,31 +22,20 @@ export async function awsApiRequest(
// tslint:disable-next-line:no-any
): Promise<any> {
const credentials = await this.getCredentials('aws');
// Concatenate path and instantiate URL object so it parses correctly query strings
const endpoint = new URL(getEndpointForService(service, credentials) + path);
// Sign AWS API request with the user credentials
const signOpts = { headers: headers || {}, host: endpoint.host, method, path, body } as Request;
const securityHeaders = {
accessKeyId: `${credentials.accessKeyId}`.trim(),
secretAccessKey: `${credentials.secretAccessKey}`.trim(),
sessionToken: credentials.temporaryCredentials
? `${credentials.sessionToken}`.trim()
: undefined,
};
sign(signOpts, securityHeaders);
const options: OptionsWithUri = {
headers: signOpts.headers,
const requestOptions = {
qs: {
service,
path,
},
method,
uri: endpoint.href,
body: signOpts.body,
};
body: JSON.stringify(body),
url: '',
headers,
region: credentials?.region as string,
} as IHttpRequestOptions;
try {
return await this.helpers.request!(options);
return await this.helpers.requestWithAuthentication.call(this,'aws', requestOptions);
} catch (error) {
throw new NodeApiError(this.getNode(), error, { parseXml: true });
}

40
packages/nodes-base/nodes/Aws/Rekognition/GenericFunctions.ts
View File

@@ -15,7 +15,7 @@ import {
IWebhookFunctions,
} from 'n8n-core';
import { IDataObject, NodeApiError, NodeOperationError } from 'n8n-workflow';
import { IDataObject, IHttpRequestOptions, NodeApiError, NodeOperationError } from 'n8n-workflow';
import { pascalCase } from 'change-case';
@@ -33,37 +33,23 @@ export async function awsApiRequest(
): Promise<any> {
const credentials = await this.getCredentials('aws');
const endpoint = new URL(
(((credentials.rekognitionEndpoint as string) || '').replace(
'{region}',
credentials.region as string,
) || `https://${service}.${credentials.region}.amazonaws.com`) + path,
);
// Sign AWS API request with the user credentials
const signOpts = { headers: headers || {}, host: endpoint.host, method, path, body } as Request;
const securityHeaders = {
accessKeyId: `${credentials.accessKeyId}`.trim(),
secretAccessKey: `${credentials.secretAccessKey}`.trim(),
sessionToken: credentials.temporaryCredentials
? `${credentials.sessionToken}`.trim()
: undefined,
};
sign(signOpts, securityHeaders);
const options: OptionsWithUri = {
headers: signOpts.headers,
const requestOptions = {
qs: {
service,
path,
},
method,
uri: endpoint.href,
body: signOpts.body,
};
body,
url: '',
headers,
region: credentials?.region as string,
} as IHttpRequestOptions;
if (Object.keys(option).length !== 0) {
Object.assign(options, option);
Object.assign(requestOptions, option);
}
try {
return await this.helpers.request!(options);
return await this.helpers.requestWithAuthentication.call(this, 'aws', requestOptions);
} catch (error) {
throw new NodeApiError(this.getNode(), error);
}

47
packages/nodes-base/nodes/Aws/S3/GenericFunctions.ts
View File

@@ -15,7 +15,7 @@ import {
IWebhookFunctions,
} from 'n8n-core';
import { IDataObject, JsonObject, NodeApiError, NodeOperationError } from 'n8n-workflow';
import { IDataObject, IHttpRequestOptions, JsonObject, NodeApiError, NodeOperationError } from 'n8n-workflow';
export async function awsApiRequest(
this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
@@ -30,43 +30,24 @@ export async function awsApiRequest(
// tslint:disable-next-line:no-any
): Promise<any> {
const credentials = await this.getCredentials('aws');
const endpoint = new URL(
(((credentials.s3Endpoint as string) || '').replace('{region}', credentials.region as string) ||
`https://${service}.${credentials.region}.amazonaws.com`) + path,
);
// Sign AWS API request with the user credentials
const signOpts = {
headers: headers || {},
host: endpoint.host,
const requestOptions = {
qs: {
service,
path,
query,
},
method,
path: `${endpoint.pathname}?${queryToString(query).replace(/\+/g, '%2B')}`,
body,
} as Request;
const securityHeaders = {
accessKeyId: `${credentials.accessKeyId}`.trim(),
secretAccessKey: `${credentials.secretAccessKey}`.trim(),
sessionToken: credentials.temporaryCredentials
? `${credentials.sessionToken}`.trim()
: undefined,
};
sign(signOpts, securityHeaders);
const options: OptionsWithUri = {
headers: signOpts.headers,
method,
qs: query,
uri: endpoint.href,
body: signOpts.body,
};
body: JSON.stringify(body),
url: '',
headers,
//region: credentials?.region as string,
} as IHttpRequestOptions;
if (Object.keys(option).length !== 0) {
Object.assign(options, option);
Object.assign(requestOptions, option);
}
try {
return await this.helpers.request!(options);
return await this.helpers.requestWithAuthentication.call(this, 'aws', requestOptions);
} catch (error) {
throw new NodeApiError(this.getNode(), error as JsonObject);
}

39
packages/nodes-base/nodes/Aws/SES/GenericFunctions.ts
View File

@@ -13,7 +13,7 @@ import {
IWebhookFunctions,
} from 'n8n-core';
import { IDataObject, NodeApiError, NodeOperationError } from 'n8n-workflow';
import { IDataObject, IHttpRequestOptions, NodeApiError, NodeOperationError } from 'n8n-workflow';
import { get } from 'lodash';
@@ -28,35 +28,20 @@ export async function awsApiRequest(
): Promise<any> {
const credentials = await this.getCredentials('aws');
const endpoint = new URL(
(((credentials.sesEndpoint as string) || '').replace(
'{region}',
credentials.region as string,
) || `https://${service}.${credentials.region}.amazonaws.com`) + path,
);
// Sign AWS API request with the user credentials
const signOpts = { headers: headers || {}, host: endpoint.host, method, path, body } as Request;
const securityHeaders = {
accessKeyId: `${credentials.accessKeyId}`.trim(),
secretAccessKey: `${credentials.secretAccessKey}`.trim(),
sessionToken: credentials.temporaryCredentials
? `${credentials.sessionToken}`.trim()
: undefined,
};
sign(signOpts, securityHeaders);
const options: OptionsWithUri = {
headers: signOpts.headers,
const requestOptions = {
qs: {
service,
path,
},
method,
uri: endpoint.href,
body: signOpts.body as string,
};
body: JSON.stringify(body),
url: '',
headers,
region: credentials?.region as string,
} as IHttpRequestOptions;
try {
return await this.helpers.request!(options);
return await this.helpers.requestWithAuthentication.call(this,'aws', requestOptions);
} catch (error) {
throw new NodeApiError(this.getNode(), error, { parseXml: true });
}

1
packages/nodes-base/nodes/Aws/Textract/AwsTextract.node.ts
View File

@@ -38,7 +38,6 @@ export class AwsTextract implements INodeType {
{
name: 'aws',
required: true,
testedBy: 'awsTextractApiCredentialTest',
},
],
properties: [

33
packages/nodes-base/nodes/Aws/Textract/GenericFunctions.ts
View File

@@ -16,6 +16,7 @@ import {
import {
ICredentialDataDecryptedObject,
ICredentialTestFunctions,
IHttpRequestOptions,
NodeApiError,
NodeOperationError,
} from 'n8n-workflow';
@@ -46,30 +47,20 @@ export async function awsApiRequest(
): Promise<any> {
const credentials = await this.getCredentials('aws');
// Concatenate path and instantiate URL object so it parses correctly query strings
const endpoint = new URL(getEndpointForService(service, credentials) + path);
// Sign AWS API request with the user credentials
const signOpts = { headers: headers || {}, host: endpoint.host, method, path, body } as Request;
const securityHeaders = {
accessKeyId: `${credentials.accessKeyId}`.trim(),
secretAccessKey: `${credentials.secretAccessKey}`.trim(),
sessionToken: credentials.temporaryCredentials
? `${credentials.sessionToken}`.trim()
: undefined,
};
sign(signOpts, securityHeaders);
const options: OptionsWithUri = {
headers: signOpts.headers,
const requestOptions = {
qs: {
service,
path,
},
method,
uri: endpoint.href,
body: signOpts.body,
};
body,
url: '',
headers,
region: credentials?.region as string,
} as IHttpRequestOptions;
try {
return await this.helpers.request!(options);
return await this.helpers.requestWithAuthentication.call(this, 'aws', requestOptions);
} catch (error) {
if (error?.response?.data || error?.response?.body) {
const errorMessage = error?.response?.data || error?.response?.body;