n8n-io/n8n
1
1
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2024-10-08 02:28:57 +03:00
Code Issues Projects Releases Wiki Activity

fix(wufooTrigger Node): fix form names not being listed correctly (#4151)

Browse Source
This commit is contained in:
Jonathan Bennetts 2022-09-30 12:18:14 +01:00 committed by GitHub
parent 764bd3522b
commit 616d62aa8e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
packages/nodes-base/credentials/WufooApi.credentials.ts
View File

@ -1,4 +1,9 @@
import { ICredentialType, INodeProperties } from 'n8n-workflow';
import {
IAuthenticateGeneric,
ICredentialTestRequest,
ICredentialType,
INodeProperties,
} from 'n8n-workflow';
export class WufooApi implements ICredentialType {
name = 'wufooApi';
@ -18,4 +23,21 @@ export class WufooApi implements ICredentialType {
default: '',
},
];
authenticate: IAuthenticateGeneric = {
type: 'generic',
properties: {
auth: {
username: '={{$credentials.apiKey}}',
password: 'not-needed',
},
},
};
test: ICredentialTestRequest = {
request: {
baseURL: '=https://{{$credentials.subdomain}}.wufoo.com',
url: '/api/v3/forms.json',
},
};
}

10
packages/nodes-base/nodes/Wufoo/GenericFunctions.ts
View File

@ -7,7 +7,7 @@ import {
ILoadOptionsFunctions,
} from 'n8n-core';
import { IDataObject, NodeApiError, NodeOperationError } from 'n8n-workflow';
import { IDataObject, JsonObject, NodeApiError } from 'n8n-workflow';
export async function wufooApiRequest(
this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
@ -23,10 +23,6 @@ export async function wufooApiRequest(
const credentials = await this.getCredentials('wufooApi');
let options: OptionsWithUri = {
auth: {
username: credentials!.apiKey as string,
password: '',
},
method,
form: body,
body,
@ -41,8 +37,8 @@ export async function wufooApiRequest(
}
try {
return await this.helpers.request!(options);
return await this.helpers.requestWithAuthentication.call(this, 'wufooApi', options);
} catch (error) {
throw new NodeApiError(this.getNode(), error);
throw new NodeApiError(this.getNode(), error as JsonObject);
}
}

6
packages/nodes-base/nodes/Wufoo/WufooTrigger.node.ts
View File

@ -11,7 +11,7 @@ import {
import { wufooApiRequest } from './GenericFunctions';
import { IField, IFormQuery, IWebhook } from './Interface';
import { IField, IWebhook } from './Interface';
import { randomBytes } from 'crypto';
@ -70,9 +70,9 @@ export class WufooTrigger implements INodeType {
loadOptions: {
async getForms(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
const returnData: INodePropertyOptions[] = [];
const body: IFormQuery = { includeTodayCount: true };
// https://wufoo.github.io/docs/#all-forms
const formObject = await wufooApiRequest.call(this, 'GET', 'forms.json', body);
const formObject = await wufooApiRequest.call(this, 'GET', 'forms.json');
for (const form of formObject.Forms) {
const name = form.Name;
const value = form.Hash;