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

feat: Updated multiple credentials with tests and allow to be used on HTTP Request Node (#3670)

Browse Source 
* Notion cred updated

* Airtable new cred

* revamped twilio cred

* urlscanlo revamp cred

* Wordpress revamp cred with testing

* SendGrid cred revamped

* 🐛 Fix imports

* 🐛  Fixes imports in urlscanio

* Fix airtable cred injection

* Fixes notion request, changes way of cred injection

* Change auth type from method to generic

* Fix minor issues

* Fix lint issue

Co-authored-by: Omar Ajoue <krynble@gmail.com>
This commit is contained in:
agobrech
2022-07-10 12:32:19 +02:00
committed by GitHub
parent ece1836c45
commit d5d4dd3845
12 changed files with 78 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
packages/nodes-base/nodes/Airtable/GenericFunctions.ts
View File

@@ -1,7 +1,6 @@
import {
IExecuteFunctions,
IHookFunctions,
ILoadOptionsFunctions,
IPollFunctions,
} from 'n8n-core';
import {
@@ -11,10 +10,9 @@ import {
import {
IBinaryKeyData,
IDataObject,
ILoadOptionsFunctions,
INodeExecutionData,
IPollFunctions,
NodeApiError,
NodeOperationError,
} from 'n8n-workflow';
@@ -39,7 +37,7 @@ export interface IRecord {
* @param {object} body
* @returns {Promise<any>}
*/
export async function apiRequest(this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IPollFunctions, method: string, endpoint: string, body: object, query?: IDataObject, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
export async function apiRequest(this: IExecuteFunctions | ILoadOptionsFunctions | IPollFunctions, method: string, endpoint: string, body: object, query?: IDataObject, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
const credentials = await this.getCredentials('airtableApi');
query = query || {};
@@ -47,7 +45,7 @@ export async function apiRequest(this: IHookFunctions | IExecuteFunctions | ILoa
// For some reason for some endpoints the bearer auth does not work
// and it returns 404 like for the /meta request. So we always send
// it as query string.
query.api_key = credentials.apiKey;
// query.api_key = credentials.apiKey;
const options: OptionsWithUri = {
headers: {
@@ -69,7 +67,7 @@ export async function apiRequest(this: IHookFunctions | IExecuteFunctions | ILoa
}
try {
return await this.helpers.request!(options);
return await this.helpers.requestWithAuthentication.call(this, 'airtableApi', options);
} catch (error) {
throw new NodeApiError(this.getNode(), error);
}
@@ -81,14 +79,14 @@ export async function apiRequest(this: IHookFunctions | IExecuteFunctions | ILoa
* and return all results
*
* @export
* @param {(IHookFunctions | IExecuteFunctions)} this
* @param {(IExecuteFunctions | IExecuteFunctions)} this
* @param {string} method
* @param {string} endpoint
* @param {IDataObject} body
* @param {IDataObject} [query]
* @returns {Promise<any>}
*/
export async function apiRequestAllItems(this: IHookFunctions | IExecuteFunctions | IPollFunctions, method: string, endpoint: string, body: IDataObject, query?: IDataObject): Promise<any> { // tslint:disable-line:no-any
export async function apiRequestAllItems(this: IExecuteFunctions | ILoadOptionsFunctions | IPollFunctions, method: string, endpoint: string, body: IDataObject, query?: IDataObject): Promise<any> { // tslint:disable-line:no-any
if (query === undefined) {
query = {};