diff --git a/server/app.js b/server/app.js index 02075d31d..c922f0ff7 100644 --- a/server/app.js +++ b/server/app.js @@ -498,7 +498,7 @@ app.use(async (err, req, res, next)=>{ err.originalUrl = req.originalUrl; console.error(err); - if(err.originalUrl?.startsWith('/api/')) { + if(err.originalUrl?.startsWith('/api')) { // console.log('API error'); res.status(err.status || err.response?.status || 500).send(err); return; diff --git a/server/googleActions.js b/server/googleActions.js index 93367248e..09e51b0bd 100644 --- a/server/googleActions.js +++ b/server/googleActions.js @@ -172,7 +172,6 @@ const GoogleActions = { }) .catch((err)=>{ console.log('Error saving to google'); - console.error(err); throw (err); }); diff --git a/server/homebrew.api.js b/server/homebrew.api.js index f15376af7..22e2cee7b 100644 --- a/server/homebrew.api.js +++ b/server/homebrew.api.js @@ -242,11 +242,8 @@ const api = { let googleId, saved; if(saveToGoogle) { - googleId = await api.newGoogleBrew(req.account, newHomebrew, res) - .catch((err)=>{ - console.error(err); - res.status(err?.status || err?.response?.status || 500).send(err?.message || err); - }); + googleId = await api.newGoogleBrew(req.account, newHomebrew, res); + if(!googleId) return; api.excludeStubProps(newHomebrew); newHomebrew.googleId = googleId; @@ -351,19 +348,13 @@ const api = { brew.googleId = undefined; } else if(!brew.googleId && saveToGoogle) { // If we don't have a google id and the user wants to save to google, create the google brew and set the google id on the brew - brew.googleId = await api.newGoogleBrew(req.account, api.excludeGoogleProps(brew), res) - .catch((err)=>{ - console.error(err); - res.status(err.status || err.response.status).send(err.message || err); - }); + brew.googleId = await api.newGoogleBrew(req.account, api.excludeGoogleProps(brew), res); + if(!brew.googleId) return; } else if(brew.googleId) { // If the google id exists and no other actions are being performed, update the google brew - const updated = await GoogleActions.updateGoogleBrew(api.excludeGoogleProps(brew)) - .catch((err)=>{ - console.error(err); - res.status(err?.response?.status || 500).send(err); - }); + const updated = await GoogleActions.updateGoogleBrew(api.excludeGoogleProps(brew)); + if(!updated) return; } diff --git a/server/homebrew.api.spec.js b/server/homebrew.api.spec.js index 6e7c36641..30a006972 100644 --- a/server/homebrew.api.spec.js +++ b/server/homebrew.api.spec.js @@ -560,16 +560,6 @@ brew`); views : 0 }); }); - - it('should handle google error', async()=>{ - google.newGoogleBrew = jest.fn(()=>{ - throw 'err'; - }); - await api.newBrew({ body: { text: 'asdf', title: '' }, query: { saveToGoogle: true }, account: { username: 'test user' } }, res); - - expect(res.status).toHaveBeenCalledWith(500); - expect(res.send).toHaveBeenCalledWith('err'); - }); }); describe('deleteGoogleBrew', ()=>{