@hartl-services/medusa-base 2.2.0 → 2.2.1
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/.medusa/server/src/email/config/index.js +7 -4
- package/.medusa/server/src/email/domain/sender.js +28 -0
- package/.medusa/server/src/providers/smtp/service.js +4 -4
- package/README.md +3 -1
- package/dist/email/config/index.js +6 -3
- package/dist/email/domain/sender.d.ts +12 -0
- package/dist/email/domain/sender.js +27 -0
- package/package.json +1 -1
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.resolveSmtp = exports.SMTP_BUILD_PLACEHOLDERS = exports.SMTP_ENVIRONMENT_VARIABLES = exports.defineShopEmailConfiguration = exports.createSmtpNotificationModuleConfig = void 0;
|
|
4
|
+
const sender_1 = require("../domain/sender");
|
|
4
5
|
var notification_module_1 = require("./notification-module");
|
|
5
6
|
Object.defineProperty(exports, "createSmtpNotificationModuleConfig", { enumerable: true, get: function () { return notification_module_1.createSmtpNotificationModuleConfig; } });
|
|
6
7
|
const defineShopEmailConfiguration = (configuration) => configuration;
|
|
@@ -63,11 +64,13 @@ const resolveSmtp = (values, allowInsecure) => {
|
|
|
63
64
|
if (port === undefined) {
|
|
64
65
|
throw new TypeError("SMTP_PORT is required.");
|
|
65
66
|
}
|
|
66
|
-
|
|
67
|
-
|
|
67
|
+
// A display name is allowed: "Example GmbH <info@example.com>".
|
|
68
|
+
const sender = (0, sender_1.parseEmailSender)(values.SMTP_FROM);
|
|
69
|
+
if (!sender) {
|
|
70
|
+
throw new TypeError('SMTP_FROM must be an email address, optionally as "Name <address>".');
|
|
68
71
|
}
|
|
69
72
|
const smtp = {
|
|
70
|
-
from:
|
|
73
|
+
from: (0, sender_1.formatEmailSender)(sender),
|
|
71
74
|
host: values.SMTP_HOST,
|
|
72
75
|
password: values.SMTP_PASSWORD,
|
|
73
76
|
port,
|
|
@@ -81,4 +84,4 @@ const resolveSmtp = (values, allowInsecure) => {
|
|
|
81
84
|
return smtp;
|
|
82
85
|
};
|
|
83
86
|
exports.resolveSmtp = resolveSmtp;
|
|
84
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
87
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9zcmMvZW1haWwvY29uZmlnL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLDZDQUF1RTtBQU12RSw2REFBMkU7QUFBbEUseUlBQUEsa0NBQWtDLE9BQUE7QUFFcEMsTUFBTSw0QkFBNEIsR0FBRyxDQUcxQyxhQUE0QixFQUNiLEVBQUUsQ0FBQyxhQUFhLENBQUM7QUFKckIsUUFBQSw0QkFBNEIsZ0NBSVA7QUFPckIsUUFBQSwwQkFBMEIsR0FBRztJQUN4QyxXQUFXO0lBQ1gsV0FBVztJQUNYLGFBQWE7SUFDYixXQUFXO0lBQ1gsZUFBZTtJQUNmLFdBQVc7SUFDWCxrQkFBa0I7Q0FDVixDQUFDO0FBRVg7Ozs7R0FJRztBQUNVLFFBQUEsdUJBQXVCLEdBQXFDO0lBQ3ZFLFNBQVMsRUFBRSw2QkFBNkI7SUFDeEMsU0FBUyxFQUFFLG9CQUFvQjtJQUMvQixhQUFhLEVBQUUsZ0JBQWdCO0lBQy9CLFNBQVMsRUFBRSxNQUFNO0lBQ2pCLGdCQUFnQixFQUFFLE9BQU87SUFDekIsV0FBVyxFQUFFLE9BQU87SUFDcEIsU0FBUyxFQUFFLFlBQVk7Q0FDeEIsQ0FBQztBQUVGLE1BQU0sYUFBYSxHQUFHLENBQ3BCLE1BQW9ELEVBQ3BELElBQVksRUFDUSxFQUFFO0lBQ3RCLE1BQU0sS0FBSyxHQUFHLE1BQU0sQ0FBQyxJQUFJLENBQUMsRUFBRSxJQUFJLEVBQUUsQ0FBQztJQUNuQyxPQUFPLEtBQUssQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUM7QUFDbkMsQ0FBQyxDQUFDO0FBRUYsTUFBTSxZQUFZLEdBQUcsQ0FDbkIsTUFBb0QsRUFDcEQsSUFBWSxFQUNaLE9BQWUsRUFDZixPQUFlLEVBQ0ssRUFBRTtJQUN0QixNQUFNLEtBQUssR0FBRyxhQUFhLENBQUMsTUFBTSxFQUFFLElBQUksQ0FBQyxDQUFDO0lBQzFDLElBQUks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
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.formatEmailSender = exports.parseEmailSender = void 0;
|
|
4
|
+
const emailAddressPattern = /^[^\s@<>"]+@[^\s@<>"]+\.[^\s@<>"]+$/;
|
|
5
|
+
const namedSenderPattern = /^(.*?)\s*<([^<>]*)>$/;
|
|
6
|
+
/**
|
|
7
|
+
* Reads a sender as either a bare address (`info@example.com`) or with a
|
|
8
|
+
* display name (`Example GmbH <info@example.com>`, the name optionally in
|
|
9
|
+
* double quotes). Returns undefined when the address is not valid.
|
|
10
|
+
*/
|
|
11
|
+
const parseEmailSender = (value) => {
|
|
12
|
+
const trimmed = value.trim();
|
|
13
|
+
const named = namedSenderPattern.exec(trimmed);
|
|
14
|
+
const address = (named ? named[2] : trimmed).trim();
|
|
15
|
+
if (!emailAddressPattern.test(address)) {
|
|
16
|
+
return undefined;
|
|
17
|
+
}
|
|
18
|
+
const name = named?.[1]
|
|
19
|
+
.trim()
|
|
20
|
+
.replace(/^"(.*)"$/, "$1")
|
|
21
|
+
.trim();
|
|
22
|
+
return name ? { address, name } : { address };
|
|
23
|
+
};
|
|
24
|
+
exports.parseEmailSender = parseEmailSender;
|
|
25
|
+
/** Writes the sender for a mail header, quoting the display name. */
|
|
26
|
+
const formatEmailSender = ({ address, name }) => name ? `"${name.replace(/["\\]/g, "\\$&")}" <${address}>` : address;
|
|
27
|
+
exports.formatEmailSender = formatEmailSender;
|
|
28
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VuZGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vc3JjL2VtYWlsL2RvbWFpbi9zZW5kZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBS0EsTUFBTSxtQkFBbUIsR0FBRyxxQ0FBcUMsQ0FBQztBQUNsRSxNQUFNLGtCQUFrQixHQUFHLHNCQUFzQixDQUFDO0FBRWxEOzs7O0dBSUc7QUFDSSxNQUFNLGdCQUFnQixHQUFHLENBQUMsS0FBYSxFQUEyQixFQUFFO0lBQ3pFLE1BQU0sT0FBTyxHQUFHLEtBQUssQ0FBQyxJQUFJLEVBQUUsQ0FBQztJQUM3QixNQUFNLEtBQUssR0FBRyxrQkFBa0IsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUM7SUFDL0MsTUFBTSxPQUFPLEdBQUcsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUMsSUFBSSxFQUFFLENBQUM7SUFDcEQsSUFBSSxDQUFDLG1CQUFtQixDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsRUFBRSxDQUFDO1FBQ3ZDLE9BQU8sU0FBUyxDQUFDO0lBQ25CLENBQUM7SUFFRCxNQUFNLElBQUksR0FBRyxLQUFLLEVBQUUsQ0FBQyxDQUFDLENBQUM7U0FDcEIsSUFBSSxFQUFFO1NBQ04sT0FBTyxDQUFDLFVBQVUsRUFBRSxJQUFJLENBQUM7U0FDekIsSUFBSSxFQUFFLENBQUM7SUFDVixPQUFPLElBQUksQ0FBQyxDQUFDLENBQUMsRUFBRSxPQUFPLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFDLEVBQUUsT0FBTyxFQUFFLENBQUM7QUFDaEQsQ0FBQyxDQUFDO0FBYlcsUUFBQSxnQkFBZ0Isb0JBYTNCO0FBRUYscUVBQXFFO0FBQzlELE1BQU0saUJBQWlCLEdBQUcsQ0FBQyxFQUFFLE9BQU8sRUFBRSxJQUFJLEVBQWUsRUFBVSxFQUFFLENBQzFFLElBQUksQ0FBQyxDQUFDLENBQUMsSUFBSSxJQUFJLENBQUMsT0FBTyxDQUFDLFFBQVEsRUFBRSxNQUFNLENBQUMsTUFBTSxPQUFPLEdBQUcsQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDO0FBRHpELFFBQUEsaUJBQWlCLHFCQUN3QyJ9
|
|
@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.SmtpNotificationService = exports.SMTP_TIMEOUTS = void 0;
|
|
7
7
|
const utils_1 = require("@medusajs/framework/utils");
|
|
8
8
|
const nodemailer_1 = __importDefault(require("nodemailer"));
|
|
9
|
+
const sender_1 = require("../../email/domain/sender");
|
|
9
10
|
const service_1 = require("../../modules/email/service");
|
|
10
11
|
const types_1 = require("./types");
|
|
11
12
|
exports.SMTP_TIMEOUTS = {
|
|
@@ -13,7 +14,6 @@ exports.SMTP_TIMEOUTS = {
|
|
|
13
14
|
greeting: 10_000,
|
|
14
15
|
socket: 30_000,
|
|
15
16
|
};
|
|
16
|
-
const emailAddressPattern = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
|
|
17
17
|
const connectionFailureCodes = new Set(["ECONNREFUSED", "EDNS"]);
|
|
18
18
|
const invalidOptions = () => {
|
|
19
19
|
throw new utils_1.MedusaError(utils_1.MedusaError.Types.INVALID_DATA, "Invalid SMTP notification provider options.");
|
|
@@ -111,7 +111,7 @@ class SmtpNotificationService extends utils_1.AbstractNotificationProviderServic
|
|
|
111
111
|
}
|
|
112
112
|
const configuration = smtp;
|
|
113
113
|
if (!isNonEmptyString(configuration.from) ||
|
|
114
|
-
!
|
|
114
|
+
!(0, sender_1.parseEmailSender)(configuration.from) ||
|
|
115
115
|
!isNonEmptyString(configuration.host) ||
|
|
116
116
|
!isNonEmptyString(configuration.password) ||
|
|
117
117
|
!Number.isInteger(configuration.port) ||
|
|
@@ -145,7 +145,7 @@ class SmtpNotificationService extends utils_1.AbstractNotificationProviderServic
|
|
|
145
145
|
filename: attachment.filename,
|
|
146
146
|
};
|
|
147
147
|
});
|
|
148
|
-
const from = notification.from &&
|
|
148
|
+
const from = notification.from && (0, sender_1.parseEmailSender)(notification.from)
|
|
149
149
|
? notification.from
|
|
150
150
|
: this.options_.smtp.from;
|
|
151
151
|
const identity = deliveryIdentity(notification);
|
|
@@ -233,4 +233,4 @@ class SmtpNotificationService extends utils_1.AbstractNotificationProviderServic
|
|
|
233
233
|
}
|
|
234
234
|
exports.SmtpNotificationService = SmtpNotificationService;
|
|
235
235
|
SmtpNotificationService.identifier = "smtp";
|
|
236
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
236
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"service.js","sourceRoot":"","sources":["../../../../../src/providers/smtp/service.ts"],"names":[],"mappings":"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"}
|
package/README.md
CHANGED
|
@@ -1378,7 +1378,9 @@ deployment variables:
|
|
|
1378
1378
|
build); otherwise `SMTP_SECURE` or `SMTP_REQUIRE_TLS` must be `true`.
|
|
1379
1379
|
|
|
1380
1380
|
Runtime requires `SMTP_HOST`, `SMTP_PORT`, `SMTP_SECURE`, `SMTP_REQUIRE_TLS`,
|
|
1381
|
-
`SMTP_USER`, `SMTP_PASSWORD`, and `SMTP_FROM`. `
|
|
1381
|
+
`SMTP_USER`, `SMTP_PASSWORD`, and `SMTP_FROM`. `SMTP_FROM` is a bare address
|
|
1382
|
+
or carries the sender's display name: `Example GmbH <info@example.com>` (quote
|
|
1383
|
+
the value in a `.env` file). `SMTP_SECURE=true` selects
|
|
1382
1384
|
implicit TLS; `SMTP_REQUIRE_TLS=true` requires STARTTLS. Outside development
|
|
1383
1385
|
and test, at least one must be true. Certificate verification is never
|
|
1384
1386
|
disabled. Development and test may set both to `false` for an isolated local
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.resolveSmtp = exports.SMTP_BUILD_PLACEHOLDERS = exports.SMTP_ENVIRONMENT_VARIABLES = exports.defineShopEmailConfiguration = exports.createSmtpNotificationModuleConfig = void 0;
|
|
4
|
+
const sender_1 = require("../domain/sender");
|
|
4
5
|
var notification_module_1 = require("./notification-module");
|
|
5
6
|
Object.defineProperty(exports, "createSmtpNotificationModuleConfig", { enumerable: true, get: function () { return notification_module_1.createSmtpNotificationModuleConfig; } });
|
|
6
7
|
const defineShopEmailConfiguration = (configuration) => configuration;
|
|
@@ -63,11 +64,13 @@ const resolveSmtp = (values, allowInsecure) => {
|
|
|
63
64
|
if (port === undefined) {
|
|
64
65
|
throw new TypeError("SMTP_PORT is required.");
|
|
65
66
|
}
|
|
66
|
-
|
|
67
|
-
|
|
67
|
+
// A display name is allowed: "Example GmbH <info@example.com>".
|
|
68
|
+
const sender = (0, sender_1.parseEmailSender)(values.SMTP_FROM);
|
|
69
|
+
if (!sender) {
|
|
70
|
+
throw new TypeError('SMTP_FROM must be an email address, optionally as "Name <address>".');
|
|
68
71
|
}
|
|
69
72
|
const smtp = {
|
|
70
|
-
from:
|
|
73
|
+
from: (0, sender_1.formatEmailSender)(sender),
|
|
71
74
|
host: values.SMTP_HOST,
|
|
72
75
|
password: values.SMTP_PASSWORD,
|
|
73
76
|
port,
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
export type EmailSender = {
|
|
2
|
+
address: string;
|
|
3
|
+
name?: string;
|
|
4
|
+
};
|
|
5
|
+
/**
|
|
6
|
+
* Reads a sender as either a bare address (`info@example.com`) or with a
|
|
7
|
+
* display name (`Example GmbH <info@example.com>`, the name optionally in
|
|
8
|
+
* double quotes). Returns undefined when the address is not valid.
|
|
9
|
+
*/
|
|
10
|
+
export declare const parseEmailSender: (value: string) => EmailSender | undefined;
|
|
11
|
+
/** Writes the sender for a mail header, quoting the display name. */
|
|
12
|
+
export declare const formatEmailSender: ({ address, name }: EmailSender) => string;
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.formatEmailSender = exports.parseEmailSender = void 0;
|
|
4
|
+
const emailAddressPattern = /^[^\s@<>"]+@[^\s@<>"]+\.[^\s@<>"]+$/;
|
|
5
|
+
const namedSenderPattern = /^(.*?)\s*<([^<>]*)>$/;
|
|
6
|
+
/**
|
|
7
|
+
* Reads a sender as either a bare address (`info@example.com`) or with a
|
|
8
|
+
* display name (`Example GmbH <info@example.com>`, the name optionally in
|
|
9
|
+
* double quotes). Returns undefined when the address is not valid.
|
|
10
|
+
*/
|
|
11
|
+
const parseEmailSender = (value) => {
|
|
12
|
+
const trimmed = value.trim();
|
|
13
|
+
const named = namedSenderPattern.exec(trimmed);
|
|
14
|
+
const address = (named ? named[2] : trimmed).trim();
|
|
15
|
+
if (!emailAddressPattern.test(address)) {
|
|
16
|
+
return undefined;
|
|
17
|
+
}
|
|
18
|
+
const name = named?.[1]
|
|
19
|
+
.trim()
|
|
20
|
+
.replace(/^"(.*)"$/, "$1")
|
|
21
|
+
.trim();
|
|
22
|
+
return name ? { address, name } : { address };
|
|
23
|
+
};
|
|
24
|
+
exports.parseEmailSender = parseEmailSender;
|
|
25
|
+
/** Writes the sender for a mail header, quoting the display name. */
|
|
26
|
+
const formatEmailSender = ({ address, name }) => name ? `"${name.replace(/["\\]/g, "\\$&")}" <${address}>` : address;
|
|
27
|
+
exports.formatEmailSender = formatEmailSender;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@hartl-services/medusa-base",
|
|
3
|
-
"version": "2.2.
|
|
3
|
+
"version": "2.2.1",
|
|
4
4
|
"description": "Base plugin for Hartl Services Medusa shops: per-plugin feature toggles with a generic Admin settings page, a Store endpoint for storefronts, enforcement helpers, the complete-cart hook composition, the root redirect, cart-promotion link repair, the built-in E-Mail, Documents and S3 file storage modules, config helpers with the turnkey food-shop preset, and the Sentry logger wrapper and instrumentation.",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"files": [
|