@hartl-services/medusa-base 1.1.0 → 2.1.0
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/admin/index.js +3 -1
- package/.medusa/server/src/admin/index.mjs +3 -1
- package/.medusa/server/src/api/customer-verification-request-throttle.js +50 -0
- package/.medusa/server/src/api/middlewares.js +31 -1
- package/.medusa/server/src/api/store/customer-verification/resend/route.js +17 -0
- package/.medusa/server/src/documents/utils/document-merchant.js +5 -5
- package/.medusa/server/src/email/application/handle-customer-verification-event.js +341 -0
- package/.medusa/server/src/email/application/resend-customer-verification.js +65 -0
- package/.medusa/server/src/email/application/start-customer-verification-snapshot.js +21 -0
- package/.medusa/server/src/email/application/throttle-verification-request.js +49 -0
- package/.medusa/server/src/email/customer-verification-snapshot.js +144 -0
- package/.medusa/server/src/email/domain/business-keys.js +12 -2
- package/.medusa/server/src/email/domain/customer-verification-resend.js +37 -0
- package/.medusa/server/src/email/domain/event-schemas.js +18 -2
- package/.medusa/server/src/email/plugin-features.js +9 -2
- package/.medusa/server/src/email/rendering/default-templates.js +20 -1
- package/.medusa/server/src/email/rendering/resolve-shop-configuration.js +5 -1
- package/.medusa/server/src/email/types/email-kinds.js +14 -2
- package/.medusa/server/src/email/types/template-data.js +9 -1
- package/.medusa/server/src/modules/documents/domain/merchant.js +2 -33
- package/.medusa/server/src/modules/documents/domain/options.js +1 -7
- package/.medusa/server/src/modules/email/migrations/Migration20261001090000.js +16 -0
- package/.medusa/server/src/modules/email/service.js +30 -8
- package/.medusa/server/src/public/shop-master-data.js +6 -6
- package/.medusa/server/src/shop-config/build-food-shop-config.js +17 -6
- package/.medusa/server/src/shop-config/options.js +1 -15
- package/.medusa/server/src/subscribers/customer-verification.js +23 -0
- package/.medusa/server/src/workflows/documents/issue-cancellation-after-refund.js +2 -3
- package/.medusa/server/src/workflows/documents/issue-document.js +3 -4
- package/.medusa/server/src/workflows/documents/issue-packing-list.js +2 -2
- package/.medusa/server/src/workflows/email/dispatch-email-message.js +4 -2
- package/README.md +154 -49
- package/dist/documents/types/documents.d.ts +0 -22
- package/dist/email/customer-verification-snapshot.d.ts +53 -0
- package/dist/email/customer-verification-snapshot.js +143 -0
- package/dist/email/types/email-kinds.d.ts +9 -1
- package/dist/email/types/email-kinds.js +13 -1
- package/dist/email/types/shop-configuration.d.ts +8 -0
- package/dist/email/types/template-data.d.ts +9 -0
- package/dist/email/types/template-data.js +8 -0
- package/dist/modules/documents/domain/options.d.ts +1 -9
- package/dist/modules/documents/domain/options.js +0 -6
- package/dist/public/shop-master-data.d.ts +4 -5
- package/dist/public/shop-master-data.js +5 -5
- package/dist/shop-config/build-food-shop-config.js +16 -5
- package/dist/shop-config/options.d.ts +4 -6
- package/dist/shop-config/options.js +0 -14
- package/package.json +2 -2
- package/dist/modules/documents/domain/merchant.d.ts +0 -22
- package/dist/modules/documents/domain/merchant.js +0 -85
|
@@ -1665,6 +1665,7 @@ const KINDS = [
|
|
|
1665
1665
|
"order.return_received",
|
|
1666
1666
|
"order.refunded",
|
|
1667
1667
|
"auth.password_reset",
|
|
1668
|
+
"auth.verification",
|
|
1668
1669
|
"affiliate.consignment_report_due"
|
|
1669
1670
|
];
|
|
1670
1671
|
const STATUSES = [
|
|
@@ -1686,6 +1687,7 @@ const KIND_LABELS = {
|
|
|
1686
1687
|
"order.return_received": "Retoureneingang",
|
|
1687
1688
|
"order.refunded": "Rückerstattung",
|
|
1688
1689
|
"auth.password_reset": "Passwort zurücksetzen",
|
|
1690
|
+
"auth.verification": "Konto bestätigen",
|
|
1689
1691
|
"affiliate.consignment_report_due": "Affiliate-Meldung"
|
|
1690
1692
|
};
|
|
1691
1693
|
const STATUS_LABELS = {
|
|
@@ -1706,7 +1708,7 @@ const ATTEMPT_STATUS_LABELS = {
|
|
|
1706
1708
|
};
|
|
1707
1709
|
const isKindFilter = (value) => value === "all" || KINDS.includes(value);
|
|
1708
1710
|
const isStatusFilter = (value) => value === "all" || STATUSES.includes(value);
|
|
1709
|
-
const canResend = (message) => message.kind !== "auth.password_reset" && (message.status === "sent" || message.status === "unknown" || message.status === "failed");
|
|
1711
|
+
const canResend = (message) => message.kind !== "auth.password_reset" && message.kind !== "auth.verification" && (message.status === "sent" || message.status === "unknown" || message.status === "failed");
|
|
1710
1712
|
const formatDateTime$1 = (value) => {
|
|
1711
1713
|
if (!value) {
|
|
1712
1714
|
return "-";
|
|
@@ -1662,6 +1662,7 @@ const KINDS = [
|
|
|
1662
1662
|
"order.return_received",
|
|
1663
1663
|
"order.refunded",
|
|
1664
1664
|
"auth.password_reset",
|
|
1665
|
+
"auth.verification",
|
|
1665
1666
|
"affiliate.consignment_report_due"
|
|
1666
1667
|
];
|
|
1667
1668
|
const STATUSES = [
|
|
@@ -1683,6 +1684,7 @@ const KIND_LABELS = {
|
|
|
1683
1684
|
"order.return_received": "Retoureneingang",
|
|
1684
1685
|
"order.refunded": "Rückerstattung",
|
|
1685
1686
|
"auth.password_reset": "Passwort zurücksetzen",
|
|
1687
|
+
"auth.verification": "Konto bestätigen",
|
|
1686
1688
|
"affiliate.consignment_report_due": "Affiliate-Meldung"
|
|
1687
1689
|
};
|
|
1688
1690
|
const STATUS_LABELS = {
|
|
@@ -1703,7 +1705,7 @@ const ATTEMPT_STATUS_LABELS = {
|
|
|
1703
1705
|
};
|
|
1704
1706
|
const isKindFilter = (value) => value === "all" || KINDS.includes(value);
|
|
1705
1707
|
const isStatusFilter = (value) => value === "all" || STATUSES.includes(value);
|
|
1706
|
-
const canResend = (message) => message.kind !== "auth.password_reset" && (message.status === "sent" || message.status === "unknown" || message.status === "failed");
|
|
1708
|
+
const canResend = (message) => message.kind !== "auth.password_reset" && message.kind !== "auth.verification" && (message.status === "sent" || message.status === "unknown" || message.status === "failed");
|
|
1707
1709
|
const formatDateTime$1 = (value) => {
|
|
1708
1710
|
if (!value) {
|
|
1709
1711
|
return "-";
|
|
@@ -0,0 +1,50 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.throttleCustomerVerificationRequest = void 0;
|
|
4
|
+
const utils_1 = require("@medusajs/framework/utils");
|
|
5
|
+
const throttle_verification_request_1 = require("../email/application/throttle-verification-request");
|
|
6
|
+
const plugin_features_1 = require("../email/plugin-features");
|
|
7
|
+
const public_1 = require("../public");
|
|
8
|
+
/**
|
|
9
|
+
* Runs before Medusa's `POST /auth/verification/request`, the route the
|
|
10
|
+
* storefront calls at every blocked login (the resend route's own 60 s limit
|
|
11
|
+
* would not cover it). While `customer_verification` is on and the same
|
|
12
|
+
* customer account asked for its confirmation mail within the last minute,
|
|
13
|
+
* it answers like Medusa (201 `{ verification }`, without the token hash)
|
|
14
|
+
* and sends nothing, so repeated logins cannot mail-bomb an address. Every
|
|
15
|
+
* other request, and any failure of the check, goes on to Medusa unchanged.
|
|
16
|
+
* Needs `req.auth_context`: authenticate the same way Medusa does first.
|
|
17
|
+
*/
|
|
18
|
+
const throttleCustomerVerificationRequest = async (req, res, next) => {
|
|
19
|
+
try {
|
|
20
|
+
const body = req.body;
|
|
21
|
+
const authIdentityId = req.auth_context?.auth_identity_id;
|
|
22
|
+
if (body?.entity_type === "email" &&
|
|
23
|
+
typeof body.entity_id === "string" &&
|
|
24
|
+
authIdentityId &&
|
|
25
|
+
(await (0, public_1.isPluginFeatureEnabled)(req.scope, plugin_features_1.emailPluginFeatures, "account_mails", "customer_verification"))) {
|
|
26
|
+
const verification = await (0, throttle_verification_request_1.findThrottledVerificationRequest)(req.scope, {
|
|
27
|
+
authIdentityId,
|
|
28
|
+
entityId: body.entity_id,
|
|
29
|
+
});
|
|
30
|
+
if (verification) {
|
|
31
|
+
res.status(201).json({ verification });
|
|
32
|
+
return;
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
catch {
|
|
37
|
+
// Fail open with a fixed message: the error text can carry the address.
|
|
38
|
+
try {
|
|
39
|
+
req.scope
|
|
40
|
+
.resolve(utils_1.ContainerRegistrationKeys.LOGGER)
|
|
41
|
+
.warn("Customer verification request could not be rate limited.");
|
|
42
|
+
}
|
|
43
|
+
catch {
|
|
44
|
+
// Logging must never block the login flow.
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
next();
|
|
48
|
+
};
|
|
49
|
+
exports.throttleCustomerVerificationRequest = throttleCustomerVerificationRequest;
|
|
50
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3VzdG9tZXItdmVyaWZpY2F0aW9uLXJlcXVlc3QtdGhyb3R0bGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvYXBpL2N1c3RvbWVyLXZlcmlmaWNhdGlvbi1yZXF1ZXN0LXRocm90dGxlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQU1BLHFEQUFxRTtBQUVyRSxzR0FBcUc7QUFDckcsOERBQThEO0FBQzlELHNDQUFrRDtBQUVsRDs7Ozs7Ozs7O0dBU0c7QUFDSSxNQUFNLG1DQUFtQyxHQUFHLEtBQUssRUFDdEQsR0FBa0IsRUFDbEIsR0FBbUIsRUFDbkIsSUFBd0IsRUFDVCxFQUFFO0lBQ2pCLElBQUksQ0FBQztRQUNILE1BQU0sSUFBSSxHQUFHLEdBQUcsQ0FBQyxJQUFzRCxDQUFBO1FBQ3ZFLE1BQU0sY0FBYyxHQUNsQixHQUNELENBQUMsWUFBWSxFQUFFLGdCQUFnQixDQUFBO1FBQ2hDLElBQ0UsSUFBSSxFQUFFLFdBQVcsS0FBSyxPQUFPO1lBQzdCLE9BQU8sSUFBSSxDQUFDLFNBQVMsS0FBSyxRQUFRO1lBQ2xDLGNBQWM7WUFDZCxDQUFDLE1BQU0sSUFBQSwrQkFBc0IsRUFDM0IsR0FBRyxDQUFDLEtBQUssRUFDVCxxQ0FBbUIsRUFDbkIsZUFBZSxFQUNmLHVCQUF1QixDQUN4QixDQUFDLEVBQ0YsQ0FBQztZQUNELE1BQU0sWUFBWSxHQUFHLE1BQU0sSUFBQSxnRUFBZ0MsRUFBQyxHQUFHLENBQUMsS0FBSyxFQUFFO2dCQUNyRSxjQUFjO2dCQUNkLFFBQVEsRUFBRSxJQUFJLENBQUMsU0FBUzthQUN6QixDQUFDLENBQUE7WUFDRixJQUFJLFlBQVksRUFBRSxDQUFDO2dCQUNqQixHQUFHLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDLElBQUksQ0FBQyxFQUFFLFlBQVksRUFBRSxDQUFDLENBQUE7Z0JBQ3RDLE9BQU07WUFDUixDQUFDO1FBQ0gsQ0FBQztJQUNILENBQUM7SUFBQyxNQUFNLENBQUM7UUFDUCx3RUFBd0U7UUFDeEUsSUFBSSxDQUFDO1lBQ0gsR0FBRyxDQUFDLEtBQUs7aUJBQ04sT0FBTyxDQUFTLGlDQUF5QixDQUFDLE1BQU0sQ0FBQztpQkFDakQsSUFBSSxDQUFDLDBEQUEwRCxDQUFDLENBQUE7UUFDckUsQ0FBQztRQUFDLE1BQU0sQ0FBQztZQUNQLDJDQUEyQztRQUM3QyxDQUFDO0lBQ0gsQ0FBQztJQUNELElBQUksRUFBRSxDQUFBO0FBQ1IsQ0FBQyxDQUFBO0FBekNZLFFBQUEsbUNBQW1DLHVDQXlDL0MifQ==
|
|
@@ -4,9 +4,11 @@ const http_1 = require("@medusajs/framework/http");
|
|
|
4
4
|
const plugin_features_1 = require("@hartl-services/medusa-food-supplements-contracts/schemas/plugin-features");
|
|
5
5
|
const documents_1 = require("@hartl-services/medusa-food-supplements-contracts/schemas/documents");
|
|
6
6
|
const email_1 = require("@hartl-services/medusa-food-supplements-contracts/schemas/email");
|
|
7
|
+
const customer_verification_1 = require("@hartl-services/medusa-food-supplements-contracts/schemas/customer-verification");
|
|
7
8
|
const files_1 = require("@hartl-services/medusa-food-supplements-contracts/schemas/files");
|
|
8
9
|
const plugin_features_2 = require("../documents/plugin-features");
|
|
9
10
|
const plugin_features_3 = require("../email/plugin-features");
|
|
11
|
+
const customer_verification_request_throttle_1 = require("./customer-verification-request-throttle");
|
|
10
12
|
const public_1 = require("../public");
|
|
11
13
|
/**
|
|
12
14
|
* Feature-toggle gate for the Documents routes. Without `methods` Medusa
|
|
@@ -108,6 +110,34 @@ exports.default = (0, http_1.defineMiddlewares)({
|
|
|
108
110
|
methods: ["GET"],
|
|
109
111
|
middlewares: [(0, http_1.authenticate)("user", ["session", "bearer"])],
|
|
110
112
|
},
|
|
113
|
+
// Account confirmation: the resend route answers 404 while the
|
|
114
|
+
// `customer_verification` feature (or Konto-Mails, its parent) is off.
|
|
115
|
+
// Public by design (the customer cannot log in yet); the 60 s limit per
|
|
116
|
+
// account and the uniform 202 answer live in the use case.
|
|
117
|
+
{
|
|
118
|
+
matcher: "/store/customer-verification",
|
|
119
|
+
middlewares: [
|
|
120
|
+
(0, public_1.requirePluginFeature)(plugin_features_3.emailPluginFeatures, "account_mails", "customer_verification"),
|
|
121
|
+
],
|
|
122
|
+
},
|
|
123
|
+
{
|
|
124
|
+
matcher: "/store/customer-verification/resend",
|
|
125
|
+
methods: ["POST"],
|
|
126
|
+
middlewares: [(0, http_1.validateAndTransformBody)(customer_verification_1.ResendCustomerVerificationSchema)],
|
|
127
|
+
},
|
|
128
|
+
// Medusa's own verification request (the storefront calls it at every
|
|
129
|
+
// blocked login) gets the same 60 s limit per account as the resend
|
|
130
|
+
// route. Medusa registers its entry for this matcher first (core routes
|
|
131
|
+
// load before plugin routes), so authentication has run; it is repeated
|
|
132
|
+
// here so the limit never depends on that order.
|
|
133
|
+
{
|
|
134
|
+
matcher: "/auth/verification/request",
|
|
135
|
+
methods: ["POST"],
|
|
136
|
+
middlewares: [
|
|
137
|
+
(0, http_1.authenticate)("*", ["session", "bearer"], { allowUnregistered: true }),
|
|
138
|
+
customer_verification_request_throttle_1.throttleCustomerVerificationRequest,
|
|
139
|
+
],
|
|
140
|
+
},
|
|
111
141
|
// --- Dokumente ------------------------------------------------------
|
|
112
142
|
// Feature-toggle gates (see plugin-features.ts). They cover every
|
|
113
143
|
// Documents route and nothing else; subscribers and jobs check the
|
|
@@ -203,4 +233,4 @@ exports.default = (0, http_1.defineMiddlewares)({
|
|
|
203
233
|
},
|
|
204
234
|
],
|
|
205
235
|
});
|
|
206
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
236
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWlkZGxld2FyZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvYXBpL21pZGRsZXdhcmVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsbURBS2lDO0FBQ2pDLCtHQUtrRjtBQUNsRixtR0FHNEU7QUFDNUUsMkZBS3dFO0FBQ3hFLDJIQUFrSTtBQUNsSSwyRkFBdUg7QUFFdkgsa0VBR3FDO0FBQ3JDLDhEQUE4RDtBQUM5RCxxR0FBOEY7QUFDOUYsc0NBQWdEO0FBRWhEOzs7Ozs7R0FNRztBQUNILE1BQU0sYUFBYSxHQUFHLENBQUMsT0FBZSxFQUFFLEdBQUcsSUFBMkIsRUFBRSxFQUFFLENBQUMsQ0FBQztJQUMxRSxPQUFPO0lBQ1AsV0FBVyxFQUFFLENBQUMsSUFBQSw2QkFBb0IsRUFBQyx5Q0FBdUIsRUFBRSxHQUFHLElBQUksQ0FBQyxDQUFDO0NBQ3RFLENBQUMsQ0FBQTtBQUVGLHlFQUF5RTtBQUN6RSxtRUFBbUU7QUFDbkUsdUVBQXVFO0FBQ3ZFLDJFQUEyRTtBQUMzRSwwRUFBMEU7QUFDMUUsdUNBQXVDO0FBQ3ZDLGtCQUFlLElBQUEsd0JBQWlCLEVBQUM7SUFDL0IsTUFBTSxFQUFFO1FBQ047WUFDRSxPQUFPLEVBQUUsd0JBQXdCO1lBQ2pDLE9BQU8sRUFBRSxDQUFDLE1BQU0sQ0FBQztZQUNqQixXQUFXLEVBQUUsQ0FBQyxJQUFBLCtCQUF3QixFQUFDLDRDQUEwQixDQUFDLENBQUM7U0FDcEU7UUFDRDtZQUNFLE9BQU8sRUFBRSw2Q0FBNkM7WUFDdEQsT0FBTyxFQUFFLENBQUMsTUFBTSxDQUFDO1lBQ2pCLFdBQVcsRUFBRSxDQUFDLElBQUEsK0JBQXdCLEVBQUMsNENBQTBCLENBQUMsQ0FBQztTQUNwRTtRQUNEO1lBQ0UsT0FBTyxFQUFFLHdEQUF3RDtZQUNqRSxPQUFPLEVBQUUsQ0FBQyxNQUFNLENBQUM7WUFDakIsV0FBVyxFQUFFLENBQUMsSUFBQSwrQkFBd0IsRUFBQyx1Q0FBcUIsQ0FB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
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.POST = void 0;
|
|
4
|
+
const resend_customer_verification_1 = require("../../../../email/application/resend-customer-verification");
|
|
5
|
+
/**
|
|
6
|
+
* Always 202 `{ accepted: true }`, whether or not the account exists, is
|
|
7
|
+
* confirmed already or was asked too recently. The answer goes out before any
|
|
8
|
+
* lookup, so existing and unknown addresses take equally long; the work
|
|
9
|
+
* runs detached and logs its own failures (it never rejects). The mail
|
|
10
|
+
* follows through the `auth.verification_requested` subscriber.
|
|
11
|
+
*/
|
|
12
|
+
const POST = async (req, res) => {
|
|
13
|
+
res.status(202).json({ accepted: true });
|
|
14
|
+
void (0, resend_customer_verification_1.resendCustomerVerification)(req.scope, req.validatedBody.email);
|
|
15
|
+
};
|
|
16
|
+
exports.POST = POST;
|
|
17
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBpL3N0b3JlL2N1c3RvbWVyLXZlcmlmaWNhdGlvbi9yZXNlbmQvcm91dGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBTUEsNkdBQXVHO0FBRXZHOzs7Ozs7R0FNRztBQUNJLE1BQU0sSUFBSSxHQUFHLEtBQUssRUFDdkIsR0FBOEMsRUFDOUMsR0FBdUQsRUFDdkQsRUFBRTtJQUNGLEdBQUcsQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUMsSUFBSSxDQUFDLEVBQUUsUUFBUSxFQUFFLElBQUksRUFBRSxDQUFDLENBQUE7SUFDeEMsS0FBSyxJQUFBLHlEQUEwQixFQUFDLEdBQUcsQ0FBQyxLQUFLLEVBQUUsR0FBRyxDQUFDLGFBQWEsQ0FBQyxLQUFLLENBQUMsQ0FBQTtBQUNyRSxDQUFDLENBQUE7QUFOWSxRQUFBLElBQUksUUFNaEIifQ==
|
|
@@ -5,13 +5,13 @@ const public_1 = require("../../public");
|
|
|
5
5
|
const utils_1 = require("@medusajs/framework/utils");
|
|
6
6
|
const merchant_1 = require("../../modules/documents/domain/merchant");
|
|
7
7
|
/**
|
|
8
|
-
* The shop's sender facts for one render
|
|
9
|
-
*
|
|
8
|
+
* The shop's sender facts for one render, from the base plugin's shop master
|
|
9
|
+
* data (stored in the Admin; there is no config fallback). Fails with
|
|
10
10
|
* `UNEXPECTED_STATE` naming the missing fields, so the document is marked
|
|
11
11
|
* failed and issued again once the data is complete. Read failures propagate.
|
|
12
12
|
*/
|
|
13
|
-
const resolveDocumentMerchant = async (container
|
|
14
|
-
const { values } = await (0, public_1.getShopMasterData)(container
|
|
13
|
+
const resolveDocumentMerchant = async (container) => {
|
|
14
|
+
const { values } = await (0, public_1.getShopMasterData)(container);
|
|
15
15
|
const resolution = (0, merchant_1.toDocumentMerchant)(values);
|
|
16
16
|
if (!resolution.merchant) {
|
|
17
17
|
throw new utils_1.MedusaError(utils_1.MedusaError.Types.UNEXPECTED_STATE, `Shop-Stammdaten unvollständig: ${resolution.missing.join(", ")}. Bitte unter Einstellungen → Hartl Services Plugins → Shop-Stammdaten ergänzen.`);
|
|
@@ -19,4 +19,4 @@ const resolveDocumentMerchant = async (container, fallback) => {
|
|
|
19
19
|
return resolution.merchant;
|
|
20
20
|
};
|
|
21
21
|
exports.resolveDocumentMerchant = resolveDocumentMerchant;
|
|
22
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
22
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZG9jdW1lbnQtbWVyY2hhbnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9zcmMvZG9jdW1lbnRzL3V0aWxzL2RvY3VtZW50LW1lcmNoYW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLHlDQUFnRDtBQUVoRCxxREFBdUQ7QUFFdkQsc0VBQTRFO0FBRzVFOzs7OztHQUtHO0FBQ0ksTUFBTSx1QkFBdUIsR0FBRyxLQUFLLEVBQzFDLFNBQTBCLEVBQ0MsRUFBRTtJQUM3QixNQUFNLEVBQUUsTUFBTSxFQUFFLEdBQUcsTUFBTSxJQUFBLDBCQUFpQixFQUFDLFNBQVMsQ0FBQyxDQUFBO0lBQ3JELE1BQU0sVUFBVSxHQUFHLElBQUEsNkJBQWtCLEVBQUMsTUFBTSxDQUFDLENBQUE7SUFDN0MsSUFBSSxDQUFDLFVBQVUsQ0FBQyxRQUFRLEVBQUUsQ0FBQztRQUN6QixNQUFNLElBQUksbUJBQVcsQ0FDbkIsbUJBQVcsQ0FBQyxLQUFLLENBQUMsZ0JBQWdCLEVBQ2xDLGtDQUFrQyxVQUFVLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsa0ZBQWtGLENBQ2xKLENBQUE7SUFDSCxDQUFDO0lBQ0QsT0FBTyxVQUFVLENBQUMsUUFBUSxDQUFBO0FBQzVCLENBQUMsQ0FBQTtBQVpZLFFBQUEsdUJBQXVCLDJCQVluQyJ9
|
|
@@ -0,0 +1,341 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.handleCustomerVerificationEvent = exports.CUSTOMER_VERIFICATION_RETRY_SENTINEL = exports.CUSTOMER_VERIFICATION_MAX_ATTEMPTS = void 0;
|
|
4
|
+
const utils_1 = require("@medusajs/framework/utils");
|
|
5
|
+
const failure_classification_1 = require("../domain/failure-classification");
|
|
6
|
+
const business_keys_1 = require("../domain/business-keys");
|
|
7
|
+
const event_schemas_1 = require("../domain/event-schemas");
|
|
8
|
+
const email_1 = require("../../modules/email");
|
|
9
|
+
const load_email_shop_details_1 = require("../rendering/load-email-shop-details");
|
|
10
|
+
const render_email_1 = require("../rendering/render-email");
|
|
11
|
+
const dispatch_email_message_1 = require("../../workflows/email/dispatch-email-message");
|
|
12
|
+
exports.CUSTOMER_VERIFICATION_MAX_ATTEMPTS = 2;
|
|
13
|
+
exports.CUSTOMER_VERIFICATION_RETRY_SENTINEL = "EMAIL_CUSTOMER_VERIFICATION_RETRY";
|
|
14
|
+
const emailAddressPattern = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
|
|
15
|
+
const retry = () => {
|
|
16
|
+
throw new Error(exports.CUSTOMER_VERIFICATION_RETRY_SENTINEL);
|
|
17
|
+
};
|
|
18
|
+
const resultForMessage = (message, code) => ({
|
|
19
|
+
...(code ? { code } : {}),
|
|
20
|
+
message_id: message.id,
|
|
21
|
+
status: message.status === "sent"
|
|
22
|
+
? "sent"
|
|
23
|
+
: message.status === "unknown"
|
|
24
|
+
? "unknown"
|
|
25
|
+
: message.status === "failed" || message.status === "suppressed"
|
|
26
|
+
? "failed"
|
|
27
|
+
: "in_progress",
|
|
28
|
+
});
|
|
29
|
+
const asNotificationRecord = (value) => {
|
|
30
|
+
if (!value || typeof value !== "object") {
|
|
31
|
+
return null;
|
|
32
|
+
}
|
|
33
|
+
const record = value;
|
|
34
|
+
if (typeof record.id !== "string" ||
|
|
35
|
+
!record.id.trim() ||
|
|
36
|
+
(record.status !== "failure" &&
|
|
37
|
+
record.status !== "pending" &&
|
|
38
|
+
record.status !== "success")) {
|
|
39
|
+
return null;
|
|
40
|
+
}
|
|
41
|
+
return { id: record.id, status: record.status };
|
|
42
|
+
};
|
|
43
|
+
const localeFromMetadata = (metadata) => {
|
|
44
|
+
const locale = metadata.locale;
|
|
45
|
+
return typeof locale === "string" &&
|
|
46
|
+
locale.trim() &&
|
|
47
|
+
locale.trim().length <= 35
|
|
48
|
+
? locale.trim()
|
|
49
|
+
: null;
|
|
50
|
+
};
|
|
51
|
+
/**
|
|
52
|
+
* The customer a confirmation mail may be sent for, or `null`: an identity
|
|
53
|
+
* without customer actor (an Admin user, or one no customer claimed) and an
|
|
54
|
+
* address that is not the identity's own emailpass address get no mail.
|
|
55
|
+
* Medusa's `POST /auth/verification/request` takes `entity_id` from the
|
|
56
|
+
* request body without comparing it, so without the address check any
|
|
57
|
+
* customer could make the shop mail a link to an arbitrary address. Medusa
|
|
58
|
+
* records the actor as `app_metadata.customer_id`.
|
|
59
|
+
*/
|
|
60
|
+
const resolveCustomerId = async (container, authIdentityId, entityId) => {
|
|
61
|
+
const auth = container.resolve(utils_1.Modules.AUTH);
|
|
62
|
+
const identity = await auth.retrieveAuthIdentity(authIdentityId, {
|
|
63
|
+
select: ["id", "app_metadata"],
|
|
64
|
+
relations: ["provider_identities"],
|
|
65
|
+
});
|
|
66
|
+
const ownsAddress = (identity.provider_identities ?? []).some((providerIdentity) => providerIdentity.provider === "emailpass" &&
|
|
67
|
+
providerIdentity.entity_id === entityId);
|
|
68
|
+
const customerId = identity.app_metadata
|
|
69
|
+
?.customer_id;
|
|
70
|
+
return ownsAddress && typeof customerId === "string" && customerId.trim()
|
|
71
|
+
? customerId
|
|
72
|
+
: null;
|
|
73
|
+
};
|
|
74
|
+
const reconcileSendingMessage = async (container, email, message, now) => {
|
|
75
|
+
const attempts = await email.listEmailAttempts({ message_id: message.id });
|
|
76
|
+
const current = [...attempts]
|
|
77
|
+
.sort((left, right) => right.attempt_number - left.attempt_number)
|
|
78
|
+
.find((attempt) => attempt.status === "processing");
|
|
79
|
+
if (!current?.attempt_token || !current.lease_expires_at) {
|
|
80
|
+
return retry();
|
|
81
|
+
}
|
|
82
|
+
const notification = await (0, dispatch_email_message_1.findAttemptNotification)(container, current.id);
|
|
83
|
+
if (notification?.status === "success") {
|
|
84
|
+
const completed = await email.markAttemptSent({
|
|
85
|
+
attempt_id: current.id,
|
|
86
|
+
attempt_token: current.attempt_token,
|
|
87
|
+
finished_at: now,
|
|
88
|
+
notification_id: notification.id,
|
|
89
|
+
});
|
|
90
|
+
return {
|
|
91
|
+
attempt_id: current.id,
|
|
92
|
+
message_id: completed.message.id,
|
|
93
|
+
status: "sent",
|
|
94
|
+
};
|
|
95
|
+
}
|
|
96
|
+
if (current.lease_expires_at.getTime() <= now.getTime()) {
|
|
97
|
+
const completed = await email.completeStaleAttempt({
|
|
98
|
+
attempt_id: current.id,
|
|
99
|
+
attempt_token: current.attempt_token,
|
|
100
|
+
now,
|
|
101
|
+
notification_id: notification?.id ?? null,
|
|
102
|
+
outcome: "unknown",
|
|
103
|
+
});
|
|
104
|
+
return {
|
|
105
|
+
attempt_id: current.id,
|
|
106
|
+
code: "lease_expired",
|
|
107
|
+
message_id: completed.message.id,
|
|
108
|
+
status: "unknown",
|
|
109
|
+
};
|
|
110
|
+
}
|
|
111
|
+
return retry();
|
|
112
|
+
};
|
|
113
|
+
const failClaim = async (email, claim, code, now, notificationId = null) => {
|
|
114
|
+
const completed = await email.markAttemptFailed({
|
|
115
|
+
attempt_id: claim.attempt.id,
|
|
116
|
+
attempt_token: claim.attempt_token,
|
|
117
|
+
failure_code: code,
|
|
118
|
+
finished_at: now,
|
|
119
|
+
notification_id: notificationId,
|
|
120
|
+
});
|
|
121
|
+
return {
|
|
122
|
+
attempt_id: claim.attempt.id,
|
|
123
|
+
code,
|
|
124
|
+
message_id: completed.message.id,
|
|
125
|
+
status: "failed",
|
|
126
|
+
};
|
|
127
|
+
};
|
|
128
|
+
const deliverCustomerVerification = async (container, email, claim, token, expiresAt, getNow) => {
|
|
129
|
+
const shop = await (0, load_email_shop_details_1.loadEmailShopDetails)(container);
|
|
130
|
+
let rendered;
|
|
131
|
+
try {
|
|
132
|
+
const configuration = email.getDispatchConfiguration();
|
|
133
|
+
const verificationData = claim.message.template_data;
|
|
134
|
+
if (!configuration.verifyAccountUrl) {
|
|
135
|
+
throw new Error("verifyAccountUrl is not configured.");
|
|
136
|
+
}
|
|
137
|
+
const verifyUrl = new URL(configuration.verifyAccountUrl({
|
|
138
|
+
locale: verificationData?.locale ?? null,
|
|
139
|
+
}));
|
|
140
|
+
verifyUrl.hash = new URLSearchParams({ token }).toString();
|
|
141
|
+
rendered = (0, render_email_1.renderEmail)(configuration, {
|
|
142
|
+
kind: "auth.verification",
|
|
143
|
+
data: {
|
|
144
|
+
locale: verificationData?.locale ?? null,
|
|
145
|
+
verify_url: verifyUrl.toString(),
|
|
146
|
+
},
|
|
147
|
+
}, shop);
|
|
148
|
+
}
|
|
149
|
+
catch {
|
|
150
|
+
return await failClaim(email, claim, "render_failed", getNow());
|
|
151
|
+
}
|
|
152
|
+
const beforeNotification = getNow();
|
|
153
|
+
if (expiresAt.getTime() <= beforeNotification.getTime()) {
|
|
154
|
+
return await failClaim(email, claim, "payload_expired", beforeNotification);
|
|
155
|
+
}
|
|
156
|
+
try {
|
|
157
|
+
await email.renewAttemptLease({
|
|
158
|
+
attempt_id: claim.attempt.id,
|
|
159
|
+
attempt_token: claim.attempt_token,
|
|
160
|
+
now: beforeNotification,
|
|
161
|
+
});
|
|
162
|
+
}
|
|
163
|
+
catch {
|
|
164
|
+
return retry();
|
|
165
|
+
}
|
|
166
|
+
const notifications = container.resolve(utils_1.Modules.NOTIFICATION);
|
|
167
|
+
const safeData = {
|
|
168
|
+
attempt_id: claim.attempt.id,
|
|
169
|
+
kind: claim.message.kind,
|
|
170
|
+
message_id: claim.message.id,
|
|
171
|
+
};
|
|
172
|
+
let creationError;
|
|
173
|
+
let created = null;
|
|
174
|
+
try {
|
|
175
|
+
created = asNotificationRecord(await notifications.createNotifications({
|
|
176
|
+
channel: "email",
|
|
177
|
+
content: {
|
|
178
|
+
html: rendered.html,
|
|
179
|
+
subject: rendered.subject,
|
|
180
|
+
text: rendered.text,
|
|
181
|
+
},
|
|
182
|
+
data: safeData,
|
|
183
|
+
idempotency_key: (0, failure_classification_1.emailAttemptNotificationKey)(claim.attempt.id),
|
|
184
|
+
...(claim.previous_notification_id
|
|
185
|
+
? { original_notification_id: claim.previous_notification_id }
|
|
186
|
+
: {}),
|
|
187
|
+
provider_data: safeData,
|
|
188
|
+
...(claim.message.resource_id
|
|
189
|
+
? { resource_id: claim.message.resource_id }
|
|
190
|
+
: {}),
|
|
191
|
+
resource_type: "customer",
|
|
192
|
+
template: claim.message.kind,
|
|
193
|
+
to: claim.message.recipient,
|
|
194
|
+
trigger_type: "email.customer_verification.dispatch",
|
|
195
|
+
}));
|
|
196
|
+
}
|
|
197
|
+
catch (error) {
|
|
198
|
+
creationError = error;
|
|
199
|
+
}
|
|
200
|
+
let persisted = null;
|
|
201
|
+
let lookupFailed = false;
|
|
202
|
+
if (!created || creationError) {
|
|
203
|
+
try {
|
|
204
|
+
persisted = await (0, dispatch_email_message_1.findAttemptNotification)(container, claim.attempt.id);
|
|
205
|
+
}
|
|
206
|
+
catch {
|
|
207
|
+
lookupFailed = true;
|
|
208
|
+
}
|
|
209
|
+
}
|
|
210
|
+
const notification = created ?? persisted;
|
|
211
|
+
const finishedAt = getNow();
|
|
212
|
+
if (notification?.status === "success") {
|
|
213
|
+
const completed = await email.markAttemptSent({
|
|
214
|
+
attempt_id: claim.attempt.id,
|
|
215
|
+
attempt_token: claim.attempt_token,
|
|
216
|
+
finished_at: finishedAt,
|
|
217
|
+
notification_id: notification.id,
|
|
218
|
+
});
|
|
219
|
+
return {
|
|
220
|
+
attempt_id: claim.attempt.id,
|
|
221
|
+
message_id: completed.message.id,
|
|
222
|
+
status: "sent",
|
|
223
|
+
};
|
|
224
|
+
}
|
|
225
|
+
const failure = creationError && notification?.status === "failure" && !lookupFailed
|
|
226
|
+
? (0, failure_classification_1.classifyNotificationFailure)(creationError)
|
|
227
|
+
: { code: "outcome_unknown", outcome: "unknown" };
|
|
228
|
+
if (failure.outcome === "retryable") {
|
|
229
|
+
const nextAttemptAt = new Date(finishedAt.getTime() + 1_000);
|
|
230
|
+
if (claim.attempt.attempt_number < exports.CUSTOMER_VERIFICATION_MAX_ATTEMPTS &&
|
|
231
|
+
nextAttemptAt.getTime() < expiresAt.getTime()) {
|
|
232
|
+
await email.markAttemptRetryable({
|
|
233
|
+
attempt_id: claim.attempt.id,
|
|
234
|
+
attempt_token: claim.attempt_token,
|
|
235
|
+
failure_code: failure.code,
|
|
236
|
+
finished_at: finishedAt,
|
|
237
|
+
next_attempt_at: nextAttemptAt,
|
|
238
|
+
notification_id: notification?.id ?? null,
|
|
239
|
+
});
|
|
240
|
+
return retry();
|
|
241
|
+
}
|
|
242
|
+
return await failClaim(email, claim, expiresAt.getTime() <= nextAttemptAt.getTime()
|
|
243
|
+
? "payload_expired"
|
|
244
|
+
: "retry_exhausted", finishedAt, notification?.id ?? null);
|
|
245
|
+
}
|
|
246
|
+
if (failure.outcome === "failed") {
|
|
247
|
+
return await failClaim(email, claim, failure.code, finishedAt, notification?.id ?? null);
|
|
248
|
+
}
|
|
249
|
+
const completed = await email.markAttemptUnknown({
|
|
250
|
+
attempt_id: claim.attempt.id,
|
|
251
|
+
attempt_token: claim.attempt_token,
|
|
252
|
+
failure_code: failure.code,
|
|
253
|
+
finished_at: finishedAt,
|
|
254
|
+
notification_id: notification?.id ?? null,
|
|
255
|
+
});
|
|
256
|
+
return {
|
|
257
|
+
attempt_id: claim.attempt.id,
|
|
258
|
+
code: failure.code,
|
|
259
|
+
message_id: completed.message.id,
|
|
260
|
+
status: "unknown",
|
|
261
|
+
};
|
|
262
|
+
};
|
|
263
|
+
const handleCustomerVerification = async (container, event, getNow) => {
|
|
264
|
+
const now = getNow();
|
|
265
|
+
const expiresAt = event.expires_at;
|
|
266
|
+
const email = container.resolve(email_1.EMAIL_MODULE);
|
|
267
|
+
const businessKey = (0, business_keys_1.customerVerificationBusinessKey)(event.code);
|
|
268
|
+
let message = await email.findMessageByBusinessKey(businessKey);
|
|
269
|
+
if (!message) {
|
|
270
|
+
// Checked only for a new token, so a replay of a terminal message never
|
|
271
|
+
// reads Auth.
|
|
272
|
+
const customerId = await resolveCustomerId(container, event.auth_identity_id, event.entity_id);
|
|
273
|
+
if (!customerId) {
|
|
274
|
+
return { code: "not_eligible", status: "ignored" };
|
|
275
|
+
}
|
|
276
|
+
message = await email.upsertMessageFact({
|
|
277
|
+
kind: "auth.verification",
|
|
278
|
+
business_key: businessKey,
|
|
279
|
+
resource_type: "customer",
|
|
280
|
+
resource_id: customerId,
|
|
281
|
+
recipient: event.entity_id,
|
|
282
|
+
required_facts: ["verification"],
|
|
283
|
+
fact: "verification",
|
|
284
|
+
template_data: { locale: localeFromMetadata(event.metadata ?? {}) },
|
|
285
|
+
payload_expires_at: expiresAt,
|
|
286
|
+
});
|
|
287
|
+
}
|
|
288
|
+
if (message.status === "sent" ||
|
|
289
|
+
message.status === "failed" ||
|
|
290
|
+
message.status === "unknown" ||
|
|
291
|
+
message.status === "suppressed") {
|
|
292
|
+
return resultForMessage(message);
|
|
293
|
+
}
|
|
294
|
+
if (message.status === "sending") {
|
|
295
|
+
return await reconcileSendingMessage(container, email, message, now);
|
|
296
|
+
}
|
|
297
|
+
if (message.status === "retry_pending" &&
|
|
298
|
+
message.next_attempt_at &&
|
|
299
|
+
message.next_attempt_at.getTime() > now.getTime()) {
|
|
300
|
+
return retry();
|
|
301
|
+
}
|
|
302
|
+
const claim = await email.claimReadyMessage({
|
|
303
|
+
message_id: message.id,
|
|
304
|
+
now,
|
|
305
|
+
});
|
|
306
|
+
if (!claim) {
|
|
307
|
+
if (expiresAt.getTime() <= now.getTime()) {
|
|
308
|
+
return {
|
|
309
|
+
code: "payload_expired",
|
|
310
|
+
message_id: message.id,
|
|
311
|
+
status: "failed",
|
|
312
|
+
};
|
|
313
|
+
}
|
|
314
|
+
return retry();
|
|
315
|
+
}
|
|
316
|
+
return await deliverCustomerVerification(container, email, claim, event.code, expiresAt, getNow);
|
|
317
|
+
};
|
|
318
|
+
/**
|
|
319
|
+
* Sends the account-confirmation mail for Medusa's
|
|
320
|
+
* `auth.verification_requested`. The token (`code`) is only ever held in
|
|
321
|
+
* memory: the message stores its hash as business key, never the token or the
|
|
322
|
+
* link.
|
|
323
|
+
*/
|
|
324
|
+
const handleCustomerVerificationEvent = async (container, payload, clock = () => new Date()) => {
|
|
325
|
+
const event = event_schemas_1.NativeVerificationRequestedEventSchema.safeParse(payload);
|
|
326
|
+
if (!event.success ||
|
|
327
|
+
event.data.entity_type !== "email" ||
|
|
328
|
+
event.data.code_provider !== "token" ||
|
|
329
|
+
!emailAddressPattern.test(event.data.entity_id)) {
|
|
330
|
+
return { code: "invalid_event", status: "ignored" };
|
|
331
|
+
}
|
|
332
|
+
const getNow = clock instanceof Date ? () => clock : clock;
|
|
333
|
+
try {
|
|
334
|
+
return await handleCustomerVerification(container, event.data, getNow);
|
|
335
|
+
}
|
|
336
|
+
catch {
|
|
337
|
+
return retry();
|
|
338
|
+
}
|
|
339
|
+
};
|
|
340
|
+
exports.handleCustomerVerificationEvent = handleCustomerVerificationEvent;
|
|
341
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"handle-customer-verification-event.js","sourceRoot":"","sources":["../../../../../src/email/application/handle-customer-verification-event.ts"],"names":[],"mappings":";;;AAKA,qDAAoD;AAEpD,6EAG0C;AAC1C,2DAA0E;AAC1E,2DAGiC;AACjC,+CAAmD;AAMnD,kFAA4E;AAC5E,4DAAwD;AAExD,yFAAuF;AAE1E,QAAA,kCAAkC,GAAG,CAAC,CAAC;AACvC,QAAA,oCAAoC,GAC/C,mCAAmC,CAAC;AAEtC,MAAM,mBAAmB,GAAG,4BAA4B,CAAC;AAczD,MAAM,KAAK,GAAG,GAAU,EAAE;IACxB,MAAM,IAAI,KAAK,CAAC,4CAAoC,CAAC,CAAC;AACxD,CAAC,CAAC;AAEF,MAAM,gBAAgB,GAAG,CACvB,OAA2B,EAC3B,IAAa,EACe,EAAE,CAAC,CAAC;IAChC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IACzB,UAAU,EAAE,OAAO,CAAC,EAAE;IACtB,MAAM,EACJ,OAAO,CAAC,MAAM,KAAK,MAAM;QACvB,CAAC,CAAC,MAAM;QACR,CAAC,CAAC,OAAO,CAAC,MAAM,KAAK,SAAS;YAC5B,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,OAAO,CAAC,MAAM,KAAK,QAAQ,IAAI,OAAO,CAAC,MAAM,KAAK,YAAY;gBAC9D,CAAC,CAAC,QAAQ;gBACV,CAAC,CAAC,aAAa;CACxB,CAAC,CAAC;AAEH,MAAM,oBAAoB,GAAG,CAAC,KAAc,EAA6B,EAAE;IACzE,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QACxC,OAAO,IAAI,CAAC;IACd,CAAC;IACD,MAAM,MAAM,GAAG,KAAgC,CAAC;IAChD,IACE,OAAO,MAAM,CAAC,EAAE,KAAK,QAAQ;QAC7B,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE;QACjB,CAAC,MAAM,CAAC,MAAM,KAAK,SAAS;YAC1B,MAAM,CAAC,MAAM,KAAK,SAAS;YAC3B,MAAM,CAAC,MAAM,KAAK,SAAS,CAAC,EAC9B,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC;AAClD,CAAC,CAAC;AAEF,MAAM,kBAAkB,GAAG,CACzB,QAAiC,EAClB,EAAE;IACjB,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC;IAC/B,OAAO,OAAO,MAAM,KAAK,QAAQ;QAC/B,MAAM,CAAC,IAAI,EAAE;QACb,MAAM,CAAC,IAAI,EAAE,CAAC,MAAM,IAAI,EAAE;QAC1B,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE;QACf,CAAC,CAAC,IAAI,CAAC;AACX,CAAC,CAAC;AAEF;;;;;;;;GAQG;AACH,MAAM,iBAAiB,GAAG,KAAK,EAC7B,SAA0B,EAC1B,cAAsB,EACtB,QAAgB,EACQ,EAAE;IAC1B,MAAM,IAAI,GAAG,SAAS,CAAC,OAAO,CAAqB,eAAO,CAAC,IAAI,CAAC,CAAC;IACjE,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,cAAc,EAAE;QAC/D,MAAM,EAAE,CAAC,IAAI,EAAE,cAAc,CAAC;QAC9B,SAAS,EAAE,CAAC,qBAAqB,CAAC;KACnC,CAAC,CAAC;IACH,MAAM,WAAW,GAAG,CAAC,QAAQ,CAAC,mBAAmB,IAAI,EAAE,CAAC,CAAC,IAAI,CAC3D,CAAC,gBAAgB,EAAE,EAAE,CACnB,gBAAgB,CAAC,QAAQ,KAAK,WAAW;QACzC,gBAAgB,CAAC,SAAS,KAAK,QAAQ,CAC1C,CAAC;IACF,MAAM,UAAU,GAAI,QAAQ,CAAC,YAA+C;QAC1E,EAAE,WAAW,CAAC;IAChB,OAAO,WAAW,IAAI,OAAO,UAAU,KAAK,QAAQ,IAAI,UAAU,CAAC,IAAI,EAAE;QACvE,CAAC,CAAC,UAAU;QACZ,CAAC,CAAC,IAAI,CAAC;AACX,CAAC,CAAC;AAEF,MAAM,uBAAuB,GAAG,KAAK,EACnC,SAA0B,EAC1B,KAAyB,EACzB,OAA2B,EAC3B,GAAS,EAC4B,EAAE;IACvC,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,iBAAiB,CAAC,EAAE,UAAU,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;IAC3E,MAAM,OAAO,GAAG,CAAC,GAAG,QAAQ,CAAC;SAC1B,IAAI,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,cAAc,GAAG,IAAI,CAAC,cAAc,CAAC;SACjE,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,KAAK,YAAY,CAAC,CAAC;IACtD,IAAI,CAAC,OAAO,EAAE,aAAa,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE,CAAC;QACzD,OAAO,KAAK,EAAE,CAAC;IACjB,CAAC;IACD,MAAM,YAAY,GAAG,MAAM,IAAA,gDAAuB,EAAC,SAAS,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;IAC1E,IAAI,YAAY,EAAE,MAAM,KAAK,SAAS,EAAE,CAAC;QACvC,MAAM,SAAS,GAAG,MAAM,KAAK,CAAC,eAAe,CAAC;YAC5C,UAAU,EAAE,OAAO,CAAC,EAAE;YACtB,aAAa,EAAE,OAAO,CAAC,aAAa;YACpC,WAAW,EAAE,GAAG;YAChB,eAAe,EAAE,YAAY,CAAC,EAAE;SACjC,CAAC,CAAC;QACH,OAAO;YACL,UAAU,EAAE,OAAO,CAAC,EAAE;YACtB,UAAU,EAAE,SAAS,CAAC,OAAO,CAAC,EAAE;YAChC,MAAM,EAAE,MAAM;SACf,CAAC;IACJ,CAAC;IACD,IAAI,OAAO,CAAC,gBAAgB,CAAC,OAAO,EAAE,IAAI,GAAG,CAAC,OAAO,EAAE,EAAE,CAAC;QACxD,MAAM,SAAS,GAAG,MAAM,KAAK,CAAC,oBAAoB,CAAC;YACjD,UAAU,EAAE,OAAO,CAAC,EAAE;YACtB,aAAa,EAAE,OAAO,CAAC,aAAa;YACpC,GAAG;YACH,eAAe,EAAE,YAAY,EAAE,EAAE,IAAI,IAAI;YACzC,OAAO,EAAE,SAAS;SACnB,CAAC,CAAC;QACH,OAAO;YACL,UAAU,EAAE,OAAO,CAAC,EAAE;YACtB,IAAI,EAAE,eAAe;YACrB,UAAU,EAAE,SAAS,CAAC,OAAO,CAAC,EAAE;YAChC,MAAM,EAAE,SAAS;SAClB,CAAC;IACJ,CAAC;IACD,OAAO,KAAK,EAAE,CAAC;AACjB,CAAC,CAAC;AAEF,MAAM,SAAS,GAAG,KAAK,EACrB,KAAyB,EACzB,KAAwB,EACxB,IAAY,EACZ,GAAS,EACT,iBAAgC,IAAI,EACC,EAAE;IACvC,MAAM,SAAS,GAAG,MAAM,KAAK,CAAC,iBAAiB,CAAC;QAC9C,UAAU,EAAE,KAAK,CAAC,OAAO,CAAC,EAAE;QAC5B,aAAa,EAAE,KAAK,CAAC,aAAa;QAClC,YAAY,EAAE,IAAI;QAClB,WAAW,EAAE,GAAG;QAChB,eAAe,EAAE,cAAc;KAChC,CAAC,CAAC;IACH,OAAO;QACL,UAAU,EAAE,KAAK,CAAC,OAAO,CAAC,EAAE;QAC5B,IAAI;QACJ,UAAU,EAAE,SAAS,CAAC,OAAO,CAAC,EAAE;QAChC,MAAM,EAAE,QAAQ;KACjB,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,2BAA2B,GAAG,KAAK,EACvC,SAA0B,EAC1B,KAAyB,EACzB,KAAwB,EACxB,KAAa,EACb,SAAe,EACf,MAAkB,EACmB,EAAE;IACvC,MAAM,IAAI,GAAG,MAAM,IAAA,8CAAoB,EAAC,SAAS,CAAC,CAAC;IACnD,IAAI,QAAQ,CAAC;IACb,IAAI,CAAC;QACH,MAAM,aAAa,GAAG,KAAK,CAAC,wBAAwB,EAAE,CAAC;QACvD,MAAM,gBAAgB,GAAG,KAAK,CAAC,OAAO,CAAC,aAE/B,CAAC;QACT,IAAI,CAAC,aAAa,CAAC,gBAAgB,EAAE,CAAC;YACpC,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;QACzD,CAAC;QACD,MAAM,SAAS,GAAG,IAAI,GAAG,CACvB,aAAa,CAAC,gBAAgB,CAAC;YAC7B,MAAM,EAAE,gBAAgB,EAAE,MAAM,IAAI,IAAI;SACzC,CAAC,CACH,CAAC;QACF,SAAS,CAAC,IAAI,GAAG,IAAI,eAAe,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC;QAC3D,QAAQ,GAAG,IAAA,0BAAW,EACpB,aAAa,EACb;YACE,IAAI,EAAE,mBAAmB;YACzB,IAAI,EAAE;gBACJ,MAAM,EAAE,gBAAgB,EAAE,MAAM,IAAI,IAAI;gBACxC,UAAU,EAAE,SAAS,CAAC,QAAQ,EAAE;aACjC;SACF,EACD,IAAI,CACL,CAAC;IACJ,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,MAAM,SAAS,CAAC,KAAK,EAAE,KAAK,EAAE,eAAe,EAAE,MAAM,EAAE,CAAC,CAAC;IAClE,CAAC;IAED,MAAM,kBAAkB,GAAG,MAAM,EAAE,CAAC;IACpC,IAAI,SAAS,CAAC,OAAO,EAAE,IAAI,kBAAkB,CAAC,OAAO,EAAE,EAAE,CAAC;QACxD,OAAO,MAAM,SAAS,CAAC,KAAK,EAAE,KAAK,EAAE,iBAAiB,EAAE,kBAAkB,CAAC,CAAC;IAC9E,CAAC;IACD,IAAI,CAAC;QACH,MAAM,KAAK,CAAC,iBAAiB,CAAC;YAC5B,UAAU,EAAE,KAAK,CAAC,OAAO,CAAC,EAAE;YAC5B,aAAa,EAAE,KAAK,CAAC,aAAa;YAClC,GAAG,EAAE,kBAAkB;SACxB,CAAC,CAAC;IACL,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,EAAE,CAAC;IACjB,CAAC;IAED,MAAM,aAAa,GAAG,SAAS,CAAC,OAAO,CACrC,eAAO,CAAC,YAAY,CACrB,CAAC;IACF,MAAM,QAAQ,GAAG;QACf,UAAU,EAAE,KAAK,CAAC,OAAO,CAAC,EAAE;QAC5B,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC,IAAI;QACxB,UAAU,EAAE,KAAK,CAAC,OAAO,CAAC,EAAE;KAC7B,CAAC;IACF,IAAI,aAAsB,CAAC;IAC3B,IAAI,OAAO,GAA8B,IAAI,CAAC;IAC9C,IAAI,CAAC;QACH,OAAO,GAAG,oBAAoB,CAC5B,MAAM,aAAa,CAAC,mBAAmB,CAAC;YACtC,OAAO,EAAE,OAAO;YAChB,OAAO,EAAE;gBACP,IAAI,EAAE,QAAQ,CAAC,IAAI;gBACnB,OAAO,EAAE,QAAQ,CAAC,OAAO;gBACzB,IAAI,EAAE,QAAQ,CAAC,IAAI;aACpB;YACD,IAAI,EAAE,QAAQ;YACd,eAAe,EAAE,IAAA,oDAA2B,EAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;YAC9D,GAAG,CAAC,KAAK,CAAC,wBAAwB;gBAChC,CAAC,CAAC,EAAE,wBAAwB,EAAE,KAAK,CAAC,wBAAwB,EAAE;gBAC9D,CAAC,CAAC,EAAE,CAAC;YACP,aAAa,EAAE,QAAQ;YACvB,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW;gBAC3B,CAAC,CAAC,EAAE,WAAW,EAAE,KAAK,CAAC,OAAO,CAAC,WAAW,EAAE;gBAC5C,CAAC,CAAC,EAAE,CAAC;YACP,aAAa,EAAE,UAAU;YACzB,QAAQ,EAAE,KAAK,CAAC,OAAO,CAAC,IAAI;YAC5B,EAAE,EAAE,KAAK,CAAC,OAAO,CAAC,SAAU;YAC5B,YAAY,EAAE,sCAAsC;SACrD,CAAC,CACH,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,aAAa,GAAG,KAAK,CAAC;IACxB,CAAC;IAED,IAAI,SAAS,GAA8B,IAAI,CAAC;IAChD,IAAI,YAAY,GAAG,KAAK,CAAC;IACzB,IAAI,CAAC,OAAO,IAAI,aAAa,EAAE,CAAC;QAC9B,IAAI,CAAC;YACH,SAAS,GAAG,MAAM,IAAA,gDAAuB,EAAC,SAAS,EAAE,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACzE,CAAC;QAAC,MAAM,CAAC;YACP,YAAY,GAAG,IAAI,CAAC;QACtB,CAAC;IACH,CAAC;IACD,MAAM,YAAY,GAAG,OAAO,IAAI,SAAS,CAAC;IAC1C,MAAM,UAAU,GAAG,MAAM,EAAE,CAAC;IAC5B,IAAI,YAAY,EAAE,MAAM,KAAK,SAAS,EAAE,CAAC;QACvC,MAAM,SAAS,GAAG,MAAM,KAAK,CAAC,eAAe,CAAC;YAC5C,UAAU,EAAE,KAAK,CAAC,OAAO,CAAC,EAAE;YAC5B,aAAa,EAAE,KAAK,CAAC,aAAa;YAClC,WAAW,EAAE,UAAU;YACvB,eAAe,EAAE,YAAY,CAAC,EAAE;SACjC,CAAC,CAAC;QACH,OAAO;YACL,UAAU,EAAE,KAAK,CAAC,OAAO,CAAC,EAAE;YAC5B,UAAU,EAAE,SAAS,CAAC,OAAO,CAAC,EAAE;YAChC,MAAM,EAAE,MAAM;SACf,CAAC;IACJ,CAAC;IAED,MAAM,OAAO,GACX,aAAa,IAAI,YAAY,EAAE,MAAM,KAAK,SAAS,IAAI,CAAC,YAAY;QAClE,CAAC,CAAC,IAAA,oDAA2B,EAAC,aAAa,CAAC;QAC5C,CAAC,CAAE,EAAE,IAAI,EAAE,iBAAiB,EAAE,OAAO,EAAE,SAAS,EAAY,CAAC;IACjE,IAAI,OAAO,CAAC,OAAO,KAAK,WAAW,EAAE,CAAC;QACpC,MAAM,aAAa,GAAG,IAAI,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,GAAG,KAAK,CAAC,CAAC;QAC7D,IACE,KAAK,CAAC,OAAO,CAAC,cAAc,GAAG,0CAAkC;YACjE,aAAa,CAAC,OAAO,EAAE,GAAG,SAAS,CAAC,OAAO,EAAE,EAC7C,CAAC;YACD,MAAM,KAAK,CAAC,oBAAoB,CAAC;gBAC/B,UAAU,EAAE,KAAK,CAAC,OAAO,CAAC,EAAE;gBAC5B,aAAa,EAAE,KAAK,CAAC,aAAa;gBAClC,YAAY,EAAE,OAAO,CAAC,IAAI;gBAC1B,WAAW,EAAE,UAAU;gBACvB,eAAe,EAAE,aAAa;gBAC9B,eAAe,EAAE,YAAY,EAAE,EAAE,IAAI,IAAI;aAC1C,CAAC,CAAC;YACH,OAAO,KAAK,EAAE,CAAC;QACjB,CAAC;QACD,OAAO,MAAM,SAAS,CACpB,KAAK,EACL,KAAK,EACL,SAAS,CAAC,OAAO,EAAE,IAAI,aAAa,CAAC,OAAO,EAAE;YAC5C,CAAC,CAAC,iBAAiB;YACnB,CAAC,CAAC,iBAAiB,EACrB,UAAU,EACV,YAAY,EAAE,EAAE,IAAI,IAAI,CACzB,CAAC;IACJ,CAAC;IACD,IAAI,OAAO,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;QACjC,OAAO,MAAM,SAAS,CACpB,KAAK,EACL,KAAK,EACL,OAAO,CAAC,IAAI,EACZ,UAAU,EACV,YAAY,EAAE,EAAE,IAAI,IAAI,CACzB,CAAC;IACJ,CAAC;IACD,MAAM,SAAS,GAAG,MAAM,KAAK,CAAC,kBAAkB,CAAC;QAC/C,UAAU,EAAE,KAAK,CAAC,OAAO,CAAC,EAAE;QAC5B,aAAa,EAAE,KAAK,CAAC,aAAa;QAClC,YAAY,EAAE,OAAO,CAAC,IAAI;QAC1B,WAAW,EAAE,UAAU;QACvB,eAAe,EAAE,YAAY,EAAE,EAAE,IAAI,IAAI;KAC1C,CAAC,CAAC;IACH,OAAO;QACL,UAAU,EAAE,KAAK,CAAC,OAAO,CAAC,EAAE;QAC5B,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,UAAU,EAAE,SAAS,CAAC,OAAO,CAAC,EAAE;QAChC,MAAM,EAAE,SAAS;KAClB,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,0BAA0B,GAAG,KAAK,EACtC,SAA0B,EAC1B,KAAuC,EACvC,MAAkB,EACmB,EAAE;IACvC,MAAM,GAAG,GAAG,MAAM,EAAE,CAAC;IACrB,MAAM,SAAS,GAAG,KAAK,CAAC,UAAU,CAAC;IACnC,MAAM,KAAK,GAAG,SAAS,CAAC,OAAO,CAAqB,oBAAY,CAAC,CAAC;IAClE,MAAM,WAAW,GAAG,IAAA,+CAA+B,EAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAChE,IAAI,OAAO,GAAG,MAAM,KAAK,CAAC,wBAAwB,CAAC,WAAW,CAAC,CAAC;IAChE,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,wEAAwE;QACxE,cAAc;QACd,MAAM,UAAU,GAAG,MAAM,iBAAiB,CACxC,SAAS,EACT,KAAK,CAAC,gBAAgB,EACtB,KAAK,CAAC,SAAS,CAChB,CAAC;QACF,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,OAAO,EAAE,IAAI,EAAE,cAAc,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;QACrD,CAAC;QACD,OAAO,GAAG,MAAM,KAAK,CAAC,iBAAiB,CAAC;YACtC,IAAI,EAAE,mBAAmB;YACzB,YAAY,EAAE,WAAW;YACzB,aAAa,EAAE,UAAU;YACzB,WAAW,EAAE,UAAU;YACvB,SAAS,EAAE,KAAK,CAAC,SAAS;YAC1B,cAAc,EAAE,CAAC,cAAc,CAAC;YAChC,IAAI,EAAE,cAAc;YACpB,aAAa,EAAE,EAAE,MAAM,EAAE,kBAAkB,CAAC,KAAK,CAAC,QAAQ,IAAI,EAAE,CAAC,EAAE;YACnE,kBAAkB,EAAE,SAAS;SAC9B,CAAC,CAAC;IACL,CAAC;IACD,IACE,OAAO,CAAC,MAAM,KAAK,MAAM;QACzB,OAAO,CAAC,MAAM,KAAK,QAAQ;QAC3B,OAAO,CAAC,MAAM,KAAK,SAAS;QAC5B,OAAO,CAAC,MAAM,KAAK,YAAY,EAC/B,CAAC;QACD,OAAO,gBAAgB,CAAC,OAAO,CAAC,CAAC;IACnC,CAAC;IACD,IAAI,OAAO,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;QACjC,OAAO,MAAM,uBAAuB,CAAC,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;IACvE,CAAC;IACD,IACE,OAAO,CAAC,MAAM,KAAK,eAAe;QAClC,OAAO,CAAC,eAAe;QACvB,OAAO,CAAC,eAAe,CAAC,OAAO,EAAE,GAAG,GAAG,CAAC,OAAO,EAAE,EACjD,CAAC;QACD,OAAO,KAAK,EAAE,CAAC;IACjB,CAAC;IACD,MAAM,KAAK,GAAG,MAAM,KAAK,CAAC,iBAAiB,CAAC;QAC1C,UAAU,EAAE,OAAO,CAAC,EAAE;QACtB,GAAG;KACJ,CAAC,CAAC;IACH,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,IAAI,SAAS,CAAC,OAAO,EAAE,IAAI,GAAG,CAAC,OAAO,EAAE,EAAE,CAAC;YACzC,OAAO;gBACL,IAAI,EAAE,iBAAiB;gBACvB,UAAU,EAAE,OAAO,CAAC,EAAE;gBACtB,MAAM,EAAE,QAAQ;aACjB,CAAC;QACJ,CAAC;QACD,OAAO,KAAK,EAAE,CAAC;IACjB,CAAC;IACD,OAAO,MAAM,2BAA2B,CACtC,SAAS,EACT,KAAK,EACL,KAAK,EACL,KAAK,CAAC,IAAI,EACV,SAAS,EACT,MAAM,CACP,CAAC;AACJ,CAAC,CAAC;AAEF;;;;;GAKG;AACI,MAAM,+BAA+B,GAAG,KAAK,EAClD,SAA0B,EAC1B,OAAgB,EAChB,QAA6B,GAAG,EAAE,CAAC,IAAI,IAAI,EAAE,EACR,EAAE;IACvC,MAAM,KAAK,GAAG,sDAAsC,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;IACxE,IACE,CAAC,KAAK,CAAC,OAAO;QACd,KAAK,CAAC,IAAI,CAAC,WAAW,KAAK,OAAO;QAClC,KAAK,CAAC,IAAI,CAAC,aAAa,KAAK,OAAO;QACpC,CAAC,mBAAmB,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,EAC/C,CAAC;QACD,OAAO,EAAE,IAAI,EAAE,eAAe,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;IACtD,CAAC;IACD,MAAM,MAAM,GAAG,KAAK,YAAY,IAAI,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC;IAC3D,IAAI,CAAC;QACH,OAAO,MAAM,0BAA0B,CAAC,SAAS,EAAE,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACzE,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,EAAE,CAAC;IACjB,CAAC;AACH,CAAC,CAAC;AApBW,QAAA,+BAA+B,mCAoB1C"}
|