@hartl-services/medusa-base 2.6.1 → 2.7.0

package/dist/shared/lib/refreshing-snapshot.js

@@ -0,0 +1,121 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createRefreshingSnapshot = exports.SNAPSHOT_REFRESH_MS = void 0;
+/**
+ * In-memory copy of one value for the places that cannot await it: Medusa
+ * reads some `projectConfig.http` settings synchronously on every login, and
+ * the shop preset puts a getter backed by such a copy there, so a change in
+ * the Admin takes effect without a restart.
+ *
+ * - Boot: `start` loads the value once.
+ * - Afterwards an unref'd timer refreshes every 30 s, so a change reaches an
+ *   idle instance too. A read that finds the copy older than 30 s (a blocked
+ *   timer, say) also starts one refresh in the background
+ *   (stale-while-revalidate) and still answers from the copy. A change thus
+ *   reaches a running instance within about 30 s plus the duration of the
+ *   read.
+ * - A failed read keeps the last value (initially `initial`) and is logged;
+ *   the next attempt waits another 30 s. Neither a throwing reader nor a
+ *   throwing logger escapes.
+ *
+ * The state lives on `globalThis` under a `Symbol.for(key)`: the preset
+ * (`dist`) and the Medusa-loaded plugin code (`.medusa/server`) are compiled
+ * separately and would otherwise each hold their own copy.
+ */
+exports.SNAPSHOT_REFRESH_MS = 30_000;
+const createRefreshingSnapshot = (options) => {
+    const { key, initial } = options;
+    const symbol = Symbol.for(key);
+    const state = () => {
+        const holder = globalThis;
+        holder[symbol] ??= {
+            value: initial,
+            refreshedAt: null,
+            refreshing: null,
+            timer: null,
+            read: null,
+            warn: null,
+        };
+        return holder[symbol];
+    };
+    const logFailure = (current, error) => {
+        try {
+            current.warn?.(`${options.describe(current.value)}: ${error instanceof Error ? error.message : "unknown error"}`);
+        }
+        catch {
+            // A broken logger must not turn a failed refresh into a throw.
+        }
+    };
+    const refresh = () => {
+        const current = state();
+        if (!current.read) {
+            return Promise.resolve();
+        }
+        if (current.refreshing) {
+            return current.refreshing;
+        }
+        const read = current.read;
+        // Started from a microtask so the assignment below always precedes `finally`.
+        const refreshing = Promise.resolve().then(async () => {
+            try {
+                current.value = await read();
+            }
+            catch (error) {
+                logFailure(current, error);
+            }
+            finally {
+                current.refreshedAt = Date.now();
+                current.refreshing = null;
+            }
+        });
+        current.refreshing = refreshing;
+        return refreshing;
+    };
+    const stopTimer = (current) => {
+        if (current.timer) {
+            clearInterval(current.timer);
+            current.timer = null;
+        }
+    };
+    return {
+        refresh,
+        start: (input) => {
+            const current = state();
+            current.read = input.read;
+            current.warn = input.warn;
+            stopTimer(current);
+            current.timer = setInterval(() => {
+                void refresh();
+            }, exports.SNAPSHOT_REFRESH_MS);
+            // An idle timer must not keep the process (or a test run) alive.
+            current.timer.unref();
+            return refresh();
+        },
+        stop: () => stopTimer(state()),
+        current: () => {
+            const current = state();
+            if (current.read &&
+                !current.refreshing &&
+                (current.refreshedAt === null ||
+                    Date.now() - current.refreshedAt >= exports.SNAPSHOT_REFRESH_MS)) {
+                void refresh();
+            }
+            return current.value;
+        },
+        setForTests: (value) => {
+            const current = state();
+            if (value === null) {
+                stopTimer(current);
+                current.value = initial;
+                current.refreshedAt = null;
+                current.refreshing = null;
+                current.read = null;
+                current.warn = null;
+                return;
+            }
+            current.value = value;
+            current.refreshedAt = Date.now();
+        },
+    };
+};
+exports.createRefreshingSnapshot = createRefreshingSnapshot;

package/dist/shop-config/build-food-shop-config.js

@@ -3,8 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildFoodShopConfig = buildFoodShopConfig;
 exports.defineFoodShopConfig = defineFoodShopConfig;
 const logger_1 = require("@medusajs/framework/logger");
+const customer_auth_1 = require("@hartl-services/medusa-food-supplements-contracts/schemas/customer-auth");
 const utils_1 = require("@medusajs/framework/utils");
 const config_1 = require("../public/config");
+const customer_auth_methods_snapshot_1 = require("../customer-auth/customer-auth-methods-snapshot");
 const customer_verification_snapshot_1 = require("../email/customer-verification-snapshot");
 const sentry_logger_1 = require("../public/sentry-logger");
 const options_1 = require("./options");
@@ -101,6 +103,30 @@ function buildFoodShopConfig(options, environment = process.env) {
             : []),
         (0, config_1.createSmtpNotificationModuleConfig)((0, config_1.resolveSmtp)(env, allowInsecure)),
         s3CacheStorage.fileModule,
+        {
+            // Replaces Medusa's default auth entry (same module key): the same
+            // `emailpass` provider as the default plus the code login. defineConfig
+            // merges its MFA defaults back into this entry. Which of the two a
+            // customer may use is decided at run time by `authMethodsPerActor`
+            // (customer_auth switches), not by this list.
+            resolve: "@medusajs/medusa/auth",
+            options: {
+                providers: [
+                    {
+                        resolve: "@medusajs/medusa/auth-emailpass",
+                        id: "emailpass",
+                    },
+                    {
+                        resolve: "@hartl-services/medusa-base/providers/email-otp",
+                        id: customer_auth_1.EMAIL_OTP_AUTH_PROVIDER,
+                        // Must equal projectConfig.http.jwtSecret (below): the code
+                        // request reads its key material from there, the provider from
+                        // this option; both derive the same HMAC key.
+                        options: { hmacSecret: env.JWT_SECRET },
+                    },
+                ],
+            },
+        },
         {
             resolve: "@medusajs/medusa/tax",
             options: {
@@ -244,6 +270,17 @@ function buildFoodShopConfig(options, environment = process.env) {
                         return (0, customer_verification_snapshot_1.customerVerificationActors)();
                     },
                 },
+                // The same technique for the login methods (customer_auth switches,
+                // see customer-auth-methods-snapshot.ts). Customers: emailpass, the
+                // code login, both, or none when both switches are off. Admin users
+                // are pinned to emailpass: without an allowlist Medusa would let
+                // them use every registered provider, the code login included.
+                authMethodsPerActor: {
+                    get customer() {
+                        return (0, customer_auth_methods_snapshot_1.customerAuthMethods)();
+                    },
+                    user: ["emailpass"],
+                },
             },
             // The storefront turns its customer JWT into a Medusa browser session
             // at login, so its browser-side cart and payment calls carry the

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hartl-services/medusa-base",
-  "version": "2.6.1",
+  "version": "2.7.0",
   "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.",
   "license": "MIT",
   "files": [
@@ -101,7 +101,7 @@
     "mime-types": "3.0.1",
     "nodemailer": "6.10.1",
     "ulid": "^2.4.0",
-    "@hartl-services/medusa-food-supplements-contracts": "^0.26.0"
+    "@hartl-services/medusa-food-supplements-contracts": "^0.27.0"
   },
   "devDependencies": {
     "@medusajs/admin-sdk": "2.19.0",
@@ -116,6 +116,10 @@
     "@swc/core": "^1.7.28",
     "@swc/jest": "^0.2.39",
     "@tanstack/react-query": "5.64.2",
+    "@testing-library/dom": "10.4.2",
+    "@testing-library/jest-dom": "6.9.1",
+    "@testing-library/react": "16.3.3",
+    "@testing-library/user-event": "14.6.7",
     "@types/jest": "^29.5.14",
     "@types/jsonwebtoken": "^9.0.10",
     "@types/mailparser": "3.4.6",
@@ -126,6 +130,7 @@
     "@types/react-dom": "^18.2.25",
     "@types/smtp-server": "3.5.10",
     "jest": "^29.7.0",
+    "jest-environment-jsdom": "29.7.0",
     "mailparser": "3.7.2",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
@@ -146,7 +151,7 @@
   "scripts": {
     "build": "medusa plugin:build && tsc -p tsconfig.public.json && tsc -p tsconfig.admin-components.json",
     "dev": "medusa plugin:develop",
-    "typecheck": "tsc --noEmit && tsc -p tsconfig.type-tests.json --noEmit",
+    "typecheck": "tsc --noEmit && tsc -p tsconfig.type-tests.json --noEmit && tsc -p tsconfig.component-tests.json",
     "pretest:unit": "pnpm --filter @hartl-services/medusa-food-supplements-contracts build",
     "test:unit": "jest",
     "pretest:contract": "pnpm --filter @hartl-services/medusa-food-supplements-contracts build",