@budibase/worker 3.4.18 → 3.4.20
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@budibase/worker",
|
|
3
3
|
"email": "hi@budibase.com",
|
|
4
|
-
"version": "3.4.
|
|
4
|
+
"version": "3.4.20",
|
|
5
5
|
"description": "Budibase background service",
|
|
6
6
|
"main": "src/index.ts",
|
|
7
7
|
"repository": {
|
|
@@ -86,7 +86,6 @@
|
|
|
86
86
|
"@types/koa__router": "12.0.4",
|
|
87
87
|
"@types/lodash": "4.14.200",
|
|
88
88
|
"@types/node-fetch": "2.6.4",
|
|
89
|
-
"@types/nodemailer": "^6.4.17",
|
|
90
89
|
"@types/server-destroy": "1.0.1",
|
|
91
90
|
"@types/supertest": "2.0.14",
|
|
92
91
|
"@types/uuid": "8.3.4",
|
|
@@ -115,5 +114,5 @@
|
|
|
115
114
|
}
|
|
116
115
|
}
|
|
117
116
|
},
|
|
118
|
-
"gitHead": "
|
|
117
|
+
"gitHead": "7f0df167ae6af3b8b9e45e0c7fe70dd20216d707"
|
|
119
118
|
}
|
|
@@ -24,13 +24,10 @@ export async function sendEmail(
|
|
|
24
24
|
invite,
|
|
25
25
|
attachments,
|
|
26
26
|
} = ctx.request.body
|
|
27
|
-
let user:
|
|
27
|
+
let user: any
|
|
28
28
|
if (userId) {
|
|
29
29
|
const db = tenancy.getGlobalDB()
|
|
30
|
-
user = await db.
|
|
31
|
-
}
|
|
32
|
-
if (!user) {
|
|
33
|
-
ctx.throw(404, "User not found.")
|
|
30
|
+
user = await db.get<User>(userId)
|
|
34
31
|
}
|
|
35
32
|
const response = await sendEmailFn(email, purpose, {
|
|
36
33
|
workspaceId,
|
package/src/utilities/email.ts
CHANGED
|
@@ -13,8 +13,7 @@ import { configs, cache, objectStore } from "@budibase/backend-core"
|
|
|
13
13
|
import ical from "ical-generator"
|
|
14
14
|
import _ from "lodash"
|
|
15
15
|
|
|
16
|
-
|
|
17
|
-
import SMTPTransport from "nodemailer/lib/smtp-transport"
|
|
16
|
+
const nodemailer = require("nodemailer")
|
|
18
17
|
|
|
19
18
|
const TEST_MODE = env.ENABLE_EMAIL_TEST_MODE && env.isDev()
|
|
20
19
|
const TYPE = TemplateType.EMAIL
|
|
@@ -27,7 +26,7 @@ const FULL_EMAIL_PURPOSES = [
|
|
|
27
26
|
]
|
|
28
27
|
|
|
29
28
|
function createSMTPTransport(config?: SMTPInnerConfig) {
|
|
30
|
-
let options:
|
|
29
|
+
let options: any
|
|
31
30
|
let secure = config?.secure
|
|
32
31
|
// default it if not specified
|
|
33
32
|
if (secure == null) {
|
|
@@ -162,7 +161,7 @@ export async function sendEmail(
|
|
|
162
161
|
const code = await getLinkCode(purpose, email, opts.user, opts?.info)
|
|
163
162
|
let context = await getSettingsTemplateContext(purpose, code)
|
|
164
163
|
|
|
165
|
-
let message:
|
|
164
|
+
let message: any = {
|
|
166
165
|
from: opts?.from || config?.from,
|
|
167
166
|
html: await buildEmail(purpose, email, context, {
|
|
168
167
|
user: opts?.user,
|