From 725b3eb408d4d01bb8eb099cc6a0b6907354e372 Mon Sep 17 00:00:00 2001
From: Ricardo Espinoza <ricardo@n8n.io>
Date: Sun, 28 Feb 2021 11:27:52 -0500
Subject: [PATCH] :bug:  Add the right scopes to Gmail service account
 authentication. (#1481)

* fix: request gmail scope instead of books

* :zap: Small improvement to #1427

* :zap: Add svg logo

Co-authored-by: Josh <jojo.parillon@gmail.com>
---
 .../nodes/Google/Gmail/GenericFunctions.ts       |   7 ++++++-
 .../nodes-base/nodes/Google/Gmail/Gmail.node.ts  |   4 ++--
 packages/nodes-base/nodes/Google/Gmail/gmail.png | Bin 1954 -> 0 bytes
 packages/nodes-base/nodes/Google/Gmail/gmail.svg |  10 ++++++++++
 4 files changed, 18 insertions(+), 3 deletions(-)
 delete mode 100644 packages/nodes-base/nodes/Google/Gmail/gmail.png
 create mode 100644 packages/nodes-base/nodes/Google/Gmail/gmail.svg

diff --git a/packages/nodes-base/nodes/Google/Gmail/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Gmail/GenericFunctions.ts
index 3dc2eabe92..8cc738cf8e 100644
--- a/packages/nodes-base/nodes/Google/Gmail/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Gmail/GenericFunctions.ts
@@ -216,7 +216,12 @@ function getAccessToken(this: IExecuteFunctions | IExecuteSingleFunctions | ILoa
 	//https://developers.google.com/identity/protocols/oauth2/service-account#httprest
 
 	const scopes = [
-		'https://www.googleapis.com/auth/books',
+		'https://www.googleapis.com/auth/gmail.labels',
+		'https://www.googleapis.com/auth/gmail.addons.current.action.compose',
+		'https://www.googleapis.com/auth/gmail.addons.current.message.action',
+		'https://mail.google.com/',
+		'https://www.googleapis.com/auth/gmail.modify',
+		'https://www.googleapis.com/auth/gmail.compose',
 	];
 
 	const now = moment().unix();
diff --git a/packages/nodes-base/nodes/Google/Gmail/Gmail.node.ts b/packages/nodes-base/nodes/Google/Gmail/Gmail.node.ts
index 5601c259c5..158c0de9b0 100644
--- a/packages/nodes-base/nodes/Google/Gmail/Gmail.node.ts
+++ b/packages/nodes-base/nodes/Google/Gmail/Gmail.node.ts
@@ -66,14 +66,14 @@ export class Gmail implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Gmail',
 		name: 'gmail',
-		icon: 'file:gmail.png',
+		icon: 'file:gmail.svg',
 		group: ['transform'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
 		description: 'Consume the Gmail API',
 		defaults: {
 			name: 'Gmail',
-			color: '#d93025',
+			color: '#4285F4',
 		},
 		inputs: ['main'],
 		outputs: ['main'],
diff --git a/packages/nodes-base/nodes/Google/Gmail/gmail.png b/packages/nodes-base/nodes/Google/Gmail/gmail.png
deleted file mode 100644
index 17210480702b3738f3d864c188c8df41be830b05..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1954
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

diff --git a/packages/nodes-base/nodes/Google/Gmail/gmail.svg b/packages/nodes-base/nodes/Google/Gmail/gmail.svg
new file mode 100644
index 0000000000..7f6de6b2e9
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Gmail/gmail.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="256px" height="193px" viewBox="0 0 256 193" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" preserveAspectRatio="xMidYMid">
+    <g>
+        <path d="M58.1818182,192.049515 L58.1818182,93.1404244 L27.5066233,65.0770089 L0,49.5040608 L0,174.59497 C0,184.253152 7.82545455,192.049515 17.4545455,192.049515 L58.1818182,192.049515 Z" fill="#4285F4"></path>
+        <path d="M197.818182,192.049515 L238.545455,192.049515 C248.203636,192.049515 256,184.224061 256,174.59497 L256,49.5040608 L224.844415,67.3422767 L197.818182,93.1404244 L197.818182,192.049515 Z" fill="#34A853"></path>
+        <polygon fill="#EA4335" points="58.1818182 93.1404244 54.0077618 54.4932827 58.1818182 17.5040608 128 69.8676972 197.818182 17.5040608 202.487488 52.4960089 197.818182 93.1404244 128 145.504061"></polygon>
+        <path d="M197.818182,17.5040608 L197.818182,93.1404244 L256,49.5040608 L256,26.2313335 C256,4.64587897 231.36,-7.65957557 214.109091,5.28587897 L197.818182,17.5040608 Z" fill="#FBBC04"></path>
+        <path d="M0,49.5040608 L26.7588051,69.5731646 L58.1818182,93.1404244 L58.1818182,17.5040608 L41.8909091,5.28587897 C24.6109091,-7.65957557 0,4.64587897 0,26.2313335 L0,49.5040608 Z" fill="#C5221F"></path>
+    </g>
+</svg>
\ No newline at end of file