⚡ Improvements to Mailchimp-Node

packages/nodes-base/credentials/MailchimpOAuth2Api.credentials.ts

@@ -11,20 +11,6 @@ export class MailchimpOAuth2Api implements ICredentialType {
 	];
 	displayName = 'Mailchimp OAuth2 API';
 	properties = [
-		{
-			displayName: 'Mailchimp Server',
-			name: 'server',
-			type: 'string' as NodePropertyTypes,
-			default: 'https://login.mailchimp.com/',
-			description: 'The server to connect to.',
-		},
-		{
-			displayName: 'Datacenter',
-			name: 'dataCenter',
-			type: 'string' as NodePropertyTypes,
-			default: 'us10',
-			description: 'Datacenter that your Mailchimp application is hosted on. Found in the URL of your Mailchimp dashboard.',
-		},
 		{
 			displayName: 'Authorization URL',
 			name: 'authUrl',

packages/nodes-base/nodes/Mailchimp/GenericFunctions.ts

@@ -34,33 +34,34 @@ export async function mailchimpApiRequest(this: IHookFunctions | IExecuteFunctio
 	}
 
 	try {
-		if (authenticationMethod === 'accessToken') {
+		if (authenticationMethod === 'apiKey') {
 			const credentials = this.getCredentials('mailchimpApi');
-	
+
 			if (credentials === undefined) {
 				throw new Error('No credentials got returned!');
 			}
-	
+
 			options.headers = Object.assign({}, headers, { Authorization: `apikey ${credentials.apiKey}` });
-	
+
 			if (!(credentials.apiKey as string).includes('-')) {
 				throw new Error('The API key is not valid!');
 			}
-	
+
 			const datacenter = (credentials.apiKey as string).split('-').pop();
 			options.url = `https://${datacenter}.${host}${endpoint}`;
-			
+
 			return await this.helpers.request!(options);
 		} else {
-			const credentials = this.getCredentials('mailchimpOAuth2Api');
-			const datacenter = credentials!.dataCenter;
-	
-			options.url = `https://${datacenter}.${host}${endpoint}`;
+			const credentials = this.getCredentials('mailchimpOAuth2Api') as IDataObject;
+
+			const { api_endpoint } = await getMetadata.call(this, credentials.oauthTokenData as IDataObject);
+
+			options.url = `${api_endpoint}/3.0${endpoint}`;
 			//@ts-ignore
-			return await this.helpers.requestOAuth2!.call(this, 'mailchimpOAuth2Api', options, 'bearer');
+			return await this.helpers.requestOAuth2!.call(this, 'mailchimpOAuth2Api', options, 'Bearer');
 		}
 	} catch (error) {
-		if (error.response.body && error.response.body.detail) {
+		if (error.respose && error.response.body && error.response.body.detail) {
 			throw new Error(`Mailchimp Error response [${error.statusCode}]: ${error.response.body.detail}`);
 		}
 		throw error;
@@ -96,3 +97,17 @@ export function validateJSON(json: string | undefined): any { // tslint:disable-
 	}
 	return result;
 }
+
+function getMetadata(this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, oauthTokenData: IDataObject) {
+	const credentials = this.getCredentials('mailchimpOAuth2Api') as IDataObject;
+	const options: OptionsWithUrl = {
+		headers: {
+			'Accept': 'application/json',
+			'Authorization': `OAuth ${oauthTokenData.access_token}`,
+		},
+		method: 'GET',
+		url: credentials.metadataUrl as string,
+		json: true,
+	};
+	return this.helpers.request!(options);
+}

packages/nodes-base/nodes/Mailchimp/Mailchimp.node.ts

@@ -72,7 +72,7 @@ export class Mailchimp implements INodeType {
 				displayOptions: {
 					show: {
 						authentication: [
-							'accessToken',
+							'apiKey',
 						],
 					},
 				},
@@ -96,15 +96,15 @@ export class Mailchimp implements INodeType {
 				type: 'options',
 				options: [
 					{
-						name: 'Access Token',
-						value: 'accessToken',
+						name: 'API Key',
+						value: 'apiKey',
 					},
 					{
 						name: 'OAuth2',
 						value: 'oAuth2',
 					},
 				],
-				default: 'accessToken',
+				default: 'apiKey',
 				description: 'Method of authentication.',
 			},
 			{
@@ -1571,7 +1571,7 @@ export class Mailchimp implements INodeType {
 					responseData = { success: true };
 				}
 			}
-			
+
 			if (Array.isArray(responseData)) {
 				returnData.push.apply(returnData, responseData as IDataObject[]);
 			} else {

packages/nodes-base/nodes/Mailchimp/MailchimpTrigger.node.ts

@@ -36,7 +36,7 @@ export class MailchimpTrigger implements INodeType {
 				displayOptions: {
 					show: {
 						authentication: [
-							'accessToken',
+							'apiKey',
 						],
 					},
 				},
@@ -74,15 +74,15 @@ export class MailchimpTrigger implements INodeType {
 				type: 'options',
 				options: [
 					{
-						name: 'Access Token',
-						value: 'accessToken',
+						name: 'API Key',
+						value: 'apiKey',
 					},
 					{
 						name: 'OAuth2',
 						value: 'oAuth2',
 					},
 				],
-				default: 'accessToken',
+				default: 'apiKey',
 				description: 'Method of authentication.',
 			},
 			{