From ca6f8d085a81ce62bf18b7bb6ee9b5811f836e16 Mon Sep 17 00:00:00 2001 From: Gazook89 <58999374+Gazook89@users.noreply.github.com> Date: Tue, 29 Nov 2022 12:57:27 -0600 Subject: [PATCH 1/3] changing messaging about googleActions --- server/googleActions.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/server/googleActions.js b/server/googleActions.js index 0417fff43..56f449cfd 100644 --- a/server/googleActions.js +++ b/server/googleActions.js @@ -15,8 +15,12 @@ try { 'https://www.googleapis.com/auth/drive' ]; } catch (err) { - console.warn(err); - console.log('Please make sure that a Google Service Account is set up properly in your config files.'); + if(!keys){ + console.log('No Google Service Account in config files - Google Drive functionality will not function.'); + } else { + console.warn(err); + console.log('Please make sure that a Google Service Account is set up properly in your config files.'); + } } google.options({ auth: serviceAuth || config.get('google_api_key') }); From 0a5bfe293921607192a2856d4fcc7b4aefca1f61 Mon Sep 17 00:00:00 2001 From: Gazook89 <58999374+Gazook89@users.noreply.github.com> Date: Thu, 1 Dec 2022 19:51:36 -0600 Subject: [PATCH 2/3] check if `keys` exist before trying for auth. --- server/googleActions.js | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/server/googleActions.js b/server/googleActions.js index 56f449cfd..b29110d8d 100644 --- a/server/googleActions.js +++ b/server/googleActions.js @@ -5,23 +5,25 @@ const { nanoid } = require('nanoid'); const token = require('./token.js'); const config = require('./config.js'); -const keys = typeof(config.get('service_account')) == 'string' ? - JSON.parse(config.get('service_account')) : - config.get('service_account'); let serviceAuth; -try { - serviceAuth = google.auth.fromJSON(keys); - serviceAuth.scopes = [ - 'https://www.googleapis.com/auth/drive' - ]; -} catch (err) { - if(!keys){ - console.log('No Google Service Account in config files - Google Drive functionality will not function.'); - } else { +if(!config.get('service_account')){ + console.log('No Google Service Account in config files - Google Drive functionality will not function.'); +} else { + const keys = typeof(config.get('service_account')) == 'string' ? + JSON.parse(config.get('service_account')) : + config.get('service_account'); + + try { + serviceAuth = google.auth.fromJSON(keys); + serviceAuth.scopes = [ + 'https://www.googleapis.com/auth/drive' + ]; + } catch (err) { console.warn(err); console.log('Please make sure that a Google Service Account is set up properly in your config files.'); } } + google.options({ auth: serviceAuth || config.get('google_api_key') }); const GoogleActions = { From 24477327aacb4ca1ee26ea9ea904591c7ce39209 Mon Sep 17 00:00:00 2001 From: Trevor Buckner Date: Fri, 2 Dec 2022 21:28:57 -0500 Subject: [PATCH 3/3] message tweaks --- server/googleActions.js | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/server/googleActions.js b/server/googleActions.js index b29110d8d..3b2c360b3 100644 --- a/server/googleActions.js +++ b/server/googleActions.js @@ -7,7 +7,7 @@ const config = require('./config.js'); let serviceAuth; if(!config.get('service_account')){ - console.log('No Google Service Account in config files - Google Drive functionality will not function.'); + console.log('No Google Service Account in config files - Google Drive integration will not be available.'); } else { const keys = typeof(config.get('service_account')) == 'string' ? JSON.parse(config.get('service_account')) : @@ -15,12 +15,10 @@ if(!config.get('service_account')){ try { serviceAuth = google.auth.fromJSON(keys); - serviceAuth.scopes = [ - 'https://www.googleapis.com/auth/drive' - ]; + serviceAuth.scopes = ['https://www.googleapis.com/auth/drive']; } catch (err) { console.warn(err); - console.log('Please make sure that a Google Service Account is set up properly in your config files.'); + console.log('Please make sure the Google Service Account is set up properly in your config files.'); } }