New format google ads

packages/core/src/NodeExecuteFunctions.ts

@@ -58,7 +58,6 @@ import {
 	LoggerProxy as Logger,
 	IExecuteData,
 	OAuth2GrantType,
-	IOAuth2Credentials,
 } from 'n8n-workflow';
 
 import { Agent } from 'https';
@@ -78,6 +77,7 @@ import { fromBuffer } from 'file-type';
 import { lookup } from 'mime-types';
 
 import axios, {
+	AxiosError,
 	AxiosPromise,
 	AxiosProxyConfig,
 	AxiosRequestConfig,
@@ -731,6 +731,10 @@ function convertN8nRequestToAxios(n8nRequest: IHttpRequestOptions): AxiosRequest
 				axiosRequest.headers = axiosRequest.headers || {};
 				axiosRequest.headers['Content-Type'] = 'application/x-www-form-urlencoded';
 			}
+		} else if (
+			axiosRequest.headers[existingContentTypeHeaderKey] === 'application/x-www-form-urlencoded'
+		) {
+			axiosRequest.data = new URLSearchParams(n8nRequest.body as Record<string, string>);
 		}
 	}
 
@@ -761,6 +765,12 @@ async function httpRequest(
 	requestOptions: IHttpRequestOptions,
 ): Promise<IN8nHttpFullResponse | IN8nHttpResponse> {
 	const axiosRequest = convertN8nRequestToAxios(requestOptions);
+	if (
+		axiosRequest.data === undefined ||
+		(axiosRequest.method !== undefined && axiosRequest.method.toUpperCase() === 'GET')
+	) {
+		delete axiosRequest.data;
+	}
 	const result = await axios(axiosRequest);
 	if (requestOptions.returnFullResponse) {
 		return {
@@ -886,7 +896,7 @@ export async function requestOAuth2(
 	oAuth2Options?: IOAuth2Options,
 	isN8nRequest = false,
 ) {
-	const credentials = (await this.getCredentials(credentialsType)) as unknown as IOAuth2Credentials;
+	const credentials = await this.getCredentials(credentialsType);
 
 	// Only the OAuth2 with authorization code grant needs connection
 	if (
@@ -897,10 +907,10 @@ export async function requestOAuth2(
 	}
 
 	const oAuthClient = new clientOAuth2({
-		clientId: credentials.clientId,
-		clientSecret: credentials.clientSecret,
-		accessTokenUri: credentials.accessTokenUrl,
-		scopes: credentials.scope.split(' '),
+		clientId: credentials.clientId as string,
+		clientSecret: credentials.clientSecret as string,
+		accessTokenUri: credentials.accessTokenUrl as string,
+		scopes: (credentials.scope as string).split(' '),
 	});
 
 	let oauthTokenData = credentials.oauthTokenData as clientOAuth2.Data;
@@ -936,15 +946,53 @@ export async function requestOAuth2(
 	// Signs the request by adding authorization headers or query parameters depending
 	// on the token-type used.
 	const newRequestOptions = token.sign(requestOptions as clientOAuth2.RequestObject);
-
 	// If keep bearer is false remove the it from the authorization header
 	if (oAuth2Options?.keepBearer === false) {
 		// @ts-ignore
 		newRequestOptions?.headers?.Authorization =
 			// @ts-ignore
 			newRequestOptions?.headers?.Authorization.split(' ')[1];
 	}
-
+	if (isN8nRequest) {
+		return this.helpers.httpRequest(newRequestOptions).catch(async (error: AxiosError) => {
+			if (error.response?.status === 401) {
+				Logger.debug(
+					`OAuth2 token for "${credentialsType}" used by node "${node.name}" expired. Should revalidate.`,
+				);
+				const tokenRefreshOptions: IDataObject = {};
+				if (oAuth2Options?.includeCredentialsOnRefreshOnBody) {
+					const body: IDataObject = {
+						client_id: credentials.clientId as string,
+						client_secret: credentials.clientSecret as string,
+					};
+					tokenRefreshOptions.body = body;
+					tokenRefreshOptions.headers = {
+						Authorization: '',
+					};
+				}
+				const newToken = await token.refresh(tokenRefreshOptions);
+				Logger.debug(
+					`OAuth2 token for "${credentialsType}" used by node "${node.name}" has been renewed.`,
+				);
+				credentials.oauthTokenData = newToken.data;
+				// Find the credentials
+				if (!node.credentials || !node.credentials[credentialsType]) {
+					throw new Error(
+						`The node "${node.name}" does not have credentials of type "${credentialsType}"!`,
+					);
+				}
+				const nodeCredentials = node.credentials[credentialsType];
+				await additionalData.credentialsHelper.updateCredentials(
+					nodeCredentials,
+					credentialsType,
+					credentials,
+				);
+				const refreshedRequestOption = newToken.sign(requestOptions as clientOAuth2.RequestObject);
+				return this.helpers.httpRequest(refreshedRequestOption);
+			}
+			throw error;
+		});
+	}
 	return this.helpers.request!(newRequestOptions).catch(async (error: IResponseError) => {
 		const statusCodeReturned =
 			oAuth2Options?.tokenExpiredStatusCode === undefined
@@ -1081,7 +1129,6 @@ export async function requestOAuth1(
 
 	// @ts-ignore
 	requestOptions.headers = oauth.toHeader(oauth.authorize(requestOptions, token));
-
 	if (isN8nRequest) {
 		return this.helpers.httpRequest(requestOptions as IHttpRequestOptions);
 	}
@@ -1103,7 +1150,6 @@ export async function httpRequestWithAuthentication(
 ) {
 	try {
 		const parentTypes = additionalData.credentialsHelper.getParentTypes(credentialsType);
-
 		if (parentTypes.includes('oAuth1Api')) {
 			return await requestOAuth1.call(this, credentialsType, requestOptions, true);
 		}
@@ -1141,7 +1187,6 @@ export async function httpRequestWithAuthentication(
 			node,
 			additionalData.timezone,
 		);
-
 		return await httpRequest(requestOptions);
 	} catch (error) {
 		throw new NodeApiError(this.getNode(), error);

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

@@ -0,0 +1,32 @@
+import {
+	ICredentialType,
+	INodeProperties,
+} from 'n8n-workflow';
+
+const scopes = [
+	'https://www.googleapis.com/auth/adwords',
+];
+
+export class GoogleAdsOAuth2Api implements ICredentialType {
+	name = 'googleAdsOAuth2Api';
+	extends = [
+		'googleOAuth2Api',
+	];
+	displayName = 'Google Ads OAuth2 API';
+	documentationUrl = 'google';
+	properties: INodeProperties[] = [
+		{
+			displayName: 'Developer Token',
+			name: 'developerToken',
+			type: 'string',
+			default: '',
+		},
+		{
+			displayName: 'Scope',
+			name: 'scope',
+			type: 'hidden',
+			default: scopes.join(' '),
+		},
+	];
+
+}