n8n-nodes-gmail-custom 0.1.7 → 0.1.8

package/nodes/GmailCustom/GmailCustom.node.js

@@ -1,5 +1,8 @@
 const crypto = require('crypto');
 
+let jwtLib;
+try { jwtLib = require('jsonwebtoken'); } catch (e) {}
+
 const TOKEN_CACHE = {};
 
 function formatPrivateKey(privateKey) {
@@ -357,30 +360,54 @@ class GmailCustom {
 				if (!accessToken || Date.now() >= expiresAt) {
 					const privateKey = formatPrivateKey(credentials.privateKey);
 					const now = Math.floor(Date.now() / 1000);
-					const header = { alg: 'RS256', typ: 'JWT', kid: privateKey };
-					const payload = {
-						iss: credentials.email,
-						scope: 'https://mail.google.com/',
-						aud: 'https://oauth2.googleapis.com/token',
-						exp: now + 3600,
-						iat: now,
-						sub: fromEmail,
-					};
 
-					const signatureInput = base64UrlEncode(JSON.stringify(header)) + '.' + base64UrlEncode(JSON.stringify(payload));
-					const signer = crypto.createSign('RSA-SHA256');
-					signer.update(signatureInput);
-					const sig = signer.sign(privateKey);
-					const jwt = signatureInput + '.' + base64urlEscape(sig.toString('base64'));
+					let jwt;
+					if (jwtLib) {
+						jwt = jwtLib.sign(
+							{
+								iss: credentials.email,
+								scope: 'https://mail.google.com/',
+								aud: 'https://oauth2.googleapis.com/token',
+								exp: now + 3600,
+								iat: now,
+								sub: fromEmail,
+							},
+							privateKey,
+							{
+								algorithm: 'RS256',
+								header: {
+									kid: privateKey,
+									typ: 'JWT',
+									alg: 'RS256',
+								},
+							},
+						);
+					} else {
+						const header = { alg: 'RS256', typ: 'JWT', kid: privateKey };
+						const payload = {
+							iss: credentials.email,
+							scope: 'https://mail.google.com/',
+							aud: 'https://oauth2.googleapis.com/token',
+							exp: now + 3600,
+							iat: now,
+							sub: fromEmail,
+						};
+						const signatureInput = base64UrlEncode(JSON.stringify(header)) + '.' + base64UrlEncode(JSON.stringify(payload));
+						const signer = crypto.createSign('RSA-SHA256');
+						signer.update(signatureInput);
+						const sig = signer.sign(privateKey);
+						jwt = signatureInput + '.' + base64urlEscape(sig.toString('base64'));
+					}
 
-					const response = await this.helpers.httpRequest({
+					const response = await this.helpers.request({
 						method: 'POST',
-						url: 'https://oauth2.googleapis.com/token',
+						uri: 'https://oauth2.googleapis.com/token',
 						headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-						body: new URLSearchParams({
+						form: {
 							grant_type: 'urn:ietf:params:oauth:grant-type:jwt-bearer',
 							assertion: jwt,
-						}).toString(),
+						},
+						json: true,
 					});
 
 					accessToken = response.access_token;

package/package.json

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