Browse Source

Merge pull request #2844 from Budibase/fix/smtp-automation

Fixing server -> worker internal comms
master
Michael Drury 5 years ago
committed by GitHub
parent
commit
a01eb8aaa0
  1. 3
      packages/server/src/utilities/workerRequests.js
  2. 2
      packages/worker/src/api/index.js

3
packages/server/src/utilities/workerRequests.js

@ -52,7 +52,8 @@ exports.sendSmtpEmail = async (to, from, subject, contents, automation) => {
) )
if (response.status !== 200) { if (response.status !== 200) {
throw "Unable to send email." const error = await response.text()
throw `Unable to send email - ${error}`
} }
return response.json() return response.json()
} }

2
packages/worker/src/api/index.js

@ -87,7 +87,7 @@ router
if (ctx.publicEndpoint) { if (ctx.publicEndpoint) {
return next() return next()
} }
if (!ctx.isAuthenticated || !ctx.user.budibaseAccess) { if ((!ctx.isAuthenticated || !ctx.user.budibaseAccess) && !ctx.internal) {
ctx.throw(403, "Unauthorized - no public worker access") ctx.throw(403, "Unauthorized - no public worker access")
} }
return next() return next()

Loading…
Cancel
Save