@farm.js/email 0.1.38 → 0.1.40
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/dist/index.d.ts +10 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +29 -2
- package/package.json +3 -3
package/dist/index.d.ts
CHANGED
|
@@ -45,6 +45,16 @@ export interface ResendIntegrationInput<TTemplates extends EmailTemplates = Emai
|
|
|
45
45
|
allowUnauthenticated?: boolean;
|
|
46
46
|
/** Extra trusted origins, using the `serverActions.allowedOrigins` syntax. */
|
|
47
47
|
allowedOrigins?: readonly string[];
|
|
48
|
+
/**
|
|
49
|
+
* Let callers set `from`, `replyTo`, `cc`, `bcc`, `attachments`, `tags`, and
|
|
50
|
+
* `topicId` in the request body. Off by default: those come from the template
|
|
51
|
+
* and `defaults`, and a request that sets them is rejected, so a caller
|
|
52
|
+
* allowed to send one template cannot send it as someone else, copy it to
|
|
53
|
+
* extra recipients, or attach files (Resend fetches an attachment `path` URL).
|
|
54
|
+
* `to` is always the caller's, including an array of recipients: check it in
|
|
55
|
+
* `authorize`.
|
|
56
|
+
*/
|
|
57
|
+
allowCallerHeaders?: boolean;
|
|
48
58
|
}
|
|
49
59
|
interface ResolvedResendConfig {
|
|
50
60
|
apiKey?: string;
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAKL,KAAK,qBAAqB,EAC3B,MAAM,eAAe,CAAC;AAEvB,OAAO,KAAK,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AAC/F,OAAO,EAGL,KAAK,cAAc,EAInB,KAAK,wBAAwB,EAC7B,KAAK,yBAAyB,EAC9B,KAAK,uBAAuB,EAC5B,KAAK,wBAAwB,EAC7B,KAAK,oBAAoB,EACzB,KAAK,qBAAqB,EAC1B,KAAK,uBAAuB,EAG7B,MAAM,aAAa,CAAC;AAGrB,OAAO,EAAE,MAAM,IAAI,SAAS,EAAE,KAAK,mBAAmB,EAAE,MAAM,QAAQ,CAAC;AAEvE,YAAY,EACV,kBAAkB,EAClB,iBAAiB,EACjB,aAAa,EACb,cAAc,EACd,eAAe,EACf,uBAAuB,EACvB,sBAAsB,EACtB,wBAAwB,EACxB,yBAAyB,EACzB,uBAAuB,EACvB,wBAAwB,EACxB,oBAAoB,EACpB,qBAAqB,EACrB,uBAAuB,EACvB,mBAAmB,GACpB,MAAM,aAAa,CAAC;AACrB,YAAY,EAAE,mBAAmB,EAAE,MAAM,QAAQ,CAAC;AAClD,OAAO,EAAE,qBAAqB,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAC5E,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAE9C,MAAM,WAAW,kBAAmB,SAAQ,gBAAgB,CAC1D,QAAQ,EACR,mBAAmB,CAAC,MAAM,CAAC,EAC3B,mBAAmB,CAAC,MAAM,CAAC,EAC3B,mBAAmB,CACpB;CAAG;AAEJ,MAAM,MAAM,mBAAmB,GAAG,iBAAiB,CAAC,kBAAkB,CAAC,CAAC;AACxE,MAAM,MAAM,yBAAyB,GAAG,SAAS,CAAC;AAElD,MAAM,WAAW,yBAAyB;IACxC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;CAC7B;AAED,uEAAuE;AACvE,MAAM,WAAW,2BAA2B;IAC1C,KAAK,EAAE,MAAM,GAAG,UAAU,GAAG,SAAS,CAAC;CACxC;AAED;;;;GAIG;AACH,MAAM,MAAM,oBAAoB,GAAG,CACjC,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,2BAA2B,KACjC,OAAO,GAAG,QAAQ,GAAG,OAAO,CAAC,OAAO,GAAG,QAAQ,CAAC,CAAC;AAEtD,MAAM,WAAW,sBAAsB,CAAC,UAAU,SAAS,cAAc,GAAG,cAAc;IACxF,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,yBAAyB,CAAC;IACrC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,yBAAyB,CAAC;IACrC,SAAS,EAAE,UAAU,CAAC;IACtB,QAAQ,CAAC,EAAE,mBAAmB,CAAC;IAC/B,GAAG,CAAC,EAAE,qBAAqB,CAAC;IAC5B;;;;OAIG;IACH,SAAS,CAAC,EAAE,oBAAoB,CAAC;IACjC;;;OAGG;IACH,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,8EAA8E;IAC9E,cAAc,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/dist/index.js
CHANGED
|
@@ -45,6 +45,27 @@ async function guardEmailRoute(request, route, input) {
|
|
|
45
45
|
return null;
|
|
46
46
|
return Response.json({ error: MISSING_EMAIL_AUTHORIZE_ERROR }, { status: 401 });
|
|
47
47
|
}
|
|
48
|
+
const CALLER_HEADER_FIELDS = [
|
|
49
|
+
"from",
|
|
50
|
+
"replyTo",
|
|
51
|
+
"cc",
|
|
52
|
+
"bcc",
|
|
53
|
+
"attachments",
|
|
54
|
+
"tags",
|
|
55
|
+
"topicId",
|
|
56
|
+
];
|
|
57
|
+
/** Refuse caller-supplied sender, copy, attachment, and tracking fields unless the app opted in. */
|
|
58
|
+
function rejectCallerHeaders(body, input) {
|
|
59
|
+
if (input.allowCallerHeaders === true)
|
|
60
|
+
return null;
|
|
61
|
+
const fields = CALLER_HEADER_FIELDS.filter((field) => body[field] != null);
|
|
62
|
+
if (fields.length === 0)
|
|
63
|
+
return null;
|
|
64
|
+
return Response.json({
|
|
65
|
+
error: `Email request sets ${fields.join(", ")}, which come from the template and defaults. ` +
|
|
66
|
+
"Set `allowCallerHeaders: true` on the email integration to accept them from callers.",
|
|
67
|
+
}, { status: 400 });
|
|
68
|
+
}
|
|
48
69
|
async function readEmailRouteJson(request) {
|
|
49
70
|
try {
|
|
50
71
|
const body = await request.json();
|
|
@@ -227,6 +248,9 @@ export function resend(input) {
|
|
|
227
248
|
const parsedBody = await readEmailRouteJson(request);
|
|
228
249
|
if (parsedBody instanceof Response)
|
|
229
250
|
return parsedBody;
|
|
251
|
+
const rejected = rejectCallerHeaders(parsedBody, input);
|
|
252
|
+
if (rejected)
|
|
253
|
+
return rejected;
|
|
230
254
|
const body = parsedBody;
|
|
231
255
|
const resolved = await resolveTemplate(body.templateId);
|
|
232
256
|
if (!resolved) {
|
|
@@ -253,7 +277,7 @@ export function resend(input) {
|
|
|
253
277
|
}
|
|
254
278
|
if (!from) {
|
|
255
279
|
return Response.json({
|
|
256
|
-
error: "Resend email sending requires a from address. Configure defaults.from, RESEND_FROM_EMAIL, or
|
|
280
|
+
error: "Resend email sending requires a from address. Configure defaults.from, RESEND_FROM_EMAIL, or the template's from.",
|
|
257
281
|
}, {
|
|
258
282
|
status: 400,
|
|
259
283
|
});
|
|
@@ -302,6 +326,9 @@ export function resend(input) {
|
|
|
302
326
|
const parsedBody = await readEmailRouteJson(request);
|
|
303
327
|
if (parsedBody instanceof Response)
|
|
304
328
|
return parsedBody;
|
|
329
|
+
const rejected = rejectCallerHeaders(parsedBody, input);
|
|
330
|
+
if (rejected)
|
|
331
|
+
return rejected;
|
|
305
332
|
const body = parsedBody;
|
|
306
333
|
let when;
|
|
307
334
|
try {
|
|
@@ -340,7 +367,7 @@ export function resend(input) {
|
|
|
340
367
|
}
|
|
341
368
|
if (!from) {
|
|
342
369
|
return Response.json({
|
|
343
|
-
error: "Resend email scheduling requires a from address. Configure defaults.from, RESEND_FROM_EMAIL, or
|
|
370
|
+
error: "Resend email scheduling requires a from address. Configure defaults.from, RESEND_FROM_EMAIL, or the template's from.",
|
|
344
371
|
}, {
|
|
345
372
|
status: 400,
|
|
346
373
|
});
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@farm.js/email",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.40",
|
|
4
4
|
"description": "Email and Resend integration for Farm.js",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"repository": {
|
|
@@ -35,8 +35,8 @@
|
|
|
35
35
|
"dependencies": {
|
|
36
36
|
"@react-email/render": "2.0.6",
|
|
37
37
|
"resend": "6.10.0",
|
|
38
|
-
"@farm.js/
|
|
39
|
-
"@farm.js/
|
|
38
|
+
"@farm.js/integration-utils": "0.1.40",
|
|
39
|
+
"@farm.js/core": "0.1.40"
|
|
40
40
|
},
|
|
41
41
|
"devDependencies": {
|
|
42
42
|
"@types/react": "19.2.13"
|