diff --git a/packages/server/src/tests/utilities/TestConfiguration.js b/packages/server/src/tests/utilities/TestConfiguration.js index da7ece2e89..1e418ed4aa 100644 --- a/packages/server/src/tests/utilities/TestConfiguration.js +++ b/packages/server/src/tests/utilities/TestConfiguration.js @@ -338,7 +338,10 @@ class TestConfiguration { if (!email || !password) { await this.createUser() } - await createASession(userId, { sessionId: "sessionid", tenantId: TENANT_ID }) + await createASession(userId, { + sessionId: "sessionid", + tenantId: TENANT_ID, + }) // have to fake this const auth = { userId, diff --git a/packages/worker/src/api/routes/tests/utilities/TestConfiguration.js b/packages/worker/src/api/routes/tests/utilities/TestConfiguration.js index fe1bb68641..26023b02f2 100644 --- a/packages/worker/src/api/routes/tests/utilities/TestConfiguration.js +++ b/packages/worker/src/api/routes/tests/utilities/TestConfiguration.js @@ -62,7 +62,10 @@ class TestConfiguration { null, controllers.users.save ) - await createASession("us_uuid1", { sessionId: "sessionid", tenantId: TENANT_ID }) + await createASession("us_uuid1", { + sessionId: "sessionid", + tenantId: TENANT_ID, + }) } } diff --git a/packages/worker/src/constants/templates/index.js b/packages/worker/src/constants/templates/index.js index f9a7257ebd..805e4b79b7 100644 --- a/packages/worker/src/constants/templates/index.js +++ b/packages/worker/src/constants/templates/index.js @@ -6,7 +6,11 @@ const { GLOBAL_OWNER, } = require("../index") const { join } = require("path") -const { getTemplateParams, getTenantIdFromCtx, getGlobalDB } = require("@budibase/auth/db") +const { + getTemplateParams, + getTenantIdFromCtx, + getGlobalDB, +} = require("@budibase/auth/db") exports.EmailTemplates = { [EmailTemplatePurpose.PASSWORD_RECOVERY]: readStaticFile( @@ -53,7 +57,7 @@ exports.getTemplatesCtx = async (ctx, opts = {}) => { return exports.getTemplates(tenantId, opts) } -exports.getTemplates = async (tenantId, { ownerId, type, id} = {}) => { +exports.getTemplates = async (tenantId, { ownerId, type, id } = {}) => { const db = getGlobalDB(tenantId) const response = await db.allDocs( getTemplateParams(ownerId || GLOBAL_OWNER, id, { diff --git a/packages/worker/src/utilities/email.js b/packages/worker/src/utilities/email.js index e3e558369c..eec2743b69 100644 --- a/packages/worker/src/utilities/email.js +++ b/packages/worker/src/utilities/email.js @@ -68,7 +68,13 @@ async function getLinkCode(purpose, email, user, info = null) { * @param {string|null} contents if using a custom template can supply contents for context. * @return {Promise} returns the built email HTML if all provided parameters were valid. */ -async function buildEmail(tenantId, purpose, email, context, { user, contents } = {}) { +async function buildEmail( + tenantId, + purpose, + email, + context, + { user, contents } = {} +) { // this isn't a full email if (FULL_EMAIL_PURPOSES.indexOf(purpose) === -1) { throw `Unable to build an email of type ${purpose}` @@ -160,7 +166,10 @@ exports.sendEmail = async ( const message = { from: from || config.from, to: email, - html: await buildEmail(tenantId, purpose, email, context, { user, contents }), + html: await buildEmail(tenantId, purpose, email, context, { + user, + contents, + }), } if (subject || config.subject) { message.subject = await processString(subject || config.subject, context) diff --git a/packages/worker/src/utilities/templates.js b/packages/worker/src/utilities/templates.js index 40fc4e227e..51628064bb 100644 --- a/packages/worker/src/utilities/templates.js +++ b/packages/worker/src/utilities/templates.js @@ -34,7 +34,9 @@ exports.getSettingsTemplateContext = async (tenantId, purpose, code = null) => { [InternalTemplateBindings.COMPANY]: settings.company || BASE_COMPANY, [InternalTemplateBindings.DOCS_URL]: settings.docsUrl || "https://docs.budibase.com/", - [InternalTemplateBindings.LOGIN_URL]: checkSlashesInUrl(addTenantToUrl(`${URL}/login`, tenantId)), + [InternalTemplateBindings.LOGIN_URL]: checkSlashesInUrl( + addTenantToUrl(`${URL}/login`, tenantId) + ), [InternalTemplateBindings.CURRENT_DATE]: new Date().toISOString(), [InternalTemplateBindings.CURRENT_YEAR]: new Date().getFullYear(), } @@ -49,7 +51,10 @@ exports.getSettingsTemplateContext = async (tenantId, purpose, code = null) => { case EmailTemplatePurpose.INVITATION: context[InternalTemplateBindings.INVITE_CODE] = code context[InternalTemplateBindings.INVITE_URL] = checkSlashesInUrl( - addTenantToUrl(`${URL}/builder/invite?code=${code}&tenantId=${tenantId}`, tenantId) + addTenantToUrl( + `${URL}/builder/invite?code=${code}&tenantId=${tenantId}`, + tenantId + ) ) break }