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

🎨 Centralize error throwing for encryption keys and credentials (#3105)

Browse Source 
* Centralized error throwing for encryption key

* Unifying the error message used by cli and core packages

* Improvements to error messages to make it more DRY

* Removed unnecessary throw

* Throwing error when credential does not exist to simplify node behavior (#3112)

Co-authored-by: Iván Ovejero <ivov.src@gmail.com>
This commit is contained in:
Omar Ajoue
2022-04-15 08:00:47 +02:00
committed by GitHub
parent 17b0cd8f76
commit d3fecb9f6d
227 changed files with 348 additions and 848 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/nodes-base/nodes/Mailchimp/GenericFunctions.ts
View File

@@ -37,10 +37,6 @@ export async function mailchimpApiRequest(this: IHookFunctions | IExecuteFunctio
if (authenticationMethod === 'apiKey') {
const credentials = await this.getCredentials('mailchimpApi');
if (credentials === undefined) {
throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
}
options.headers = Object.assign({}, headers, { Authorization: `apikey ${credentials.apiKey}` });
if (!(credentials.apiKey as string).includes('-')) {
@@ -52,7 +48,7 @@ export async function mailchimpApiRequest(this: IHookFunctions | IExecuteFunctio
return await this.helpers.request!(options);
} else {
const credentials = await this.getCredentials('mailchimpOAuth2Api') as IDataObject;
const credentials = await this.getCredentials('mailchimpOAuth2Api');
const { api_endpoint } = await getMetadata.call(this, credentials.oauthTokenData as IDataObject);
@@ -96,7 +92,7 @@ export function validateJSON(json: string | undefined): any { // tslint:disable-
}
async function getMetadata(this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, oauthTokenData: IDataObject) {
const credentials = await this.getCredentials('mailchimpOAuth2Api') as IDataObject;
const credentials = await this.getCredentials('mailchimpOAuth2Api');
const options: OptionsWithUrl = {
headers: {
'Accept': 'application/json',