n8n-nodes-gmail-custom 0.2.0 → 0.3.0

package/nodes/GmailCustom/GmailCustom.node.js

@@ -161,19 +161,19 @@ async function buildMimeMessage(options) {
 		.replace(/=+$/, '');
 }
 
-async function getOrRefreshAccessToken(ctx, credentials, fromEmail) {
-	const cacheKey = `${credentials.email}:${fromEmail}`;
+async function getOrRefreshAccessToken(ctx, serviceAccountEmail, privateKeyRaw, fromEmail) {
+	const cacheKey = `${serviceAccountEmail}:${fromEmail}`;
 	let token = TOKEN_CACHE[cacheKey];
 	if (token && token.expiresAt > Date.now()) {
 		return token.accessToken;
 	}
 
-	const privateKey = formatPrivateKey(credentials.privateKey);
+	const privateKey = formatPrivateKey(privateKeyRaw);
 	const now = Math.floor(Date.now() / 1000);
 
 	let jwt;
 	const payload = {
-		iss: credentials.email,
+		iss: serviceAccountEmail,
 		scope: 'https://mail.google.com/',
 		aud: 'https://oauth2.googleapis.com/token',
 		exp: now + 3600,
@@ -223,20 +223,32 @@ class GmailCustom {
 			group: ['output'],
 			version: 1,
 			subtitle: '={{$parameter["subject"] || "Send Email"}}',
-			description: 'Send email via Gmail API with token caching and 429 retry',
+			description: 'Send email via Gmail API with token caching for service accounts',
 			defaults: {
 				name: 'Gmail Custom',
 				color: '#1a73e8',
 			},
 			inputs: ['main'],
 			outputs: ['main'],
-			credentials: [
+			properties: [
 				{
-					name: 'googleApi',
+					displayName: 'Service Account Email',
+					name: 'serviceAccountEmail',
+					type: 'string',
+					default: '',
 					required: true,
+					placeholder: 'sa-name@project.iam.gserviceaccount.com',
+					description: 'The service account client_email (issuer for JWT)',
+				},
+				{
+					displayName: 'Private Key',
+					name: 'privateKey',
+					type: 'string',
+					typeOptions: { password: true },
+					default: '',
+					required: true,
+					description: 'The service account RSA private key in PEM format',
 				},
-			],
-			properties: [
 				{
 					displayName: 'From Email',
 					name: 'fromEmail',
@@ -344,11 +356,12 @@ class GmailCustom {
 							description: 'The email address that the reply message is sent to',
 						},
 						{
-							displayName: 'Append n8n Attribution',
-							name: 'appendAttribution',
-							type: 'boolean',
-							default: true,
-							description: 'Whether to include the phrase "This email was sent automatically with n8n" to the end of the email',
+							displayName: 'Sender Name',
+							name: 'senderName',
+							type: 'string',
+							default: '',
+							placeholder: 'e.g. John Doe',
+							description: 'Name shown as the sender in recipients\' inboxes',
 						},
 					],
 				},
@@ -367,6 +380,8 @@ class GmailCustom {
 		for (let i = 0; i < items.length; i++) {
 			try {
 				const item = items[i];
+				const serviceAccountEmail = this.getNodeParameter('serviceAccountEmail', i, '');
+				const privateKey = this.getNodeParameter('privateKey', i, '');
 				const fromEmail = this.getNodeParameter('fromEmail', i, '');
 				const sendTo = this.getNodeParameter('sendTo', i, '');
 				const subject = this.getNodeParameter('subject', i, '');
@@ -382,7 +397,12 @@ class GmailCustom {
 				let cc = options.ccList || '';
 				let bcc = options.bccList || '';
 				let replyTo = options.replyTo || '';
-				const appendAttribution = options.appendAttribution === undefined ? true : options.appendAttribution;
+				const senderName = options.senderName || '';
+
+				let fromHeader = fromEmail;
+				if (senderName) {
+					fromHeader = `${senderName} <${fromEmail}>`;
+				}
 
 				let bodyText = message;
 				let bodyHtml = '';
@@ -395,16 +415,7 @@ class GmailCustom {
 					bodyText = message;
 				}
 
-				if (appendAttribution) {
-					if (emailType === 'html') {
-						bodyHtml += '<br><br>---<br><em>This email was sent automatically with n8n</em>';
-					} else {
-						bodyText += '\n\n---\nThis email was sent automatically with n8n';
-					}
-				}
-
-				const credentials = await this.getCredentials('googleApi');
-				const accessToken = await getOrRefreshAccessToken(this, credentials, fromEmail);
+				const accessToken = await getOrRefreshAccessToken(this, serviceAccountEmail, privateKey, fromEmail);
 
 				let attachments = [];
 				if (options.attachmentsUi && options.attachmentsUi.attachmentsBinary) {
@@ -430,7 +441,7 @@ class GmailCustom {
 				}
 
 				const base64UrlMessage = await buildMimeMessage({
-					from: fromEmail,
+					from: fromHeader,
 					to: sendTo,
 					cc,
 					bcc,
@@ -441,40 +452,20 @@ class GmailCustom {
 					attachments,
 				});
 
-				const maxRetries = 4;
-				let lastError;
-
-				for (let attempt = 0; attempt <= maxRetries; attempt++) {
-					try {
-						const sendResponse = await this.helpers.httpRequest({
-							method: 'POST',
-							url: 'https://gmail.googleapis.com/gmail/v1/users/me/messages/send',
-							headers: {
-								Authorization: `Bearer ${accessToken}`,
-								'Content-Type': 'application/json',
-							},
-							body: { raw: base64UrlMessage },
-						});
-
-						returnData.push({
-							json: sendResponse,
-							pairedItem: { item: i },
-						});
-						lastError = null;
-						break;
-					} catch (error) {
-						lastError = error;
-						const statusCode = error.statusCode || error.response?.statusCode;
-						if (statusCode === 429 && attempt < maxRetries) {
-							const delay = Math.min(Math.pow(2, attempt) * 1000 + Math.random() * 1000, 30000);
-							await new Promise(resolve => setTimeout(resolve, delay));
-							continue;
-						}
-						throw error;
-					}
-				}
+				const sendResponse = await this.helpers.httpRequest({
+						method: 'POST',
+						url: 'https://gmail.googleapis.com/gmail/v1/users/me/messages/send',
+						headers: {
+							Authorization: `Bearer ${accessToken}`,
+							'Content-Type': 'application/json',
+						},
+						body: { raw: base64UrlMessage },
+					});
 
-				if (lastError) throw lastError;
+					returnData.push({
+						json: sendResponse,
+						pairedItem: { item: i },
+					});
 
 			} catch (error) {
 				let continueOnFail = false;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "n8n-nodes-gmail-custom",
-	"version": "0.2.0",
+	"version": "0.3.0",
 	"description": "Custom Gmail node for n8n with token caching and 429 retry",
 	"keywords": [
 		"n8n-community-node-package",