Skip to content

The complete open source platform to run your entire marketplace. Storefront, vendor panel, admin console, and integrations in one enterprise-grade platform you own.

fix(core): remove method restriction on vendor middleware and enable RBAC link (#839)

Viktor Holik768ad0c8147c
diff --git a/packages/core-plugin/src/api/utils/ensure-seller-middleware.ts b/packages/core-plugin/src/api/utils/ensure-seller-middleware.ts
index fdcedc444..99d000e4c 100644
--- a/packages/core-plugin/src/api/utils/ensure-seller-middleware.ts
+++ b/packages/core-plugin/src/api/utils/ensure-seller-middleware.ts
@@ -7,7 +7,7 @@ import {
ContainerRegistrationKeys,
MedusaError,
} from "@medusajs/framework/utils"
-import { SellerStatus } from "@mercurjs/types"
+import { SellerContext } from "../../types/seller-context"
const SELLER_ID_HEADER = "x-seller-id"
@@ -18,20 +18,6 @@ export async function ensureSellerMiddleware(
) {
let sellerId = req.get(SELLER_ID_HEADER) || req.session?.seller_id
- // If no seller_id from header or session, resolve from member's seller associations
- if (!sellerId && req.auth_context?.actor_id) {
- const q = req.scope.resolve(ContainerRegistrationKeys.QUERY)
- const { data: members } = await q.graph({
- entity: "member",
- fields: ["sellers.id"],
- filters: { id: req.auth_context.actor_id },
- })
-
- if (members?.[0]?.sellers?.[0]?.id) {
- sellerId = members[0].sellers[0].id
- }
- }
-
if (!sellerId) {
return next(
new MedusaError(
@@ -71,7 +57,7 @@ export async function ensureSellerMiddleware(
seller_id: sellerId,
seller_member: sellerMember,
currency_code: sellerMember.seller.currency_code
- }
+ } as SellerContext
if (sellerMember.role_id) {
req.auth_context.app_metadata = {
diff --git a/packages/core-plugin/src/api/vendor/middlewares.ts b/packages/core-plugin/src/api/vendor/middlewares.ts
index 24a8a4200..a70362bb8 100644
--- a/packages/core-plugin/src/api/vendor/middlewares.ts
+++ b/packages/core-plugin/src/api/vendor/middlewares.ts
@@ -69,7 +69,6 @@ export const vendorMiddlewares: MiddlewareRoute[] = [
},
{
matcher: "/vendor/*",
- method: ["GET", "POST", "PUT", "PATCH", "DELETE"],
middlewares: [
vendorCorsMiddleware,
unlessBaseUrl(
diff --git a/packages/core-plugin/src/links/seller-member-rbac-role.ts b/packages/core-plugin/src/links/seller-member-rbac-role.ts
index b95db0221..1517e8965 100644
--- a/packages/core-plugin/src/links/seller-member-rbac-role.ts
+++ b/packages/core-plugin/src/links/seller-member-rbac-role.ts
@@ -1,13 +1,12 @@
-// TEMP: Commented out - RBAC module not enabled in dev config
-// import { defineLink } from "@medusajs/framework/utils"
-// import RbacModule from "@medusajs/medusa/rbac"
-// import SellerModule from "../modules/seller"
-//
-// export default defineLink(
-// {
-// linkable: SellerModule.linkable.sellerMember,
-// field: "role_id",
-// },
-// RbacModule.linkable.rbacRole,
-// { readOnly: true }
-// )
+import { defineLink } from "@medusajs/framework/utils"
+import RbacModule from "@medusajs/medusa/rbac"
+import SellerModule from "../modules/seller"
+
+export default defineLink(
+ {
+ linkable: SellerModule.linkable.sellerMember,
+ field: "role_id",
+ },
+ RbacModule.linkable.rbacRole,
+ { readOnly: true }
+)
diff --git a/packages/core-plugin/src/types/vendor-request.d.ts b/packages/core-plugin/src/types/vendor-request.d.ts
deleted file mode 100644
index 51133ac73..000000000
--- a/packages/core-plugin/src/types/vendor-request.d.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import "@medusajs/framework/http"
-
-declare module "@medusajs/framework/http" {
- interface MedusaRequest {
- seller_context?: {
- seller_id: string
- seller_member?: {
- id: string
- seller_id: string
- member_id: string
- }
- }
- }
-}