The complete open source platform to run your entire marketplace. Storefront, vendor panel, admin console, and integrations in one enterprise-grade platform you own.
TypeScript b2b-marketplacecomposable-commerceecommerceenterpriseheadless-commercemarketplacemedusamedusajsmulti-vendortypescript
fix(core): restore Medusa middlewares for product routes Mercur does not override (#1553)
Viktor Holike65fcf58507a
diff --git a/integration-tests/http/product/admin/product-native-routes.spec.ts b/integration-tests/http/product/admin/product-native-routes.spec.tsnew file mode 100644index 000000000..7fe5b4920--- /dev/null+++ b/integration-tests/http/product/admin/product-native-routes.spec.ts@@ -0,0 +1,97 @@+import { medusaIntegrationTestRunner } from "@medusajs/test-utils"+import { ContainerRegistrationKeys } from "@medusajs/framework/utils"+import { MedusaContainer } from "@medusajs/framework/types"++import { createProductsWorkflow } from "@mercurjs/core/workflows"++import {+ adminHeaders,+ createAdminUser,+} from "../../../helpers/create-admin-user"++jest.setTimeout(60000)++medusaIntegrationTestRunner({+ testSuite: ({ getContainer, api, dbConnection }) => {+ describe("Admin - native product routes Mercur does not override", () => {+ let appContainer: MedusaContainer+ let productId: string+ let variantIds: string[]++ beforeAll(() => {+ appContainer = getContainer()+ })++ beforeEach(async () => {+ await createAdminUser(dbConnection, adminHeaders, appContainer)++ const { result } = await createProductsWorkflow(appContainer).run({+ input: {+ products: [+ {+ title: "Native Routes Product",+ status: "published",+ variants: [{ title: "V1" }, { title: "V2" }],+ },+ ],+ },+ })+ productId = result[0].id++ const query = appContainer.resolve(ContainerRegistrationKeys.QUERY)+ const { data } = await query.graph({+ entity: "product",+ fields: ["variants.id"],+ filters: { id: productId },+ })+ variantIds = data[0].variants.map((v: { id: string }) => v.id)+ })++ it("POST /admin/products/:id/variants/batch deletes a variant", async () => {+ const response = await api.post(+ `/admin/products/${productId}/variants/batch`,+ { delete: [variantIds[0]] },+ adminHeaders+ )++ expect(response.status).toEqual(200)+ expect(response.data.deleted).toEqual(+ expect.objectContaining({ ids: [variantIds[0]], deleted: true })+ )+ })++ it("POST /admin/products/:id/variants/batch rejects unknown fields", async () => {+ const error = await api+ .post(+ `/admin/products/${productId}/variants/batch`,+ { unknown_field: true },+ adminHeaders+ )+ .catch((e) => e)++ expect(error.response.status).toEqual(400)+ })++ it("GET /admin/products/:id/options lists options", async () => {+ const response = await api.get(+ `/admin/products/${productId}/options`,+ adminHeaders+ )++ expect(response.status).toEqual(200)+ expect(response.data.product_options).toEqual(expect.any(Array))+ })++ it("GET /admin/product-variants lists variants", async () => {+ const response = await api.get(`/admin/product-variants`, adminHeaders)++ expect(response.status).toEqual(200)+ expect(response.data.variants).toEqual(+ expect.arrayContaining([+ expect.objectContaining({ id: variantIds[0] }),+ ])+ )+ })+ })+ },+})diff --git a/packages/core/src/api/admin/product-categories/middlewares.ts b/packages/core/src/api/admin/product-categories/middlewares.tsindex 50fb377c9..32bd64524 100644--- a/packages/core/src/api/admin/product-categories/middlewares.ts+++ b/packages/core/src/api/admin/product-categories/middlewares.ts@@ -15,8 +15,9 @@ import {AdminProductCategoryParams,AdminUpdateProductCategory,} from "./validators"+import { withOriginalMiddlewares } from "../../../utils/disable-medusa-middlewares"-export const adminProductCategoriesMiddlewares: MiddlewareRoute[] = [+const overrides: MiddlewareRoute[] = [{method: ["GET"],matcher: "/admin/product-categories",@@ -117,3 +118,8 @@ export const adminProductCategoriesMiddlewares: MiddlewareRoute[] = [],},]++export const adminProductCategoriesMiddlewares = withOriginalMiddlewares(+ "dist/api/admin/product-categories/middlewares.js",+ overrides+)diff --git a/packages/core/src/api/admin/products/middlewares.ts b/packages/core/src/api/admin/products/middlewares.tsindex ad00108a8..e3791a378 100644--- a/packages/core/src/api/admin/products/middlewares.ts+++ b/packages/core/src/api/admin/products/middlewares.ts@@ -28,8 +28,9 @@ import {AdminUpdateProduct,AdminUpdateProductVariant,} from "./validators"+import { withOriginalMiddlewares } from "../../../utils/disable-medusa-middlewares"-export const adminProductsMiddlewares: MiddlewareRoute[] = [+const overrides: MiddlewareRoute[] = [{method: ["GET"],matcher: "/admin/products",@@ -289,3 +290,8 @@ export const adminProductsMiddlewares: MiddlewareRoute[] = [],},]++export const adminProductsMiddlewares = withOriginalMiddlewares(+ "dist/api/admin/products/middlewares.js",+ overrides+)diff --git a/packages/core/src/utils/disable-medusa-middlewares.ts b/packages/core/src/utils/disable-medusa-middlewares.tsindex 9da7d2630..c2e2ed3af 100644--- a/packages/core/src/utils/disable-medusa-middlewares.ts+++ b/packages/core/src/utils/disable-medusa-middlewares.ts@@ -2,21 +2,20 @@ import { existsSync, readdirSync } from "fs"import { dirname, join } from "path"import resolveCwd from "resolve-cwd"import pkgDir from "pkg-dir"+import type { MiddlewareRoute } from "@medusajs/framework/http"// Medusa's `dist/api/middlewares.js` is a single aggregator that statically// requires every sub-middleware file (e.g. `./store/carts/middlewares`) and-// spreads each one's exported array into a flat list. Mercur replaces some-// of those modules wholesale (products), and partially overrides others-// (carts). Overriding route handlers is trivial in Medusa (file-based,+// spreads each one's exported array into a flat list. Mercur overrides a+// subset of the routes in each of those modules. Overriding route handlers is trivial in Medusa (file-based,// plugin scanned after core), but middlewares can't be overridden the same// way — hence this patch.//// We preload each listed sub-middleware module and empty its exported array// in place BEFORE Medusa's aggregator runs. The aggregator then spreads an-// empty array. For files where Mercur only overrides a subset of routes-// (carts), the original entries are captured into `ORIGINAL_MIDDLEWARES`+// empty array. The original entries are captured into `ORIGINAL_MIDDLEWARES`// first so Mercur's own middlewares.ts can re-spread the non-overridden-// ones.+// ones (see `withOriginalMiddlewares`).//// Bun deduplicates each transitive copy of `@medusajs/medusa` under// `node_modules/.bun/@medusajs+medusa@<ver>+<hash>/`. The framework can@@ -28,7 +27,6 @@ const OVERRIDES: string[] = ["dist/api/admin/promotions/middlewares.js","dist/api/admin/campaigns/middlewares.js","dist/api/admin/price-lists/middlewares.js",- "dist/api/admin/product-variants/middlewares.js","dist/api/admin/product-categories/middlewares.js","dist/api/admin/collections/middlewares.js","dist/api/admin/customer-groups/middlewares.js",@@ -40,7 +38,6 @@ const OVERRIDES: string[] = ["dist/api/admin/inventory-items/middlewares.js","dist/api/store/products/middlewares.js","dist/api/store/product-categories/middlewares.js",- "dist/api/store/product-variants/middlewares.js","dist/api/store/carts/middlewares.js",]@@ -94,9 +91,42 @@ export function disableMedusaMiddlewares(): void {for (const key of Object.keys(mod)) {const value = mod[key]if (!Array.isArray(value)) continue- ORIGINAL_MIDDLEWARES[file] = [...value]+ // The first dir is the copy the app resolves; later copies (possibly+ // other Medusa versions further up the tree) must not replace it.+ if (!ORIGINAL_MIDDLEWARES[file] && value.length) {+ ORIGINAL_MIDDLEWARES[file] = [...value]+ }value.length = 0}}}}++const toMethods = (route: MiddlewareRoute): string[] | undefined => {+ if (!route.method) return undefined+ return Array.isArray(route.method) ? route.method : [route.method]+}++const collides = (original: MiddlewareRoute, override: MiddlewareRoute) => {+ if (String(original.matcher) !== String(override.matcher)) return false+ const a = toMethods(original)+ const b = toMethods(override)+ if (!a || !b) return true+ return a.some((method) => b.includes(method))+}++// Medusa's handlers for routes Mercur doesn't override still load and expect+// Medusa's validators/query config, so every original entry must be kept+// unless Mercur registers the same matcher + method itself.+export function withOriginalMiddlewares(+ file: string,+ overrides: MiddlewareRoute[]+): MiddlewareRoute[] {+ const original = (ORIGINAL_MIDDLEWARES[file] ?? []) as MiddlewareRoute[]+ return [+ ...original.filter(+ (route) => !overrides.some((override) => collides(route, override))+ ),+ ...overrides,+ ]+}