f.weber/homebrewery
0
0
Fork 0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2026-01-08 18:22:40 +00:00
Code Wiki Activity

Merge pull request #2528 from Gazook89/GoogleActions-error

Browse Source 
Change error message about googleActions on local startup.
This commit is contained in:
Trevor Buckner
2022-12-02 21:29:39 -05:00
committed by GitHub
parent c7b239f362 24477327aa
commit 6832e68ada
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
server/googleActions.js
View File

@@ -5,19 +5,23 @@ const { nanoid } = require('nanoid');
const token = require('./token.js'); const token = require('./token.js');
const config = require('./config.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; let serviceAuth;
try { if(!config.get('service_account')){
serviceAuth = google.auth.fromJSON(keys); console.log('No Google Service Account in config files - Google Drive integration will not be available.');
serviceAuth.scopes = [ } else {
'https://www.googleapis.com/auth/drive' const keys = typeof(config.get('service_account')) == 'string' ?
]; JSON.parse(config.get('service_account')) :
} catch (err) { config.get('service_account');
console.warn(err);
console.log('Please make sure that a Google Service Account is set up properly in your config files.'); try {
serviceAuth = google.auth.fromJSON(keys);
serviceAuth.scopes = ['https://www.googleapis.com/auth/drive'];
} catch (err) {
console.warn(err);
console.log('Please make sure the Google Service Account is set up properly in your config files.');
}
} }
google.options({ auth: serviceAuth || config.get('google_api_key') }); google.options({ auth: serviceAuth || config.get('google_api_key') });
const GoogleActions = { const GoogleActions = {