mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2024-12-25 04:34:06 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(Mautic Node): Fix authentication issue (#3761)

Browse source 
* Fixes mautic credential issue

* removed unused imports

Co-authored-by: Jan Oberhauser <jan.oberhauser@gmail.com>
This commit is contained in:
Jonathan Bennetts 2022-07-24 17:10:26 +01:00 committed by GitHub
parent 15d8ffd3ba
commit fe58769b48
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
packages/nodes-base/credentials/MauticApi.credentials.ts
View file

@ -1,8 +1,7 @@
import {
ICredentialDataDecryptedObject,
IAuthenticateGeneric,
ICredentialTestRequest,
ICredentialType,
IHttpRequestOptions,
INodeProperties,
} from 'n8n-workflow';
@ -34,22 +33,16 @@ export class MauticApi implements ICredentialType {
default: '',
},
];
async authenticate(
credentials: ICredentialDataDecryptedObject,
requestOptions: IHttpRequestOptions,
): Promise<IHttpRequestOptions> {
const { url, username, password } = credentials as {
url: string;
username: string;
password: string;
};
const credentialUrl = url.endsWith('/') ? `${url}api/users/self` : `${url}/api/users/self`;
const base64Key = Buffer.from(`${username}:${password}`).toString('base64');
requestOptions.headers!['Authorization'] = `Basic ${base64Key}`;
requestOptions.url = credentialUrl ? credentialUrl : requestOptions.url;
return requestOptions;
}
authenticate: IAuthenticateGeneric = {
type: 'generic',
properties: {
auth: {
username: '={{$credentials.username}}',
password: '={{$credentials.password}}',
},
},
};
test: ICredentialTestRequest = {
request: {

6
packages/nodes-base/nodes/Mautic/GenericFunctions.ts
View file

@ -29,8 +29,12 @@ export async function mauticApiRequest(this: IHookFunctions | IExecuteFunctions
let returnData;
if (authenticationMethod === 'credentials') {
const credentials = await this.getCredentials('mauticApi');
const baseUrl = credentials.url as string;
options.uri = `${baseUrl.endsWith('/') ? baseUrl.slice(0, -1) : baseUrl}${options.uri}`;
//@ts-ignore
returnData = await this.helpers.httpRequestWithAuthentication.call(this, 'mauticApi', options);
returnData = await this.helpers.requestWithAuthentication.call(this, 'mauticApi', options);
} else {
const credentials = await this.getCredentials('mauticOAuth2Api');
const baseUrl = credentials.url as string;