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

Update Version number & cleanup

Browse Source
This commit is contained in:
Trevor Buckner
2020-10-07 15:02:42 -04:00
parent ed1c589e2d
commit 0afb503860
10 changed files with 38 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
server/googleActions.js
View File

@@ -14,8 +14,6 @@ const config = require('nconf')
GoogleActions = {
authCheck : (account, res)=>{
console.log('RUNNING AUTH CHECK');
if(!account || !account.googleId){ // If not signed into Google
const err = new Error('Not Signed In');
err.status = 401;
@@ -39,18 +37,16 @@ GoogleActions = {
}
account.googleAccessToken = tokens.access_token;
const JWTToken = token.generateAccessToken(account);
console.log('Updated Access Token');
//Save updated token to cookie
res.cookie('nc_session', JWTToken, { maxAge: 1000*60*60*24*365, path: '/', sameSite: 'lax' });
//res.cookie('nc_session', JWTToken, {maxAge: 1000*60*60*24*365, path: '/', sameSite: 'lax', domain: '.naturalcrit.com'});
//res.cookie('nc_session', JWTToken, { maxAge: 1000*60*60*24*365, path: '/', sameSite: 'lax' });
res.cookie('nc_session', JWTToken, { maxAge: 1000*60*60*24*365, path: '/', sameSite: 'lax', domain: '.naturalcrit.com' });
});
return oAuth2Client;
},
getGoogleFolder : async (auth)=>{
console.log('getting google folder');
const drive = google.drive({ version: 'v3', auth: auth });
fileMetadata = {
@@ -69,8 +65,6 @@ GoogleActions = {
let folderId;
if(obj.data.files.length == 0){
console.log('no folders found'); // CREATE APP FOLDER
const obj = await drive.files.create({
resource : fileMetadata
})
@@ -104,12 +98,7 @@ GoogleActions = {
return console.error(`Error Listing Google Brews: ${err}`);
});
if(obj.data.files.length) {
console.log('List Google Brews:');
obj.data.files.map((file)=>{
console.log(`${file.name} (${file.id})`);
});
} else {
if(!obj.data.files.length) {
console.log('No files found.');
}
@@ -172,7 +161,6 @@ GoogleActions = {
},
newGoogleBrew : async (auth, brew)=>{
console.log('CREATE GOOGLE BREW');
const drive = google.drive({ version: 'v3', auth: auth });
const media = {
@@ -288,7 +276,6 @@ GoogleActions = {
deleteGoogleBrew : async (req, res, id)=>{
console.log('trying to delete google brew');
oAuth2Client = GoogleActions.authCheck(req.account, res);
const drive = google.drive({ version: 'v3', auth: oAuth2Client });

14
server/homebrew.api.js
View File

@@ -32,11 +32,7 @@ const newBrew = (req, res)=>{
delete brew.shareId;
delete brew.googleId;
console.log('creating new local file using this data:');
console.log(brew);
const newHomebrew = new HomebrewModel(brew);
console.log('this is the new local homebrew');
console.log(newHomebrew);
// Compress brew text to binary before saving
newHomebrew.textBin = zlib.deflateRawSync(newHomebrew.text);
// Delete the non-binary text field since it's not needed anymore
@@ -48,16 +44,13 @@ const newBrew = (req, res)=>{
return res.status(500).send(`Error while creating new brew, ${err.toString()}`);
}
console.log('NEW BREW. gOING TO RETURN THIS:');
obj = obj.toObject();
obj.gDrive = false;
console.log(obj);
return res.status(200).send(obj);
});
};
const updateBrew = (req, res)=>{
console.log('UPDATE LOCAL');
HomebrewModel.get({ editId: req.params.id })
.then((brew)=>{
brew = _.merge(brew, req.body);
@@ -74,13 +67,8 @@ const updateBrew = (req, res)=>{
brew.markModified('authors');
brew.markModified('systems');
console.log('saving this brew');
console.log(brew);
brew.save((err, obj)=>{
if(err) throw err;
console.log('sending this updated brew:');
console.log(obj);
return res.status(200).send(obj);
});
})
@@ -123,8 +111,6 @@ const deleteBrew = (req, res)=>{
const newGoogleBrew = async (req, res, next)=>{
let oAuth2Client;
console.log('newGoogleBrew (API)');
try { oAuth2Client = GoogleActions.authCheck(req.account, res); } catch (err) { return res.status(err.status).send(err.message); }
const brew = req.body;

3
server/token.js
View File

@@ -21,9 +21,6 @@ const generateAccessToken = (account)=>{
delete payload.password;
delete payload._id;
console.log('THE PAYLOAD');
console.log(payload);
const secret = config.get('authentication_token_secret');
const token = jwt.encode(payload, secret);