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
feat(core)!: replace Medusa RBAC with Mercur permission layer (#1587)
Viktor Holik4904dabb5907
diff --git a/integration-tests/helpers/create-admin-user.ts b/integration-tests/helpers/create-admin-user.tsindex e8c984ef7..388c60837 100644--- a/integration-tests/helpers/create-admin-user.ts+++ b/integration-tests/helpers/create-admin-user.ts@@ -53,23 +53,6 @@ export const createAdminUser = async (},})- // `withMercur()` enables the `rbac` feature flag, so any Medusa core- // route declaring `policies` (e.g. `/admin/order-edits/*`) calls- // `checkPermissions` which 403s when `app_metadata.roles` is empty.- // Always seed a wildcard role for the test admin user so every admin- // endpoint — Mercur-owned or Medusa-core — is reachable.- const rbac: any = appContainer.resolve("rbac")- const policy = await rbac.createRbacPolicies({- key: `wildcard_${Date.now()}_${Math.floor(Math.random() * 1e6)}`,- resource: "*",- operation: "*",- })- const role = await rbac.createRbacRoles({ name: "Test Super Admin" })- await rbac.createRbacRolePolicies({- role_id: role.id,- policy_id: policy.id,- })-const config = container.resolve(ContainerRegistrationKeys.CONFIG_MODULE)const { projectConfig } = configconst { jwtSecret, jwtOptions } = projectConfig.http@@ -78,7 +61,6 @@ export const createAdminUser = async (actor_id: user.id,actor_type: "user",auth_identity_id: authIdentity.id,- app_metadata: { roles: [role.id] },},jwtSecret,{diff --git a/integration-tests/http/invite/admin/invite.spec.ts b/integration-tests/http/invite/admin/invite.spec.tsdeleted file mode 100644index 266b24d2d..000000000--- a/integration-tests/http/invite/admin/invite.spec.ts+++ /dev/null@@ -1,138 +0,0 @@-import { MedusaContainer } from "@medusajs/framework/types"-import { ContainerRegistrationKeys, Modules } from "@medusajs/framework/utils"-import { medusaIntegrationTestRunner } from "@medusajs/test-utils"--import { adminHeaders, createAdminUser } from "../../../helpers/create-admin-user"--jest.setTimeout(60000)--const SUPER_ADMIN_ROLE_ID = "role_super_admin"--const listInviteRoles = async (- container: MedusaContainer,- inviteId: string-): Promise<string[]> => {- const link: any = container.resolve(ContainerRegistrationKeys.LINK)- const linkService = link.getLinkModule(- Modules.USER,- "invite_id",- Modules.RBAC,- "rbac_role_id"- )-- const links = await linkService.list({ invite_id: inviteId })-- return links.map((entry: any) => entry.rbac_role_id)-}--medusaIntegrationTestRunner({- testSuite: ({ getContainer, api }) => {- describe("Admin - Invites", () => {- let appContainer: MedusaContainer-- beforeAll(() => {- appContainer = getContainer()- })-- beforeEach(async () => {- const { user } = await createAdminUser(- null,- adminHeaders,- appContainer- )-- // `/admin/rbac/roles/assignable` reads the actor's roles from- // the user <> role link rather than from the JWT, so link the- // seeded super admin role the way `medusa user` does.- const link: any = appContainer.resolve(- ContainerRegistrationKeys.LINK- )- await link.create({- [Modules.USER]: { user_id: user.id },- [Modules.RBAC]: { rbac_role_id: SUPER_ADMIN_ROLE_ID },- })- })-- // The panel only renders the roles field when the `rbac` flag is- // reported as enabled, so `withMercur` forcing it on has to be- // visible here.- it("reports the rbac feature flag as enabled", async () => {- const response = await api.get(- "/admin/feature-flags",- adminHeaders- )-- expect(response.status).toEqual(200)- expect(response.data.feature_flags.rbac).toBe(true)- })-- it("lists the roles an admin is allowed to assign", async () => {- const response = await api.get(- "/admin/rbac/roles/assignable",- adminHeaders- )-- expect(response.status).toEqual(200)- expect(response.data.roles.map((role: any) => role.id)).toContain(- SUPER_ADMIN_ROLE_ID- )- })-- it("links the roles the invite was created with", async () => {- const response = await api.post(- "/admin/invites",- {- email: "[email protected]",- roles: [SUPER_ADMIN_ROLE_ID],- },- adminHeaders- )-- expect(response.status).toEqual(200)- expect(- await listInviteRoles(appContainer, response.data.invite.id)- ).toEqual([SUPER_ADMIN_ROLE_ID])- })-- it("lets an admin invited with a role use policy-guarded routes", async () => {- const email = "[email protected]"- const password = "somepassword"-- const {- data: { invite },- } = await api.post(- "/admin/invites",- { email, roles: [SUPER_ADMIN_ROLE_ID] },- adminHeaders- )-- const {- data: { token: registrationToken },- } = await api.post("/auth/user/emailpass/register", {- email,- password,- })-- const acceptResponse = await api.post(- `/admin/invites/accept?token=${invite.token}`,- { email, first_name: "Invited", last_name: "Admin" },- { headers: { authorization: `Bearer ${registrationToken}` } }- )-- expect(acceptResponse.status).toEqual(200)-- const {- data: { token: sessionToken },- } = await api.post("/auth/user/emailpass", { email, password })-- // `/admin/stores` declares policies, so it 403s for an actor- // whose role list is empty.- const storesResponse = await api.get("/admin/stores", {- headers: { authorization: `Bearer ${sessionToken}` },- })-- expect(storesResponse.status).toEqual(200)- })- })- },-})diff --git a/integration-tests/http/permissions/admin/permissions.spec.ts b/integration-tests/http/permissions/admin/permissions.spec.tsnew file mode 100644index 000000000..8783aac89--- /dev/null+++ b/integration-tests/http/permissions/admin/permissions.spec.ts@@ -0,0 +1,104 @@+import { MedusaContainer } from "@medusajs/framework/types"+import { medusaIntegrationTestRunner } from "@medusajs/test-utils"+import {+ IPermissionResolver,+ PERMISSIONS_MODULE,+ PermissionMap,+} from "@mercurjs/types"+import { asValue } from "@medusajs/framework/awilix"+import { ConfigModule } from "@medusajs/framework/types"+import { ContainerRegistrationKeys } from "@medusajs/framework/utils"++import { adminHeaders, createAdminUser } from "../../../helpers/create-admin-user"++jest.setTimeout(90000)++medusaIntegrationTestRunner({+ testSuite: ({ getContainer, api, dbConnection }) => {+ describe("Permissions - admin", () => {+ let container: MedusaContainer+ let granted: PermissionMap = {}++ const resolver: IPermissionResolver = {+ resolvePermissions: async () => granted,+ }++ const modulesConfig = () => {+ const config = container.resolve<ConfigModule>(+ ContainerRegistrationKeys.CONFIG_MODULE+ )+ config.modules ??= {}+ return config.modules as Record<string, unknown>+ }++ beforeAll(() => {+ container = getContainer()+ })++ beforeEach(async () => {+ await createAdminUser(dbConnection, adminHeaders, container)+ })++ afterEach(() => {+ delete modulesConfig()[PERMISSIONS_MODULE]+ })++ const useResolver = (permissions: PermissionMap) => {+ granted = permissions+ modulesConfig()[PERMISSIONS_MODULE] = { resolve: "test-permissions" }+ container.register(PERMISSIONS_MODULE, asValue(resolver))+ }++ it("allows core and Mercur routes without the permissions module", async () => {+ const orders = await api.get("/admin/orders", adminHeaders)+ const sellers = await api.get("/admin/sellers", adminHeaders)++ expect(orders.status).toEqual(200)+ expect(sellers.status).toEqual(200)+ })++ it("guards core Medusa routes through the Mercur route map", async () => {+ useResolver({ orders: "view" })++ const regions = await api+ .get("/admin/regions", adminHeaders)+ .catch((error) => error.response)++ expect(regions.status).toEqual(403)+ expect(regions.data).toEqual(+ expect.objectContaining({+ code: "MISSING_PERMISSION",+ permission: "regions",+ right: "view",+ })+ )++ const orders = await api.get("/admin/orders", adminHeaders)+ expect(orders.status).toEqual(200)+ })++ it("guards seller approval separately from seller editing", async () => {+ useResolver({ sellers: "edit" })++ const response = await api+ .post("/admin/sellers/sel_missing/approve", {}, adminHeaders)+ .catch((error) => error.response)++ expect(response.status).toEqual(403)+ expect(response.data.permission).toEqual("sellers.approval")+ })++ it("returns permissions on users/me when requested", async () => {+ useResolver({ users: "view" })++ const response = await api.get(+ "/admin/users/me?fields=+permissions",+ adminHeaders+ )++ expect(response.status).toEqual(200)+ expect(response.data.user.permissions).toEqual({ users: "view" })+ })+ })+ },+})diff --git a/integration-tests/http/permissions/vendor/permissions.spec.ts b/integration-tests/http/permissions/vendor/permissions.spec.tsnew file mode 100644index 000000000..51d4433f8--- /dev/null+++ b/integration-tests/http/permissions/vendor/permissions.spec.ts@@ -0,0 +1,116 @@+import { MedusaContainer } from "@medusajs/framework/types"+import { medusaIntegrationTestRunner } from "@medusajs/test-utils"+import {+ IPermissionResolver,+ PERMISSIONS_MODULE,+ PermissionMap,+} from "@mercurjs/types"+import { asValue } from "@medusajs/framework/awilix"+import { ConfigModule } from "@medusajs/framework/types"+import { ContainerRegistrationKeys } from "@medusajs/framework/utils"++import { adminHeaders, createAdminUser } from "../../../helpers/create-admin-user"+import { createSellerUser } from "../../../helpers/create-seller-user"++jest.setTimeout(90000)++medusaIntegrationTestRunner({+ testSuite: ({ getContainer, api, dbConnection }) => {+ describe("Permissions - vendor", () => {+ let container: MedusaContainer+ let headers: { headers: Record<string, string> }+ let granted: PermissionMap | null++ const resolver: IPermissionResolver = {+ resolvePermissions: async () => granted ?? {},+ }++ const modulesConfig = () => {+ const config = container.resolve<ConfigModule>(+ ContainerRegistrationKeys.CONFIG_MODULE+ )+ config.modules ??= {}+ return config.modules as Record<string, unknown>+ }++ beforeAll(() => {+ container = getContainer()+ })++ beforeEach(async () => {+ granted = null+ await createAdminUser(dbConnection, adminHeaders, container)+ const result = await createSellerUser(container, {+ email: "[email protected]",+ name: "Permissions Store",+ })+ headers = result.headers+ })++ afterEach(() => {+ delete modulesConfig()[PERMISSIONS_MODULE]+ })++ const useResolver = (permissions: PermissionMap) => {+ granted = permissions+ modulesConfig()[PERMISSIONS_MODULE] = { resolve: "test-permissions" }+ container.register(PERMISSIONS_MODULE, asValue(resolver))+ }++ it("allows everything when the permissions module is not configured", async () => {+ const orders = await api.get("/vendor/orders", headers)+ const payouts = await api.get("/vendor/payouts", headers)++ expect(orders.status).toEqual(200)+ expect(payouts.status).toEqual(200)+ })++ it("omits the permissions field when the permissions module is not configured", async () => {+ const response = await api.get(+ "/vendor/members/me?fields=+permissions",+ headers+ )++ expect(response.status).toEqual(200)+ expect(response.data.seller_member.id).toBeDefined()+ expect(response.data.seller_member.permissions).toBeUndefined()+ })++ it("enforces the resolved rights", async () => {+ useResolver({ orders: "view" })++ const orders = await api.get("/vendor/orders", headers)+ expect(orders.status).toEqual(200)++ const payouts = await api+ .get("/vendor/payouts", headers)+ .catch((error) => error.response)++ expect(payouts.status).toEqual(403)+ expect(payouts.data).toEqual(+ expect.objectContaining({+ code: "MISSING_PERMISSION",+ permission: "payouts",+ right: "view",+ })+ )+ })++ it("returns the permissions field when requested", async () => {+ useResolver({ orders: "edit", store: "view" })++ const withField = await api.get(+ "/vendor/members/me?fields=+permissions",+ headers+ )+ expect(withField.data.seller_member.permissions).toEqual({+ orders: "edit",+ store: "view",+ })++ const withoutField = await api.get("/vendor/members/me", headers)+ expect(withoutField.data.seller_member.permissions).toBeUndefined()+ })+ })+ },+})diff --git a/integration-tests/http/rbac/admin/route-policies.spec.ts b/integration-tests/http/rbac/admin/route-policies.spec.tsdeleted file mode 100644index 18ecf424a..000000000--- a/integration-tests/http/rbac/admin/route-policies.spec.ts+++ /dev/null@@ -1,116 +0,0 @@-import { IAuthModuleService, MedusaContainer } from "@medusajs/framework/types"-import { Modules } from "@medusajs/framework/utils"-import { medusaIntegrationTestRunner } from "@medusajs/test-utils"-import jwt from "jsonwebtoken"-import Scrypt from "scrypt-kdf"--jest.setTimeout(90000)--/**- * Deliberately does not use `createAdminUser`: that helper always seeds a- * wildcard role, which is exactly what these cases need to vary.- */-const createAdminWithRoles = async (- container: MedusaContainer,- dbConnection: any,- { email, roleIds }: { email: string; roleIds: string[] }-) => {- const [user] = await dbConnection.raw(- `INSERT INTO "user" (id, email, first_name, last_name)- VALUES (?, ?, 'Test', 'User') RETURNING id`,- [`user_${email.replace(/[^a-z0-9]/gi, "")}`, email]- ).then((r: any) => r.rows ?? r)-- const authModule: IAuthModuleService = container.resolve(Modules.AUTH)- const passwordHash = await Scrypt.kdf("somepassword", {- logN: 4,- r: 8,- p: 1,- })-- const authIdentity = await authModule.createAuthIdentities({- provider_identities: [- {- provider: "emailpass",- entity_id: email,- provider_metadata: { password: passwordHash.toString("base64") },- },- ],- app_metadata: { user_id: user.id },- })-- const config = container.resolve("configModule") as any- const { jwtSecret, jwtOptions } = config.projectConfig.http-- const token = jwt.sign(- {- actor_id: user.id,- actor_type: "user",- auth_identity_id: authIdentity.id,- app_metadata: { roles: roleIds },- },- jwtSecret,- { expiresIn: "1d", ...jwtOptions }- )-- return { user, headers: { headers: { authorization: `Bearer ${token}` } } }-}--medusaIntegrationTestRunner({- testSuite: ({ getContainer, api, dbConnection }) => {- describe("RBAC - admin route policies", () => {- let appContainer: MedusaContainer-- beforeAll(async () => {- appContainer = getContainer()- })-- describe("an admin with no roles at all", () => {- // Route policy checks reject an actor with an empty role list. Every- // admin predating RBAC has no role, so without the super-admin- // fallback the whole admin API would 403 on upgrade.- it("is not locked out", async () => {- const { headers } = await createAdminWithRoles(- appContainer,- dbConnection,- { email: "[email protected]", roleIds: [] }- )-- const response = await api.get("/admin/sellers", headers)- expect(response.status).toEqual(200)- })- })-- describe("an admin holding a narrow role", () => {- it("is limited to that role's policies", async () => {- const rbac: any = appContainer.resolve(Modules.RBAC)-- // `seller:read` is registered in code and synced into rbac_policy on- // boot, so look it up rather than creating a duplicate.- const [policy] = await rbac.listRbacPolicies({ key: "seller:read" })- expect(policy).toBeDefined()-- const role = await rbac.createRbacRoles({ name: "Seller Reader" })- await rbac.createRbacRolePolicies({- role_id: role.id,- policy_id: policy.id,- })-- const { headers } = await createAdminWithRoles(- appContainer,- dbConnection,- { email: "[email protected]", roleIds: [role.id] }- )-- const allowed = await api.get("/admin/sellers", headers)- expect(allowed.status).toEqual(200)-- const denied = await api- .get("/admin/payouts", headers)- .catch((e) => e.response)- expect(denied.status).toEqual(403)- })- })- })- },-})diff --git a/integration-tests/http/rbac/vendor/me-permissions.spec.ts b/integration-tests/http/rbac/vendor/me-permissions.spec.tsdeleted file mode 100644index a07538fba..000000000--- a/integration-tests/http/rbac/vendor/me-permissions.spec.ts+++ /dev/null@@ -1,113 +0,0 @@-import { MedusaContainer } from "@medusajs/framework/types"-import { medusaIntegrationTestRunner } from "@medusajs/test-utils"-import { createSellerDefaultsWorkflow } from "@mercurjs/core/workflows"-import { SellerRole } from "@mercurjs/types"--import {- adminHeaders,- createAdminUser,-} from "../../../helpers/create-admin-user"-import { createSellerUser } from "../../../helpers/create-seller-user"--jest.setTimeout(90000)--const setMemberRole = async (- container: MedusaContainer,- sellerId: string,- memberId: string,- roleId: string | null-) => {- const sellerModule: any = container.resolve("seller")-- const [sellerMember] = await sellerModule.listSellerMembers({- seller_id: sellerId,- member_id: memberId,- })-- await sellerModule.updateSellerMembers({- id: sellerMember.id,- role_id: roleId,- })-}--medusaIntegrationTestRunner({- testSuite: ({ getContainer, api, dbConnection }) => {- describe("GET /vendor/rbac/me/permissions", () => {- let appContainer: MedusaContainer- let seller: any- let member: any- let headers: any-- beforeAll(async () => {- appContainer = getContainer()- })-- beforeEach(async () => {- await createSellerDefaultsWorkflow(appContainer).run()- await createAdminUser(dbConnection, adminHeaders, appContainer)-- const result = await createSellerUser(appContainer, {- email: "[email protected]",- name: "RBAC Me Store",- })-- seller = result.seller- member = result.member- headers = result.headers- })-- it("returns expanded permissions for the administration role", async () => {- const response = await api.get("/vendor/rbac/me/permissions", headers)-- expect(response.status).toEqual(200)- expect(Array.isArray(response.data.permissions)).toBe(true)- expect(response.data.permissions).toEqual(- expect.arrayContaining(["product:read", "order:read", "offer:create"])- )- })-- it("returns no wildcard entries", async () => {- const response = await api.get("/vendor/rbac/me/permissions", headers)-- for (const permission of response.data.permissions) {- expect(permission).not.toContain("*")- }- })-- it("narrows to what a restricted role grants", async () => {- await setMemberRole(- appContainer,- seller.id,- member.id,- SellerRole.SUPPORT- )-- const response = await api.get("/vendor/rbac/me/permissions", headers)-- expect(response.status).toEqual(200)- expect(response.data.permissions).toEqual(- expect.arrayContaining(["order:read", "review:read"])- )- // Support cannot touch the catalog or billing.- expect(response.data.permissions).not.toContain("product:create")- expect(response.data.permissions).not.toContain("payout:read")- })-- it("is scoped to the seller the request acts on", async () => {- await setMemberRole(- appContainer,- seller.id,- member.id,- SellerRole.ACCOUNTING- )-- const response = await api.get("/vendor/rbac/me/permissions", headers)-- expect(response.data.permissions).toEqual(- expect.arrayContaining(["payout:read", "payout_account:update"])- )- expect(response.data.permissions).not.toContain("product:create")- })- })- },-})diff --git a/integration-tests/http/rbac/vendor/route-policies.spec.ts b/integration-tests/http/rbac/vendor/route-policies.spec.tsdeleted file mode 100644index 0446cd1b8..000000000--- a/integration-tests/http/rbac/vendor/route-policies.spec.ts+++ /dev/null@@ -1,193 +0,0 @@-import { MedusaContainer } from "@medusajs/framework/types"-import { Modules } from "@medusajs/framework/utils"-import { medusaIntegrationTestRunner } from "@medusajs/test-utils"-import { createSellerDefaultsWorkflow } from "@mercurjs/core/workflows"-import { SellerRole } from "@mercurjs/types"--import {- adminHeaders,- createAdminUser,-} from "../../../helpers/create-admin-user"-import { createSellerUser } from "../../../helpers/create-seller-user"--jest.setTimeout(90000)--/**- * Re-points the acting member at a different role. Roles are resolved per- * request from the seller_member row, so no new token is needed.- */-const setMemberRole = async (- container: MedusaContainer,- sellerId: string,- memberId: string,- roleId: string | null-) => {- const sellerModule: any = container.resolve("seller")-- const [sellerMember] = await sellerModule.listSellerMembers({- seller_id: sellerId,- member_id: memberId,- })-- await sellerModule.updateSellerMembers({- id: sellerMember.id,- role_id: roleId,- })-}--medusaIntegrationTestRunner({- testSuite: ({ getContainer, api, dbConnection }) => {- describe("RBAC - vendor route policies", () => {- let appContainer: MedusaContainer- let seller: any- let member: any- let headers: any-- beforeAll(async () => {- appContainer = getContainer()- })-- beforeEach(async () => {- await createSellerDefaultsWorkflow(appContainer).run()- await createAdminUser(dbConnection, adminHeaders, appContainer)-- const result = await createSellerUser(appContainer, {- email: "[email protected]",- name: "RBAC Store",- })-- seller = result.seller- member = result.member- headers = result.headers- })-- describe("seller administration", () => {- it("reaches routes across every domain", async () => {- const orders = await api.get("/vendor/orders", headers)- expect(orders.status).toEqual(200)-- const products = await api.get("/vendor/products", headers)- expect(products.status).toEqual(200)-- const payoutAccount = await api.get(- "/vendor/payout-accounts",- headers- )- expect([200, 404]).toContain(payoutAccount.status)- })- })-- describe("a role without the required policy", () => {- beforeEach(async () => {- await setMemberRole(- appContainer,- seller.id,- member.id,- SellerRole.SUPPORT- )- })-- it("allows a read the role does hold", async () => {- const response = await api.get("/vendor/orders", headers)- expect(response.status).toEqual(200)- })-- it("rejects a write the role does not hold", async () => {- const response = await api- .post("/vendor/products", { title: "Blocked" }, headers)- .catch((e) => e.response)-- expect(response.status).toEqual(403)- })-- it("rejects a read on a domain the role does not hold", async () => {- const response = await api- .get("/vendor/price-lists", headers)- .catch((e) => e.response)-- expect(response.status).toEqual(403)- })- })-- describe("inventory management", () => {- beforeEach(async () => {- await setMemberRole(- appContainer,- seller.id,- member.id,- SellerRole.INVENTORY_MANAGEMENT- )- })-- it("reaches the catalog", async () => {- const response = await api.get("/vendor/products", headers)- expect(response.status).toEqual(200)- })-- it("does not reach payouts", async () => {- const response = await api- .get("/vendor/payouts", headers)- .catch((e) => e.response)-- expect(response.status).toEqual(403)- })- })-- describe("a member with no role", () => {- beforeEach(async () => {- await setMemberRole(appContainer, seller.id, member.id, null)- })-- // Route policy checks reject an actor with an empty role list, so- // without the administration fallback these members would be locked- // out of their own store entirely.- it("is not locked out", async () => {- const response = await api.get("/vendor/products", headers)- expect(response.status).toEqual(200)- })- })-- describe("every member can read its own membership", () => {- it.each([- SellerRole.INVENTORY_MANAGEMENT,- SellerRole.ORDER_MANAGEMENT,- SellerRole.ACCOUNTING,- SellerRole.SUPPORT,- ])("resolves /vendor/members/me as %s", async (role) => {- await setMemberRole(appContainer, seller.id, member.id, role)-- const response = await api.get("/vendor/members/me", headers)- expect(response.status).toEqual(200)- })- })-- describe("default roles", () => {- it("binds policies to every seeded role", async () => {- const rbac: any = appContainer.resolve(Modules.RBAC)-- const rolePolicies = await rbac.listRbacRolePolicies({- role_id: [- SellerRole.INVENTORY_MANAGEMENT,- SellerRole.ORDER_MANAGEMENT,- SellerRole.ACCOUNTING,- SellerRole.SUPPORT,- ],- })-- const byRole = new Map<string, number>()- for (const rolePolicy of rolePolicies) {- byRole.set(- rolePolicy.role_id,- (byRole.get(rolePolicy.role_id) ?? 0) + 1- )- }-- expect(byRole.get(SellerRole.INVENTORY_MANAGEMENT)).toBeGreaterThan(0)- expect(byRole.get(SellerRole.ORDER_MANAGEMENT)).toBeGreaterThan(0)- expect(byRole.get(SellerRole.ACCOUNTING)).toBeGreaterThan(0)- expect(byRole.get(SellerRole.SUPPORT)).toBeGreaterThan(0)- })- })- })- },-})diff --git a/integration-tests/http/seller/vendor/seller.spec.ts b/integration-tests/http/seller/vendor/seller.spec.tsindex 34f08f7dc..b5a7be8a2 100644--- a/integration-tests/http/seller/vendor/seller.spec.ts+++ b/integration-tests/http/seller/vendor/seller.spec.ts@@ -5,7 +5,6 @@ import {createAdminUser,} from "../../../helpers/create-admin-user"import { createSellerUser } from "../../../helpers/create-seller-user"-import { createSellerDefaultsWorkflow } from "@mercurjs/core/workflows"import { SellerRole } from "@mercurjs/types"jest.setTimeout(50000)@@ -29,7 +28,6 @@ medusaIntegrationTestRunner({})beforeEach(async () => {- await createSellerDefaultsWorkflow(appContainer).run()await createAdminUser(dbConnection, adminHeaders, appContainer)const resultA = await createSellerUser(appContainer, {@@ -1157,7 +1155,7 @@ medusaIntegrationTestRunner({expect(sm).toHaveProperty("id")expect(sm).toHaveProperty("is_owner")expect(sm).toHaveProperty("member")- expect(sm).toHaveProperty("rbac_role")+ expect(sm).toHaveProperty("member_id")})it("should return different members for different users", async () => {diff --git a/integration-tests/http/store-info/vendor/stores.spec.ts b/integration-tests/http/store-info/vendor/stores.spec.tsindex 7ab08a263..50d99a7a4 100644--- a/integration-tests/http/store-info/vendor/stores.spec.ts+++ b/integration-tests/http/store-info/vendor/stores.spec.ts@@ -1,7 +1,6 @@import { medusaIntegrationTestRunner } from "@medusajs/test-utils"import { MedusaContainer } from "@medusajs/framework/types"import { Modules } from "@medusajs/framework/utils"-import { createSellerDefaultsWorkflow } from "@mercurjs/core/workflows"import { createSellerUser } from "../../../helpers/create-seller-user"jest.setTimeout(50000)@@ -17,7 +16,6 @@ medusaIntegrationTestRunner({})beforeEach(async () => {- await createSellerDefaultsWorkflow(appContainer).run()const result = await createSellerUser(appContainer, {email: "[email protected]",diff --git a/integration-tests/medusa-config.ts b/integration-tests/medusa-config.tsindex 85d1f5a99..00a42713e 100644--- a/integration-tests/medusa-config.ts+++ b/integration-tests/medusa-config.ts@@ -17,10 +17,6 @@ module.exports = withMercur({},featureFlags: {seller_registration: true,- // Core leaves RBAC dormant by default. Enable it for the suite so route- // policy declarations are actually exercised — both that restricted roles- // are refused and that the default roles can still reach their own screens.- rbac: true},modules: [{diff --git a/packages/admin/src/components/authentication/protected-route/protected-route.tsx b/packages/admin/src/components/authentication/protected-route/protected-route.tsxindex e616ea43c..013790fd9 100644--- a/packages/admin/src/components/authentication/protected-route/protected-route.tsx+++ b/packages/admin/src/components/authentication/protected-route/protected-route.tsx@@ -1,34 +1,14 @@import { Spinner } from "@medusajs/icons";-import { useMemo } from "react";import { Navigate, Outlet, useLocation } from "react-router-dom";-import { useMePermissions } from "../../../hooks/api/rbac-roles";import { useMe } from "../../../hooks/api/users";-import type { Permission, UserPolicy } from "@mercurjs/dashboard-sdk";import { PermissionsProvider } from "@mercurjs/dashboard-shared";-import { useFeatureFlag } from "../../../providers/feature-flag-provider";import { SearchProvider } from "../../../providers/search-provider";import { SidebarProvider } from "../../../providers/sidebar-provider";export const ProtectedRoute = () => {const location = useLocation();- const isRbacEnabled = useFeatureFlag("rbac");const { user, isLoading: isLoadingUser } = useMe();- const { data: permissionsResponse, isLoading: isLoadingPermissions } =- useMePermissions({- // Don't fetch permissions until we know the user is authenticated.- enabled: !!user && isRbacEnabled,- });-- const policy: UserPolicy | null = useMemo(() => {- if (!permissionsResponse) {- return null;- }- return {- permissions: permissionsResponse.permissions as Permission[],- };- }, [permissionsResponse]);-if (isLoadingUser) {return (<div className="flex min-h-screen items-center justify-center">@@ -43,9 +23,7 @@ export const ProtectedRoute = () => {return (<PermissionsProvider- policy={policy}- isLoading={isLoadingPermissions}- isRbacEnabled={isRbacEnabled}+ permissions={user.permissions ?? null}><SidebarProvider><SearchProvider>diff --git a/packages/admin/src/get-route-map.tsx b/packages/admin/src/get-route-map.tsxindex e983fd383..61dbbdfe9 100644--- a/packages/admin/src/get-route-map.tsx+++ b/packages/admin/src/get-route-map.tsx@@ -91,7 +91,7 @@ export function getRouteMap({errorElement: <ErrorBoundary />,handle: {breadcrumb: () => t("products.domain"),- permissions: "product:read",+ permissions: "products:view",},children: [{@@ -100,7 +100,7 @@ export function getRouteMap({children: [{path: "create",- handle: { permissions: "product:create" },+ handle: { permissions: "products:edit" },lazy: () => import("./pages/products/product-create"),},{@@ -134,7 +134,7 @@ export function getRouteMap({children: [{path: "edit",- handle: { permissions: "product:update" },+ handle: { permissions: "products:edit" },lazy: () => import("./pages/products/product-edit"),},{@@ -219,7 +219,7 @@ export function getRouteMap({children: [{path: "edit",- handle: { permissions: "product:update" },+ handle: { permissions: "products:edit" },lazy: () =>import("./pages/product-variants/product-variant-edit"),},@@ -241,7 +241,7 @@ export function getRouteMap({errorElement: <ErrorBoundary />,handle: {breadcrumb: () => t("categories.domain"),- permissions: "product_category:read",+ permissions: "product_categories:view",},children: [{@@ -250,7 +250,7 @@ export function getRouteMap({children: [{path: "create",- handle: { permissions: "product_category:create" },+ handle: { permissions: "product_categories:edit" },lazy: () =>import("./pages/categories/category-create"),},@@ -285,7 +285,7 @@ export function getRouteMap({children: [{path: "edit",- handle: { permissions: "product_category:update" },+ handle: { permissions: "product_categories:edit" },lazy: () =>import("./pages/categories/category-edit"),},@@ -325,7 +325,7 @@ export function getRouteMap({errorElement: <ErrorBoundary />,handle: {breadcrumb: () => t("orders.domain"),- permissions: "order:read",+ permissions: "orders:view",},children: [{@@ -413,7 +413,7 @@ export function getRouteMap({errorElement: <ErrorBoundary />,handle: {breadcrumb: () => t("promotions.domain"),- permissions: "promotion:read",+ permissions: "promotions:view",},children: [{@@ -422,7 +422,7 @@ export function getRouteMap({},{path: "create",- handle: { permissions: "promotion:create" },+ handle: { permissions: "promotions:edit" },lazy: () => import("./pages/promotions/promotion-create"),},{@@ -449,7 +449,7 @@ export function getRouteMap({children: [{path: "edit",- handle: { permissions: "promotion:update" },+ handle: { permissions: "promotions:edit" },lazy: () =>import("./pages/promotions/promotion-edit-details"),},@@ -474,7 +474,7 @@ export function getRouteMap({errorElement: <ErrorBoundary />,handle: {breadcrumb: () => t("campaigns.domain"),- permissions: "campaign:read",+ permissions: "campaigns:view",},children: [{@@ -484,7 +484,7 @@ export function getRouteMap({},{path: "create",- handle: { permissions: "campaign:create" },+ handle: { permissions: "campaigns:edit" },lazy: () => import("./pages/campaigns/campaign-create"),},{@@ -510,7 +510,7 @@ export function getRouteMap({children: [{path: "edit",- handle: { permissions: "campaign:update" },+ handle: { permissions: "campaigns:edit" },lazy: () =>import("./pages/campaigns/campaign-edit"),},@@ -540,7 +540,7 @@ export function getRouteMap({errorElement: <ErrorBoundary />,handle: {breadcrumb: () => t("reviews.domain"),- permissions: "review:read",+ permissions: "reviews:view",},children: [{@@ -572,7 +572,7 @@ export function getRouteMap({children: [{path: "edit",- handle: { permissions: "review:update" },+ handle: { permissions: "reviews:edit" },lazy: () => import("./pages/reviews/review-edit"),},{@@ -591,7 +591,7 @@ export function getRouteMap({errorElement: <ErrorBoundary />,handle: {breadcrumb: () => t("collections.domain"),- permissions: "product_collection:read",+ permissions: "product_collections:view",},children: [{@@ -600,7 +600,7 @@ export function getRouteMap({children: [{path: "create",- handle: { permissions: "product_collection:create" },+ handle: { permissions: "product_collections:edit" },lazy: () =>import("./pages/collections/collection-create"),},@@ -630,7 +630,7 @@ export function getRouteMap({children: [{path: "edit",- handle: { permissions: "product_collection:update" },+ handle: { permissions: "product_collections:edit" },lazy: () =>import("./pages/collections/collection-edit"),},@@ -665,7 +665,7 @@ export function getRouteMap({errorElement: <ErrorBoundary />,handle: {breadcrumb: () => t("priceLists.domain"),- permissions: "price_list:read",+ permissions: "price_lists:view",},children: [{@@ -674,7 +674,7 @@ export function getRouteMap({children: [{path: "create",- handle: { permissions: "price_list:create" },+ handle: { permissions: "price_lists:edit" },lazy: () =>import("./pages/price-lists/price-list-create"),},@@ -704,7 +704,7 @@ export function getRouteMap({children: [{path: "edit",- handle: { permissions: "price_list:update" },+ handle: { permissions: "price_lists:edit" },lazy: () =>import("./pages/price-lists/price-list-edit"),},@@ -741,7 +741,7 @@ export function getRouteMap({errorElement: <ErrorBoundary />,handle: {breadcrumb: () => t("customers.domain"),- permissions: "customer:read",+ permissions: "customers:view",},children: [{@@ -750,7 +750,7 @@ export function getRouteMap({children: [{path: "create",- handle: { permissions: "customer:create" },+ handle: { permissions: "customers:edit" },lazy: () => import("./pages/customers/customer-create"),},],@@ -778,7 +778,7 @@ export function getRouteMap({children: [{path: "edit",- handle: { permissions: "customer:update" },+ handle: { permissions: "customers:edit" },lazy: () =>import("./pages/customers/customer-edit"),},@@ -818,7 +818,7 @@ export function getRouteMap({errorElement: <ErrorBoundary />,handle: {breadcrumb: () => t("customerGroups.domain"),- permissions: "customer_group:read",+ permissions: "customer_groups:view",},children: [{@@ -828,7 +828,7 @@ export function getRouteMap({children: [{path: "create",- handle: { permissions: "customer_group:create" },+ handle: { permissions: "customer_groups:edit" },lazy: () =>import("./pages/customer-groups/customer-group-create"),},@@ -858,7 +858,7 @@ export function getRouteMap({children: [{path: "edit",- handle: { permissions: "customer_group:update" },+ handle: { permissions: "customer_groups:edit" },lazy: () =>import("./pages/customer-groups/customer-group-edit"),},@@ -883,7 +883,7 @@ export function getRouteMap({errorElement: <ErrorBoundary />,handle: {breadcrumb: () => t("stores.domain"),- permissions: "seller:read",+ permissions: "sellers:view",},children: [{@@ -892,7 +892,7 @@ export function getRouteMap({children: [{path: "create",- handle: { permissions: "seller:create" },+ handle: { permissions: "sellers:edit" },lazy: () => import("./pages/stores/store-create"),},{@@ -923,7 +923,7 @@ export function getRouteMap({children: [{path: "edit",- handle: { permissions: "seller:update" },+ handle: { permissions: "sellers:edit" },lazy: () => import("./pages/stores/store-edit"),},{@@ -962,7 +962,7 @@ export function getRouteMap({errorElement: <ErrorBoundary />,handle: {breadcrumb: () => "Payouts",- permissions: "payout:read",+ permissions: "payouts:view",},children: [{@@ -999,7 +999,7 @@ export function getRouteMap({errorElement: <ErrorBoundary />,handle: {breadcrumb: () => t("reservations.domain"),- permissions: "reservation_item:read",+ permissions: "reservations:view",},children: [{@@ -1008,7 +1008,7 @@ export function getRouteMap({children: [{path: "create",- handle: { permissions: "reservation_item:create" },+ handle: { permissions: "reservations:edit" },lazy: () =>import("./pages/reservations/reservation-create"),},@@ -1038,7 +1038,7 @@ export function getRouteMap({children: [{path: "edit",- handle: { permissions: "reservation_item:update" },+ handle: { permissions: "reservations:edit" },lazy: () =>import("./pages/reservations/reservation-detail/components/edit-reservation"),},@@ -1058,7 +1058,7 @@ export function getRouteMap({errorElement: <ErrorBoundary />,handle: {breadcrumb: () => t("offers.domain"),- permissions: "offer:read",+ permissions: "offers:view",},children: [{@@ -1139,7 +1139,7 @@ export function getRouteMap({errorElement: <ErrorBoundary />,handle: {breadcrumb: () => t("inventory.domain"),- permissions: "inventory_item:read",+ permissions: "inventory_items:view",},children: [{@@ -1176,7 +1176,7 @@ export function getRouteMap({children: [{path: "edit",- handle: { permissions: "inventory_item:update" },+ handle: { permissions: "inventory_items:edit" },lazy: () =>import("./pages/inventory/inventory-detail/components/edit-inventory-item"),},@@ -1260,7 +1260,7 @@ export function getRouteMap({element: <Outlet />,handle: {breadcrumb: () => t("regions.domain"),- permissions: "region:read",+ permissions: "regions:view",},children: [{@@ -1269,7 +1269,7 @@ export function getRouteMap({children: [{path: "create",- handle: { permissions: "region:create" },+ handle: { permissions: "regions:edit" },lazy: () => import("./pages/regions/region-create"),},],@@ -1297,7 +1297,7 @@ export function getRouteMap({children: [{path: "edit",- handle: { permissions: "region:update" },+ handle: { permissions: "regions:edit" },lazy: () => import("./pages/regions/region-edit"),},{@@ -1322,7 +1322,7 @@ export function getRouteMap({element: <Outlet />,handle: {breadcrumb: () => t("marketplace.domain"),- permissions: "store:read",+ permissions: "store:view",},children: [{@@ -1332,7 +1332,7 @@ export function getRouteMap({children: [{path: "edit",- handle: { permissions: "store:update" },+ handle: { permissions: "store:edit" },lazy: () =>import("./pages/marketplace/marketplace-edit"),},@@ -1356,7 +1356,7 @@ export function getRouteMap({element: <Outlet />,handle: {breadcrumb: () => t("commissions.domain"),- permissions: "commission_rate:read",+ permissions: "commission_rates:view",},children: [{@@ -1366,7 +1366,7 @@ export function getRouteMap({children: [{path: "create",- handle: { permissions: "commission_rate:create" },+ handle: { permissions: "commission_rates:edit" },lazy: () =>import("./pages/commissions/commission-rule-create"),},@@ -1401,7 +1401,7 @@ export function getRouteMap({children: [{path: "edit",- handle: { permissions: "commission_rate:update" },+ handle: { permissions: "commission_rates:edit" },lazy: () =>import("./pages/commissions/commission-rule-edit"),},@@ -1424,7 +1424,7 @@ export function getRouteMap({element: <Outlet />,handle: {breadcrumb: () => t("users.domain"),- permissions: "user:read",+ permissions: "users:view",},children: [{@@ -1433,7 +1433,7 @@ export function getRouteMap({children: [{path: "invite",- handle: { permissions: "user:create" },+ handle: { permissions: "users:edit" },lazy: () => import("./pages/users/user-invite"),},],@@ -1461,7 +1461,7 @@ export function getRouteMap({children: [{path: "edit",- handle: { permissions: "user:update" },+ handle: { permissions: "users:edit" },lazy: () => import("./pages/users/user-edit"),},{@@ -1480,7 +1480,7 @@ export function getRouteMap({element: <Outlet />,handle: {breadcrumb: () => t("salesChannels.domain"),- permissions: "sales_channel:read",+ permissions: "sales_channels:view",},children: [{@@ -1490,7 +1490,7 @@ export function getRouteMap({children: [{path: "create",- handle: { permissions: "sales_channel:create" },+ handle: { permissions: "sales_channels:edit" },lazy: () =>import("./pages/sales-channels/sales-channel-create"),},@@ -1520,7 +1520,7 @@ export function getRouteMap({children: [{path: "edit",- handle: { permissions: "sales_channel:update" },+ handle: { permissions: "sales_channels:edit" },lazy: () =>import("./pages/sales-channels/sales-channel-edit"),},@@ -1546,7 +1546,7 @@ export function getRouteMap({element: <Outlet />,handle: {breadcrumb: () => t("locations.domain"),- permissions: "stock_location:read",+ permissions: "stock_locations:view",},children: [{@@ -1555,7 +1555,7 @@ export function getRouteMap({},{path: "create",- handle: { permissions: "stock_location:create" },+ handle: { permissions: "stock_locations:edit" },lazy: () => import("./pages/locations/location-create"),},{@@ -1563,7 +1563,7 @@ export function getRouteMap({element: <Outlet />,handle: {breadcrumb: () => t("shippingProfile.domain"),- permissions: "shipping_profile:read",+ permissions: "shipping_profiles:view",},children: [{@@ -1573,7 +1573,7 @@ export function getRouteMap({children: [{path: "create",- handle: { permissions: "shipping_profile:create" },+ handle: { permissions: "shipping_profiles:edit" },lazy: () =>import("./pages/shipping-profiles/shipping-profile-create"),},@@ -1619,7 +1619,7 @@ export function getRouteMap({element: <Outlet />,handle: {breadcrumb: () => t("shippingOptionTypes.domain"),- permissions: "shipping_option_type:read",+ permissions: "shipping_options:view",},children: [{@@ -1629,7 +1629,7 @@ export function getRouteMap({children: [{path: "create",- handle: { permissions: "shipping_option_type:create" },+ handle: { permissions: "shipping_options:edit" },lazy: () =>import("./pages/shipping-option-types/shipping-option-type-create"),},@@ -1660,7 +1660,7 @@ export function getRouteMap({children: [{path: "edit",- handle: { permissions: "shipping_option_type:update" },+ handle: { permissions: "shipping_options:edit" },lazy: () =>import("./pages/shipping-option-types/shipping-option-type-edit"),},@@ -1693,7 +1693,7 @@ export function getRouteMap({children: [{path: "edit",- handle: { permissions: "stock_location:update" },+ handle: { permissions: "stock_locations:edit" },lazy: () =>import("./pages/locations/location-edit"),},@@ -1720,7 +1720,7 @@ export function getRouteMap({children: [{path: "edit",- handle: { permissions: "stock_location:update" },+ handle: { permissions: "stock_locations:edit" },lazy: () =>import("./pages/locations/location-service-zone-edit"),},@@ -1734,7 +1734,7 @@ export function getRouteMap({children: [{path: "create",- handle: { permissions: "shipping_option:create" },+ handle: { permissions: "shipping_options:edit" },lazy: () =>import("./pages/locations/location-service-zone-shipping-option-create"),},@@ -1743,7 +1743,7 @@ export function getRouteMap({children: [{path: "edit",- handle: { permissions: "shipping_option:update" },+ handle: { permissions: "shipping_options:edit" },lazy: () =>import("./pages/locations/location-service-zone-shipping-option-edit"),},@@ -1772,7 +1772,7 @@ export function getRouteMap({element: <Outlet />,handle: {breadcrumb: () => t("productTags.domain"),- permissions: "product_tag:read",+ permissions: "product_tags:view",},children: [{@@ -1781,7 +1781,7 @@ export function getRouteMap({children: [{path: "create",- handle: { permissions: "product_tag:create" },+ handle: { permissions: "product_tags:edit" },lazy: () =>import("./pages/product-tags/product-tag-create"),},@@ -1811,7 +1811,7 @@ export function getRouteMap({children: [{path: "edit",- handle: { permissions: "product_tag:update" },+ handle: { permissions: "product_tags:edit" },lazy: () =>import("./pages/product-tags/product-tag-edit"),},@@ -1832,7 +1832,7 @@ export function getRouteMap({element: <Outlet />,handle: {breadcrumb: () => t("attributes.domain"),- permissions: "product_attribute:read",+ permissions: "product_attributes:view",},children: [{@@ -1841,7 +1841,7 @@ export function getRouteMap({children: [{path: "create",- handle: { permissions: "product_attribute:create" },+ handle: { permissions: "product_attributes:edit" },lazy: () =>import("./pages/attributes/attribute-create"),},@@ -1871,7 +1871,7 @@ export function getRouteMap({children: [{path: "edit",- handle: { permissions: "product_attribute:update" },+ handle: { permissions: "product_attributes:edit" },lazy: () =>import("./pages/attributes/attribute-edit"),},@@ -1902,7 +1902,7 @@ export function getRouteMap({element: <Outlet />,handle: {breadcrumb: () => t("productTypes.domain"),- permissions: "product_type:read",+ permissions: "product_types:view",},children: [{@@ -1912,7 +1912,7 @@ export function getRouteMap({children: [{path: "create",- handle: { permissions: "product_type:create" },+ handle: { permissions: "product_types:edit" },lazy: () =>import("./pages/product-types/product-type-create"),},@@ -1942,7 +1942,7 @@ export function getRouteMap({children: [{path: "edit",- handle: { permissions: "product_type:update" },+ handle: { permissions: "product_types:edit" },lazy: () =>import("./pages/product-types/product-type-edit"),},@@ -1962,7 +1962,7 @@ export function getRouteMap({element: <Outlet />,handle: {breadcrumb: () => t("apiKeyManagement.domain.publishable"),- permissions: "api_key:read",+ permissions: "api_keys:view",},children: [{@@ -1976,7 +1976,7 @@ export function getRouteMap({children: [{path: "create",- handle: { permissions: "api_key:create" },+ handle: { permissions: "api_keys:edit" },lazy: () =>import("./pages/api-key-management/api-key-management-create"),},@@ -2008,7 +2008,7 @@ export function getRouteMap({children: [{path: "edit",- handle: { permissions: "api_key:update" },+ handle: { permissions: "api_keys:edit" },lazy: () =>import("./pages/api-key-management/api-key-management-edit"),},@@ -2028,7 +2028,7 @@ export function getRouteMap({element: <Outlet />,handle: {breadcrumb: () => t("apiKeyManagement.domain.secret"),- permissions: "api_key:read",+ permissions: "api_keys:view",},children: [{@@ -2042,7 +2042,7 @@ export function getRouteMap({children: [{path: "create",- handle: { permissions: "api_key:create" },+ handle: { permissions: "api_keys:edit" },lazy: () =>import("./pages/api-key-management/api-key-management-create"),},@@ -2074,7 +2074,7 @@ export function getRouteMap({children: [{path: "edit",- handle: { permissions: "api_key:update" },+ handle: { permissions: "api_keys:edit" },lazy: () =>import("./pages/api-key-management/api-key-management-edit"),},@@ -2089,7 +2089,7 @@ export function getRouteMap({element: <Outlet />,handle: {breadcrumb: () => t("taxRegions.domain"),- permissions: "tax_region:read",+ permissions: "tax_regions:view",},children: [{@@ -2098,7 +2098,7 @@ export function getRouteMap({children: [{path: "create",- handle: { permissions: "tax_region:create" },+ handle: { permissions: "tax_regions:edit" },lazy: () =>import("./pages/tax-regions/tax-region-create"),},@@ -2127,7 +2127,7 @@ export function getRouteMap({children: [{path: "edit",- handle: { permissions: "tax_region:update" },+ handle: { permissions: "tax_regions:edit" },lazy: () =>import("./pages/tax-regions/tax-region-edit"),},@@ -2218,7 +2218,7 @@ export function getRouteMap({element: <Outlet />,handle: {breadcrumb: () => t("returnReasons.domain"),- permissions: "return_reason:read",+ permissions: "return_reasons:view",},children: [{@@ -2228,7 +2228,7 @@ export function getRouteMap({children: [{path: "create",- handle: { permissions: "return_reason:create" },+ handle: { permissions: "return_reasons:edit" },lazy: () =>import("./pages/return-reasons/return-reason-create"),},@@ -2238,7 +2238,7 @@ export function getRouteMap({children: [{path: "edit",- handle: { permissions: "return_reason:update" },+ handle: { permissions: "return_reasons:edit" },lazy: () =>import("./pages/return-reasons/return-reason-edit"),},@@ -2253,7 +2253,7 @@ export function getRouteMap({element: <Outlet />,handle: {breadcrumb: () => t("refundReasons.domain"),- permissions: "refund_reason:read",+ permissions: "refund_reasons:view",},children: [{@@ -2263,7 +2263,7 @@ export function getRouteMap({children: [{path: "create",- handle: { permissions: "refund_reason:create" },+ handle: { permissions: "refund_reasons:edit" },lazy: () =>import("./pages/refund-reasons/refund-reason-create"),},@@ -2273,7 +2273,7 @@ export function getRouteMap({children: [{path: "edit",- handle: { permissions: "refund_reason:update" },+ handle: { permissions: "refund_reasons:edit" },lazy: () =>import("./pages/refund-reasons/refund-reason-edit"),},diff --git a/packages/admin/src/hooks/api/rbac-roles.tsx b/packages/admin/src/hooks/api/rbac-roles.tsxdeleted file mode 100644index 4dbeac36d..000000000--- a/packages/admin/src/hooks/api/rbac-roles.tsx+++ /dev/null@@ -1,61 +0,0 @@-import { HttpTypes } from "@medusajs/types"-import { ClientError } from "@mercurjs/client"-import { QueryKey, UseQueryOptions, useQuery } from "@tanstack/react-query"--import { sdk } from "../../lib/client"--const ME_PERMISSIONS_QUERY_KEY = ["rbac_me_permissions"] as const--export const mePermissionsQueryKey = ME_PERMISSIONS_QUERY_KEY--export const useMePermissions = (- options?: Omit<- UseQueryOptions<- HttpTypes.AdminRbacMePermissionsResponse,- ClientError,- HttpTypes.AdminRbacMePermissionsResponse,- QueryKey- >,- "queryKey" | "queryFn"- >-) => {- return useQuery({- queryFn: () =>- sdk.admin.rbac.me.permissions.query(- {} as never- ) as unknown as Promise<HttpTypes.AdminRbacMePermissionsResponse>,- queryKey: mePermissionsQueryKey,- staleTime: 5 * 60 * 1000,- ...options,- })-}--const ASSIGNABLE_ROLES_QUERY_KEY = ["rbac_assignable_roles"] as const--export const assignableRolesQueryKey = ASSIGNABLE_ROLES_QUERY_KEY--/**- * Fetches the roles the authenticated actor is allowed to assign.- */-export const useRbacAssignableRoles = (- query?: HttpTypes.AdminRbacRoleListParams,- options?: Omit<- UseQueryOptions<- HttpTypes.AdminRbacAssignableRolesListResponse,- ClientError,- HttpTypes.AdminRbacAssignableRolesListResponse,- QueryKey- >,- "queryKey" | "queryFn"- >-) => {- return useQuery({- queryFn: () =>- sdk.admin.rbac.roles.assignable.query({- ...query,- } as never) as unknown as Promise<HttpTypes.AdminRbacAssignableRolesListResponse>,- queryKey: [...ASSIGNABLE_ROLES_QUERY_KEY, query],- staleTime: 5 * 60 * 1000,- ...options,- })-}diff --git a/packages/admin/src/hooks/api/users.tsx b/packages/admin/src/hooks/api/users.tsxindex 8b5ca2b3b..29e4a83f3 100644--- a/packages/admin/src/hooks/api/users.tsx+++ b/packages/admin/src/hooks/api/users.tsx@@ -33,7 +33,11 @@ export const useMe = (>) => {const { data, ...rest } = useQuery({- queryFn: () => sdk.admin.users.me.query({ ...query }),+ queryFn: () =>+ sdk.admin.users.me.query({+ ...query,+ fields: [query?.fields, "+permissions"].filter(Boolean).join(","),+ }),queryKey: usersQueryKeys.me(),...options,})diff --git a/packages/admin/src/index.ts b/packages/admin/src/index.tsindex 448d92b19..bb2ac363c 100644--- a/packages/admin/src/index.ts+++ b/packages/admin/src/index.ts@@ -21,28 +21,19 @@ export { ActionMenu } from './components/common/action-menu'// Product constantsexport { PRODUCT_DETAIL_FIELDS, PRODUCT_DETAIL_QUERY } from './pages/products/constants'-// Permissions (RBAC)+// Permissionsexport {PermissionGuard,PermissionsProvider,- PermissionsRequirement,- PermissionsRequirementsProvider,- RequiredPermissionsSection,RoutePermissionGuard,usePermissions,- useRegisterPermissions,- useRequiredPermissions,useResourcePermissions,} from '@mercurjs/dashboard-shared'-export type {- PermissionGuardProps,- PermissionsRequirementProps,-} from '@mercurjs/dashboard-shared'+export type { PermissionGuardProps } from '@mercurjs/dashboard-shared'export type {Permission,- PermissionOperation,- PermissionRequirement,- PermissionResource,+ PermissionKey,+ PermissionMap,+ PermissionRight,RouteHandle,- UserPolicy,} from '@mercurjs/dashboard-sdk'\ No newline at end of filediff --git a/packages/admin/src/lib/permissions/__tests__/resource-parity.spec.ts b/packages/admin/src/lib/permissions/__tests__/resource-parity.spec.tsdeleted file mode 100644index c1c577ce1..000000000--- a/packages/admin/src/lib/permissions/__tests__/resource-parity.spec.ts+++ /dev/null@@ -1,116 +0,0 @@-import fs from "fs"-import path from "path"-import { describe, expect, test } from "vitest"--/**- * `PermissionResource` (dashboard-sdk) and the policies registered server-side- * are two hand-maintained lists that have to agree. A name present in only one- * of them is not a type error — a guard for an unregistered resource simply- * never matches a granted policy, so it fails silently and permanently.- */--const repoRoot = path.resolve(__dirname, "../../../../../..")--const readResources = (file: string): string[] => {- const source = fs.readFileSync(file, "utf-8")- return [...source.matchAll(/"([a-z_]+)"/g)].map((match) => match[1])-}--const readDir = (dir: string): string[] =>- fs- .readdirSync(dir)- .filter((file) => file.endsWith(".ts"))- .flatMap((file) => readResources(path.join(dir, file)))--const OPERATIONS = new Set(["read", "create", "update", "delete"])--const registeredResources = new Set(- readDir(path.join(repoRoot, "packages/core/src/policies")).filter(- (name) => !OPERATIONS.has(name)- )-)--const unionResources = (() => {- const source = fs.readFileSync(- path.join(repoRoot, "packages/dashboard-sdk/src/permissions.ts"),- "utf-8"- )- const union = source.slice(- source.indexOf("export type PermissionResource ="),- source.indexOf("export type PermissionOperation")- )- return new Set([...union.matchAll(/"([a-z_]+)"/g)].map((m) => m[1]))-})()--const routeResources = (() => {- const source = fs.readFileSync(- path.join(repoRoot, "packages/core/src/api/utils/policy-resources.ts"),- "utf-8"- )- return new Set([...source.matchAll(/^\s+\w+: "([a-z_]+)",$/gm)].map((m) => m[1]))-})()--const routeMapPermissions = (() => {- const source = fs.readFileSync(- path.join(repoRoot, "packages/admin/src/get-route-map.tsx"),- "utf-8"- )- return new Set(- [...source.matchAll(/permissions: "([a-z_]+:[a-z*]+)"/g)].map((m) => m[1])- )-})()--const navPermissions = (() => {- const source = fs.readFileSync(- path.join(repoRoot, "packages/admin/src/lib/permissions/route-permissions.ts"),- "utf-8"- )- return new Set(- [...source.matchAll(/: "([a-z_]+:[a-z*]+)",$/gm)].map((m) => m[1])- )-})()--describe("sidebar and route map agree", () => {- // The sidebar hides a link using ROUTE_PERMISSIONS; the router refuses the- // route using the `handle` declared in get-route-map. If they disagree a- // section is either visible-but-unreachable or hidden-but-reachable.- test("every nav permission is enforced by a route", () => {- const missing = [...navPermissions].filter(- (permission) => !routeMapPermissions.has(permission)- )-- expect(missing).toEqual([])- })-})--describe("permission resource parity", () => {- test("every Mercur-registered policy resource is in PermissionResource", () => {- const missing = [...registeredResources].filter(- (name) => !unionResources.has(name)- )-- expect(missing).toEqual([])- })-- test("every resource named by a route policy is in PermissionResource", () => {- const missing = [...routeResources].filter(- (name) => !unionResources.has(name)- )-- expect(missing).toEqual([])- })-- test("PermissionResource has no duplicates", () => {- const source = fs.readFileSync(- path.join(repoRoot, "packages/dashboard-sdk/src/permissions.ts"),- "utf-8"- )- const union = source.slice(- source.indexOf("export type PermissionResource ="),- source.indexOf("export type PermissionOperation")- )- const all = [...union.matchAll(/"([a-z_]+)"/g)].map((m) => m[1])-- expect(all.length).toEqual(new Set(all).size)- })-})diff --git a/packages/admin/src/lib/permissions/route-permissions.ts b/packages/admin/src/lib/permissions/route-permissions.tsindex a7351e0d0..b0c6c40bb 100644--- a/packages/admin/src/lib/permissions/route-permissions.ts+++ b/packages/admin/src/lib/permissions/route-permissions.ts@@ -11,38 +11,38 @@ import type { Permission } from "@mercurjs/dashboard-sdk"* profile, and anything scoped to the acting user).*/export const ROUTE_PERMISSIONS: Record<string, Permission> = {- "/orders": "order:read",- "/products": "product:read",- "/offers": "offer:read",- "/collections": "product_collection:read",- "/categories": "product_category:read",- "/inventory": "inventory_item:read",- "/reservations": "reservation_item:read",- "/customers": "customer:read",- "/customer-groups": "customer_group:read",- "/promotions": "promotion:read",- "/campaigns": "campaign:read",- "/price-lists": "price_list:read",- "/stores": "seller:read",- "/reviews": "review:read",- "/payouts": "payout:read",+ "/orders": "orders:view",+ "/products": "products:view",+ "/offers": "offers:view",+ "/collections": "product_collections:view",+ "/categories": "product_categories:view",+ "/inventory": "inventory_items:view",+ "/reservations": "reservations:view",+ "/customers": "customers:view",+ "/customer-groups": "customer_groups:view",+ "/promotions": "promotions:view",+ "/campaigns": "campaigns:view",+ "/price-lists": "price_lists:view",+ "/stores": "sellers:view",+ "/reviews": "reviews:view",+ "/payouts": "payouts:view",- "/settings/regions": "region:read",- "/settings/marketplace": "store:read",- "/settings/commissions": "commission_rate:read",- "/settings/users": "user:read",- "/settings/sales-channels": "sales_channel:read",- "/settings/locations": "stock_location:read",- "/settings/product-tags": "product_tag:read",- "/settings/product-types": "product_type:read",- "/settings/attributes": "product_attribute:read",- "/settings/shipping-profiles": "shipping_profile:read",- "/settings/shipping-option-types": "shipping_option_type:read",- "/settings/return-reasons": "return_reason:read",- "/settings/refund-reasons": "refund_reason:read",- "/settings/tax-regions": "tax_region:read",- "/settings/publishable-api-keys": "api_key:read",- "/settings/secret-api-keys": "api_key:read",+ "/settings/regions": "regions:view",+ "/settings/marketplace": "store:view",+ "/settings/commissions": "commission_rates:view",+ "/settings/users": "users:view",+ "/settings/sales-channels": "sales_channels:view",+ "/settings/locations": "stock_locations:view",+ "/settings/product-tags": "product_tags:view",+ "/settings/product-types": "product_types:view",+ "/settings/attributes": "product_attributes:view",+ "/settings/shipping-profiles": "shipping_profiles:view",+ "/settings/shipping-option-types": "shipping_options:view",+ "/settings/return-reasons": "return_reasons:view",+ "/settings/refund-reasons": "refund_reasons:view",+ "/settings/tax-regions": "tax_regions:view",+ "/settings/publishable-api-keys": "api_keys:view",+ "/settings/secret-api-keys": "api_keys:view",}export const getRoutePermission = (path: string): Permission | undefined =>diff --git a/packages/admin/src/pages/api-key-management/api-key-management-list/components/api-key-management-list-table/api-key-management-list-table.tsx b/packages/admin/src/pages/api-key-management/api-key-management-list/components/api-key-management-list-table/api-key-management-list-table.tsxindex c0ef1c500..7cc0e34ad 100644--- a/packages/admin/src/pages/api-key-management/api-key-management-list/components/api-key-management-list-table/api-key-management-list-table.tsx+++ b/packages/admin/src/pages/api-key-management/api-key-management-list/components/api-key-management-list-table/api-key-management-list-table.tsx@@ -65,7 +65,7 @@ export const ApiKeyManagementListTable = ({: t("apiKeyManagement.subtitle.secret")}</Text></div>- <PermissionGuard resource="api_key" operation="create">+ <PermissionGuard permission="api_keys:edit"><Link to="create" data-testid={`${keyType}-api-keys-create-button`}><Button variant="secondary" size="small">{t("actions.create")}diff --git a/packages/admin/src/pages/api-key-management/api-key-management-list/components/api-key-management-list-view/api-key-management-list-header.tsx b/packages/admin/src/pages/api-key-management/api-key-management-list/components/api-key-management-list-view/api-key-management-list-header.tsxindex e1e5d1c6d..ee1315318 100644--- a/packages/admin/src/pages/api-key-management/api-key-management-list/components/api-key-management-list-view/api-key-management-list-header.tsx+++ b/packages/admin/src/pages/api-key-management/api-key-management-list/components/api-key-management-list-view/api-key-management-list-header.tsx@@ -44,7 +44,7 @@ export const ApiKeyManagementListActions = ({{Children.count(children) > 0 ? (children) : (- <PermissionGuard resource="api_key" operation="create">+ <PermissionGuard permission="api_keys:edit"><Link to="create" data-testid={`${keyType}-api-keys-create-button`}><Button variant="secondary" size="small">{t("actions.create")}diff --git a/packages/admin/src/pages/attributes/attribute-list/components/attribute-list-view/attribute-list-header.tsx b/packages/admin/src/pages/attributes/attribute-list/components/attribute-list-view/attribute-list-header.tsxindex 26c4bdc9d..020d06dce 100644--- a/packages/admin/src/pages/attributes/attribute-list/components/attribute-list-view/attribute-list-header.tsx+++ b/packages/admin/src/pages/attributes/attribute-list/components/attribute-list-view/attribute-list-header.tsx@@ -24,7 +24,7 @@ export const AttributeListActions = ({{Children.count(children) > 0 ? (children) : (- <PermissionGuard resource="product_attribute" operation="create">+ <PermissionGuard permission="product_attributes:edit"><Buttonvariant="secondary"size="small"diff --git a/packages/admin/src/pages/campaigns/campaign-list/components/campaign-list-table.tsx b/packages/admin/src/pages/campaigns/campaign-list/components/campaign-list-table.tsxindex bfda2a5c1..fe68ff93f 100644--- a/packages/admin/src/pages/campaigns/campaign-list/components/campaign-list-table.tsx+++ b/packages/admin/src/pages/campaigns/campaign-list/components/campaign-list-table.tsx@@ -33,7 +33,7 @@ export const CampaignListTitle = () => {export const CampaignListCreateButton = () => {const { t } = useTranslation()return (- <PermissionGuard resource="campaign" operation="create">+ <PermissionGuard permission="campaigns:edit"><Link to="/campaigns/create"><Button size="small" variant="secondary" data-testid="campaign-list-table-create-button">{t("actions.create")}diff --git a/packages/admin/src/pages/categories/category-list/components/category-list-table/category-list-header.tsx b/packages/admin/src/pages/categories/category-list/components/category-list-table/category-list-header.tsxindex 4dfdfc2d4..56e5f8dd8 100644--- a/packages/admin/src/pages/categories/category-list/components/category-list-table/category-list-header.tsx+++ b/packages/admin/src/pages/categories/category-list/components/category-list-table/category-list-header.tsx@@ -31,7 +31,7 @@ export const CategoryListActions = ({<Button size="small" variant="secondary" asChild><Link to="organize">{t("categories.organize.action")}</Link></Button>- <PermissionGuard resource="product_category" operation="create">+ <PermissionGuard permission="product_categories:edit"><Button size="small" variant="secondary" asChild><Link to="create">{t("actions.create")}</Link></Button>diff --git a/packages/admin/src/pages/collections/collection-list/components/collection-list-table/collection-list-header.tsx b/packages/admin/src/pages/collections/collection-list/components/collection-list-table/collection-list-header.tsxindex 9d0dbaa2e..a08aa8a47 100644--- a/packages/admin/src/pages/collections/collection-list/components/collection-list-table/collection-list-header.tsx+++ b/packages/admin/src/pages/collections/collection-list/components/collection-list-table/collection-list-header.tsx@@ -27,7 +27,7 @@ export const CollectionListActions = ({{Children.count(children) > 0 ? (children) : (- <PermissionGuard resource="product_collection" operation="create">+ <PermissionGuard permission="product_collections:edit"><Link to="/collections/create"><Button size="small" variant="secondary">{t("actions.create")}diff --git a/packages/admin/src/pages/commissions/commissions-list/components/commission-rules-table/commission-rules-header.tsx b/packages/admin/src/pages/commissions/commissions-list/components/commission-rules-table/commission-rules-header.tsxindex 23fcf7db4..eba930009 100644--- a/packages/admin/src/pages/commissions/commissions-list/components/commission-rules-table/commission-rules-header.tsx+++ b/packages/admin/src/pages/commissions/commissions-list/components/commission-rules-table/commission-rules-header.tsx@@ -9,7 +9,7 @@ export const CommissionRulesHeader = () => {return (<div className="flex items-center justify-between px-6 py-4"><Heading>{t("commissions.rules.title")}</Heading>- <PermissionGuard resource="commission_rate" operation="create">+ <PermissionGuard permission="commission_rates:edit"><Button size="small" variant="secondary" asChild><Link to="create">{t("actions.create")}</Link></Button>diff --git a/packages/admin/src/pages/customer-groups/customer-group-list/components/customer-group-list-table/customer-group-list-table.tsx b/packages/admin/src/pages/customer-groups/customer-group-list/components/customer-group-list-table/customer-group-list-table.tsxindex 8e2537bfc..8b39314b4 100644--- a/packages/admin/src/pages/customer-groups/customer-group-list/components/customer-group-list-table/customer-group-list-table.tsx+++ b/packages/admin/src/pages/customer-groups/customer-group-list/components/customer-group-list-table/customer-group-list-table.tsx@@ -40,7 +40,7 @@ export const CustomerGroupListTitle = () => {export const CustomerGroupListCreateButton = () => {const { t } = useTranslation()return (- <PermissionGuard resource="customer_group" operation="create">+ <PermissionGuard permission="customer_groups:edit"><Link to="/customer-groups/create"><Button size="small" variant="secondary">{t("actions.create")}diff --git a/packages/admin/src/pages/customers/customer-list/components/customer-list-table/customer-list-table.tsx b/packages/admin/src/pages/customers/customer-list/components/customer-list-table/customer-list-table.tsxindex 80af60091..13cd0912e 100644--- a/packages/admin/src/pages/customers/customer-list/components/customer-list-table/customer-list-table.tsx+++ b/packages/admin/src/pages/customers/customer-list/components/customer-list-table/customer-list-table.tsx@@ -30,7 +30,7 @@ export const CustomerListCreateButton = () => {const { t } = useTranslation()return (- <PermissionGuard resource="customer" operation="create">+ <PermissionGuard permission="customers:edit"><Link to="/customers/create" data-testid="customer-list-create-link"><Button size="small" variant="secondary" data-testid="customer-list-create-button">{t("actions.create")}diff --git a/packages/admin/src/pages/price-lists/price-list-list/components/price-list-list-table/price-list-list-header.tsx b/packages/admin/src/pages/price-lists/price-list-list/components/price-list-list-table/price-list-list-header.tsxindex 6549b67f1..623e27a62 100644--- a/packages/admin/src/pages/price-lists/price-list-list/components/price-list-list-table/price-list-list-header.tsx+++ b/packages/admin/src/pages/price-lists/price-list-list/components/price-list-list-table/price-list-list-header.tsx@@ -24,7 +24,7 @@ export const PriceListListActions = ({{Children.count(children) > 0 ? (children) : (- <PermissionGuard resource="price_list" operation="create">+ <PermissionGuard permission="price_lists:edit"><Button size="small" variant="secondary" asChild><Link to="create">{t("actions.create")}</Link></Button>diff --git a/packages/admin/src/pages/product-tags/product-tag-list/components/product-tag-list-table/product-tag-list-table.tsx b/packages/admin/src/pages/product-tags/product-tag-list/components/product-tag-list-table/product-tag-list-table.tsxindex a5f9d59d3..7c6b8c8e0 100644--- a/packages/admin/src/pages/product-tags/product-tag-list/components/product-tag-list-table/product-tag-list-table.tsx+++ b/packages/admin/src/pages/product-tags/product-tag-list/components/product-tag-list-table/product-tag-list-table.tsx@@ -57,7 +57,7 @@ export const ProductTagListTable = () => {<Container className="divide-y px-0 py-0" data-testid="product-tag-list-table-container"><div className="flex items-center justify-between px-6 py-4" data-testid="product-tag-list-table-header"><Heading data-testid="product-tag-list-table-heading">{t("productTags.domain")}</Heading>- <PermissionGuard resource="product_tag" operation="create">+ <PermissionGuard permission="product_tags:edit"><Button variant="secondary" size="small" asChild data-testid="product-tag-list-table-create-button"><Link to="create">{t("actions.create")}</Link></Button>diff --git a/packages/admin/src/pages/product-tags/product-tag-list/components/product-tag-list-view/product-tag-list-header.tsx b/packages/admin/src/pages/product-tags/product-tag-list/components/product-tag-list-view/product-tag-list-header.tsxindex 1606193d8..1aaf9f6d9 100644--- a/packages/admin/src/pages/product-tags/product-tag-list/components/product-tag-list-view/product-tag-list-header.tsx+++ b/packages/admin/src/pages/product-tags/product-tag-list/components/product-tag-list-view/product-tag-list-header.tsx@@ -24,7 +24,7 @@ export const ProductTagListActions = ({{Children.count(children) > 0 ? (children) : (- <PermissionGuard resource="product_tag" operation="create">+ <PermissionGuard permission="product_tags:edit"><Buttonvariant="secondary"size="small"diff --git a/packages/admin/src/pages/product-types/product-type-list/components/product-type-list-table/product-type-list-table.tsx b/packages/admin/src/pages/product-types/product-type-list/components/product-type-list-table/product-type-list-table.tsxindex 378962637..b30c6e4f3 100644--- a/packages/admin/src/pages/product-types/product-type-list/components/product-type-list-table/product-type-list-table.tsx+++ b/packages/admin/src/pages/product-types/product-type-list/components/product-type-list-table/product-type-list-table.tsx@@ -54,7 +54,7 @@ export const ProductTypeListTable = () => {{t("productTypes.subtitle")}</Text></div>- <PermissionGuard resource="product_type" operation="create">+ <PermissionGuard permission="product_types:edit"><Button size="small" variant="secondary" asChild data-testid="product-type-list-table-create-button"><Link to="create">{t("actions.create")}</Link></Button>diff --git a/packages/admin/src/pages/product-types/product-type-list/components/product-type-list-view/product-type-list-header.tsx b/packages/admin/src/pages/product-types/product-type-list/components/product-type-list-view/product-type-list-header.tsxindex 557dca799..aedde0cec 100644--- a/packages/admin/src/pages/product-types/product-type-list/components/product-type-list-view/product-type-list-header.tsx+++ b/packages/admin/src/pages/product-types/product-type-list/components/product-type-list-view/product-type-list-header.tsx@@ -33,7 +33,7 @@ export const ProductTypeListActions = ({{Children.count(children) > 0 ? (children) : (- <PermissionGuard resource="product_type" operation="create">+ <PermissionGuard permission="product_types:edit"><Buttonsize="small"variant="secondary"diff --git a/packages/admin/src/pages/products/product-list/components/product-list-table/product-list-table.tsx b/packages/admin/src/pages/products/product-list/components/product-list-table/product-list-table.tsxindex 3a0d94cce..845bb2b64 100644--- a/packages/admin/src/pages/products/product-list/components/product-list-table/product-list-table.tsx+++ b/packages/admin/src/pages/products/product-list/components/product-list-table/product-list-table.tsx@@ -50,7 +50,7 @@ export const ProductListCreateButton = () => {const { t } = useTranslation();return (- <PermissionGuard resource="product" operation="create">+ <PermissionGuard permission="products:edit"><Buttonsize="small"variant="secondary"diff --git a/packages/admin/src/pages/promotions/promotion-list/components/promotion-list-table/promotion-list-table.tsx b/packages/admin/src/pages/promotions/promotion-list/components/promotion-list-table/promotion-list-table.tsxindex 020dc17d2..9f90b0a1c 100644--- a/packages/admin/src/pages/promotions/promotion-list/components/promotion-list-table/promotion-list-table.tsx+++ b/packages/admin/src/pages/promotions/promotion-list/components/promotion-list-table/promotion-list-table.tsx@@ -35,7 +35,7 @@ export const PromotionListTitle = () => {export const PromotionListCreateButton = () => {const { t } = useTranslation()return (- <PermissionGuard resource="promotion" operation="create">+ <PermissionGuard permission="promotions:edit"><Button size="small" variant="secondary" asChild data-testid="promotion-list-table-create-button"><Link to="create">{t("actions.create")}</Link></Button>diff --git a/packages/admin/src/pages/reservations/reservation-list/components/reservation-list-table/reservation-list-table.tsx b/packages/admin/src/pages/reservations/reservation-list/components/reservation-list-table/reservation-list-table.tsxindex 1418c12c2..bebd4efb2 100644--- a/packages/admin/src/pages/reservations/reservation-list/components/reservation-list-table/reservation-list-table.tsx+++ b/packages/admin/src/pages/reservations/reservation-list/components/reservation-list-table/reservation-list-table.tsx@@ -33,7 +33,7 @@ export const ReservationListTitle = () => {export const ReservationListCreateButton = () => {const { t } = useTranslation()return (- <PermissionGuard resource="reservation_item" operation="create">+ <PermissionGuard permission="reservations:edit"><Button variant="secondary" size="small" asChild><Link to="create">{t("actions.create")}</Link></Button>diff --git a/packages/admin/src/pages/return-reasons/return-reason-list/components/return-reason-list-table/return-reason-list-table.tsx b/packages/admin/src/pages/return-reasons/return-reason-list/components/return-reason-list-table/return-reason-list-table.tsxindex dd9b7dab1..2d24fab30 100644--- a/packages/admin/src/pages/return-reasons/return-reason-list/components/return-reason-list-table/return-reason-list-table.tsx+++ b/packages/admin/src/pages/return-reasons/return-reason-list/components/return-reason-list-table/return-reason-list-table.tsx@@ -54,7 +54,7 @@ export const ReturnReasonListTable = () => {{t("returnReasons.subtitle")}</Text></div>- <PermissionGuard resource="return_reason" operation="create">+ <PermissionGuard permission="return_reasons:edit"><Button variant="secondary" size="small" asChild data-testid="return-reason-list-table-create-button"><Link to="create">{t("actions.create")}</Link></Button>diff --git a/packages/admin/src/pages/shipping-option-types/shipping-option-type-list/components/shipping-option-type-list-table/shipping-option-type-list-table.tsx b/packages/admin/src/pages/shipping-option-types/shipping-option-type-list/components/shipping-option-type-list-table/shipping-option-type-list-table.tsxindex ee8b61262..cc411b9bf 100644--- a/packages/admin/src/pages/shipping-option-types/shipping-option-type-list/components/shipping-option-type-list-table/shipping-option-type-list-table.tsx+++ b/packages/admin/src/pages/shipping-option-types/shipping-option-type-list/components/shipping-option-type-list-table/shipping-option-type-list-table.tsx@@ -51,7 +51,7 @@ export const ShippingOptionTypeListTable = () => {{t("shippingOptionTypes.subtitle")}</Text></div>- <PermissionGuard resource="shipping_option_type" operation="create">+ <PermissionGuard permission="shipping_options:edit"><Button size="small" variant="secondary" asChild data-testid="shipping-option-type-list-table-create-button"><Link to="create">{t("actions.create")}</Link></Button>diff --git a/packages/admin/src/pages/shipping-option-types/shipping-option-type-list/components/shipping-option-type-list-view/shipping-option-type-list-header.tsx b/packages/admin/src/pages/shipping-option-types/shipping-option-type-list/components/shipping-option-type-list-view/shipping-option-type-list-header.tsxindex f65ec12a4..2aab97fe3 100644--- a/packages/admin/src/pages/shipping-option-types/shipping-option-type-list/components/shipping-option-type-list-view/shipping-option-type-list-header.tsx+++ b/packages/admin/src/pages/shipping-option-types/shipping-option-type-list/components/shipping-option-type-list-view/shipping-option-type-list-header.tsx@@ -33,7 +33,7 @@ export const ShippingOptionTypeListActions = ({{Children.count(children) > 0 ? (children) : (- <PermissionGuard resource="shipping_option_type" operation="create">+ <PermissionGuard permission="shipping_options:edit"><Buttonsize="small"variant="secondary"diff --git a/packages/admin/src/pages/shipping-profiles/shipping-profiles-list/components/shipping-profile-list-table/shipping-profile-list-table.tsx b/packages/admin/src/pages/shipping-profiles/shipping-profiles-list/components/shipping-profile-list-table/shipping-profile-list-table.tsxindex 3aa6123c4..8f025c26d 100644--- a/packages/admin/src/pages/shipping-profiles/shipping-profiles-list/components/shipping-profile-list-table/shipping-profile-list-table.tsx+++ b/packages/admin/src/pages/shipping-profiles/shipping-profiles-list/components/shipping-profile-list-table/shipping-profile-list-table.tsx@@ -51,7 +51,7 @@ export const ShippingProfileListTable = () => {</Text></div><div>- <PermissionGuard resource="shipping_profile" operation="create">+ <PermissionGuard permission="shipping_profiles:edit"><Button size="small" variant="secondary" asChild data-testid="shipping-profile-list-table-create-button"><Link to="create">{t("actions.create")}</Link></Button>diff --git a/packages/admin/src/pages/shipping-profiles/shipping-profiles-list/components/shipping-profile-list-view/shipping-profile-list-header.tsx b/packages/admin/src/pages/shipping-profiles/shipping-profiles-list/components/shipping-profile-list-view/shipping-profile-list-header.tsxindex 602b3b2ee..c16f07468 100644--- a/packages/admin/src/pages/shipping-profiles/shipping-profiles-list/components/shipping-profile-list-view/shipping-profile-list-header.tsx+++ b/packages/admin/src/pages/shipping-profiles/shipping-profiles-list/components/shipping-profile-list-view/shipping-profile-list-header.tsx@@ -33,7 +33,7 @@ export const ShippingProfileListActions = ({{Children.count(children) > 0 ? (children) : (- <PermissionGuard resource="shipping_profile" operation="create">+ <PermissionGuard permission="shipping_profiles:edit"><Buttonsize="small"variant="secondary"diff --git a/packages/admin/src/pages/stores/store-list/components/store-list-table/store-list-header.tsx b/packages/admin/src/pages/stores/store-list/components/store-list-table/store-list-header.tsxindex 67b1b3753..8ab91b1a4 100644--- a/packages/admin/src/pages/stores/store-list/components/store-list-table/store-list-header.tsx+++ b/packages/admin/src/pages/stores/store-list/components/store-list-table/store-list-header.tsx@@ -25,7 +25,7 @@ export const StoreListActions = ({{Children.count(children) > 0 ? (children) : (- <PermissionGuard resource="seller" operation="create">+ <PermissionGuard permission="sellers:edit"><Link to="create"><Button variant="secondary" size="small">{t("actions.create")}diff --git a/packages/admin/src/pages/tax-regions/tax-region-list/components/tax-region-list-view/tax-region-list-header.tsx b/packages/admin/src/pages/tax-regions/tax-region-list/components/tax-region-list-view/tax-region-list-header.tsxindex 97ed107f2..ff8ce6435 100644--- a/packages/admin/src/pages/tax-regions/tax-region-list/components/tax-region-list-view/tax-region-list-header.tsx+++ b/packages/admin/src/pages/tax-regions/tax-region-list/components/tax-region-list-view/tax-region-list-header.tsx@@ -27,7 +27,7 @@ export const TaxRegionListActions = ({{Children.count(children) > 0 ? (children) : (- <PermissionGuard resource="tax_region" operation="create">+ <PermissionGuard permission="tax_regions:edit"><Link to="create"><Button size="small" variant="secondary">{t("actions.create")}diff --git a/packages/admin/src/pages/users/user-invite/components/invite-user-form/invite-user-form.tsx b/packages/admin/src/pages/users/user-invite/components/invite-user-form/invite-user-form.tsxindex 49c353730..f6f2465f4 100644--- a/packages/admin/src/pages/users/user-invite/components/invite-user-form/invite-user-form.tsx+++ b/packages/admin/src/pages/users/user-invite/components/invite-user-form/invite-user-form.tsx@@ -21,8 +21,6 @@ import { Trans, useTranslation } from "react-i18next";import * as zod from "zod";import { ActionMenu } from "../../../../../components/common/action-menu/index.ts";import { Form } from "../../../../../components/common/form/index.ts";-import { ListSummary } from "../../../../../components/common/list-summary/index.ts";-import { Combobox } from "../../../../../components/inputs/combobox/index.ts";import { RouteFocusModal } from "../../../../../components/modals/index.ts";import { _DataTable } from "../../../../../components/table/data-table/index.ts";import { KeyboundForm } from "../../../../../components/utilities/keybound-form/keybound-form.tsx";@@ -32,16 +30,12 @@ import {useInvites,useResendInvite,} from "../../../../../hooks/api/invites.tsx";-import { useRbacAssignableRoles } from "../../../../../hooks/api/rbac-roles.tsx";import { useUserInviteTableQuery } from "../../../../../hooks/table/query/use-user-invite-table-query.tsx";import { useDataTable } from "../../../../../hooks/use-data-table.tsx";import { isFetchError } from "../../../../../lib/is-fetch-error.ts";-import { useFeatureFlag } from "../../../../../providers/feature-flag-provider/index.tsx";-import { usePermissions } from "@mercurjs/dashboard-shared";const InviteUserSchema = zod.object({email: zod.string().email(),- roles: zod.array(zod.string()).optional(),});const PAGE_SIZE = 10;@@ -59,54 +53,16 @@ const INVITE_URL = `${window.location.origin}${getBaseUrl()}/invite?token=`;export const InviteUserForm = () => {const { t } = useTranslation();- const isRbacEnabled = useFeatureFlag("rbac");- const { hasPermission } = usePermissions();- const canReadRbacRoles = hasPermission("rbac_role:read");- const showRbacRolesField = isRbacEnabled && canReadRbacRoles;-const form = useForm<zod.infer<typeof InviteUserSchema>>({defaultValues: {email: "",- roles: [],},resolver: zodResolver(InviteUserSchema),});- const { data: assignableData, isPending: isRolesLoading } =- useRbacAssignableRoles(- { limit: 200, order: "name" },- { enabled: showRbacRolesField },- );-- const roleOptions = useMemo(() => {- return (assignableData?.roles ?? []).map((role) => ({- label: role.name,- value: role.id,- }));- }, [assignableData?.roles]);-- const inviteFields = useMemo(() => {- if (!showRbacRolesField) {- return undefined;- }-- return [- "id",- "email",- "accepted",- "token",- "expires_at",- "created_at",- "updated_at",- "rbac_roles.id",- "rbac_roles.name",- ].join(",");- }, [showRbacRolesField]);-const { raw, searchParams } = useUserInviteTableQuery({prefix: PREFIX,pageSize: PAGE_SIZE,- fields: inviteFields,});const {@@ -117,7 +73,7 @@ export const InviteUserForm = () => {error,} = useInvites(searchParams);- const columns = useColumns({ isRbacEnabled: showRbacRolesField });+ const columns = useColumns();const { table } = useDataTable({data: invites ?? [],@@ -133,15 +89,7 @@ export const InviteUserForm = () => {const handleSubmit = form.handleSubmit(async (values) => {try {- const payload: HttpTypes.AdminCreateInvite = {- email: values.email,- };-- if (showRbacRolesField && values.roles?.length) {- payload.roles = values.roles;- }-- await mutateAsync(payload);+ await mutateAsync({ email: values.email });form.reset();} catch (error) {if (isFetchError(error) && error.status === 400) {@@ -220,39 +168,6 @@ export const InviteUserForm = () => {);}}/>- {showRbacRolesField && (- <Form.Field- control={form.control}- name="roles"- render={({ field }) => {- return (- <Form.Item data-testid="user-invite-form-roles-item">- <Form.Label- optional- tooltip={t("users.inviteRolesTooltip")}- data-testid="user-invite-form-roles-label"- >- {t("roles.domain")}- </Form.Label>- <Form.Control data-testid="user-invite-form-roles-control">- <Combobox- {...field}- value={field.value ?? []}- onChange={(value) => {- field.onChange(value ?? []);- }}- options={roleOptions}- placeholder={t("labels.selectValues")}- disabled={isRolesLoading}- data-testid="user-invite-form-roles-input"- />- </Form.Control>- <Form.ErrorMessage data-testid="user-invite-form-roles-error" />- </Form.Item>- );- }}- />- )}</div><div className="flex items-center justify-end"><Button@@ -375,7 +290,7 @@ const InviteActions = ({ invite }: { invite: HttpTypes.AdminInvite }) => {const columnHelper = createColumnHelper<HttpTypes.AdminInvite>();-const useColumns = ({ isRbacEnabled }: { isRbacEnabled: boolean }) => {+const useColumns = () => {const { t } = useTranslation();return useMemo(@@ -386,32 +301,6 @@ const useColumns = ({ isRbacEnabled }: { isRbacEnabled: boolean }) => {return getValue();},}),- ...(isRbacEnabled- ? [- columnHelper.display({- id: "roles",- header: t("roles.domain"),- cell: ({ row }) => {- const roleNames =- row.original.rbac_roles?.map((role) => role.name) ?? [];-- if (!roleNames.length) {- return (- <Text size="small" className="text-ui-fg-subtle">- -- </Text>- );- }-- return (- <div className="flex items-center">- <ListSummary inline n={1} list={roleNames} />- </div>- );- },- }),- ]- : []),columnHelper.accessor("accepted", {header: t("fields.status"),cell: ({ getValue, row }) => {@@ -486,6 +375,6 @@ const useColumns = ({ isRbacEnabled }: { isRbacEnabled: boolean }) => {cell: ({ row }) => <InviteActions invite={row.original} />,}),],- [t, isRbacEnabled],+ [t],);};diff --git a/packages/admin/src/pages/users/user-list/components/user-list-table/user-list-header.tsx b/packages/admin/src/pages/users/user-list/components/user-list-table/user-list-header.tsxindex 1682e9471..183e0b6b7 100644--- a/packages/admin/src/pages/users/user-list/components/user-list-table/user-list-header.tsx+++ b/packages/admin/src/pages/users/user-list/components/user-list-table/user-list-header.tsx@@ -24,7 +24,7 @@ export const UserListActions = ({{Children.count(children) > 0 ? (children) : (- <PermissionGuard resource="user" operation="create">+ <PermissionGuard permission="users:edit"><Link to="invite"><Button size="small" variant="secondary">{t("users.invite")}diff --git a/packages/admin/src/utils/__tests__/routes.spec.ts b/packages/admin/src/utils/__tests__/routes.spec.tsindex ee5b34214..3a26ea047 100644--- a/packages/admin/src/utils/__tests__/routes.spec.ts+++ b/packages/admin/src/utils/__tests__/routes.spec.ts@@ -52,14 +52,14 @@ describe("createRouteMap breadcrumbs", () => {{path: "/settings/roles",Component,- handle: { breadcrumb: listCrumb, permissions: "role:read" } as RouteHandle,+ handle: { breadcrumb: listCrumb, permissions: "roles:view" } as RouteHandle,},],"/settings")expect(roles.handle).toEqual({ breadcrumb: listCrumb })- expect(await leafHandle(find(roles.children, ""))).toEqual({ permissions: "role:read" })+ expect(await leafHandle(find(roles.children, ""))).toEqual({ permissions: "roles:view" })})test("a segment without an index page gets no branch handle", async () => {diff --git a/packages/cli/routes-manifest.json b/packages/cli/routes-manifest.jsonindex 342ba0667..046b0cf11 100644--- a/packages/cli/routes-manifest.json+++ b/packages/cli/routes-manifest.json@@ -295,7 +295,7 @@"/admin/users/:id/reset-password": "typeof import(\"@medusajs/medusa/api/admin/users/[id]/reset-password/route\")","/admin/users/:id/roles": "typeof import(\"@medusajs/medusa/api/admin/users/[id]/roles/route\")","/admin/users/:id/roles/:role_id": "typeof import(\"@medusajs/medusa/api/admin/users/[id]/roles/[role_id]/route\")",- "/admin/users/me": "typeof import(\"@medusajs/medusa/api/admin/users/me/route\")",+ "/admin/users/me": "typeof import(\"@mercurjs/core/api/admin/users/me/route\")","/admin/views/:entity/columns": "typeof import(\"@medusajs/medusa/api/admin/views/[entity]/columns/route\")","/admin/views/:entity/configurations": "typeof import(\"@medusajs/medusa/api/admin/views/[entity]/configurations/route\")","/admin/views/:entity/configurations/:id": "typeof import(\"@medusajs/medusa/api/admin/views/[entity]/configurations/[id]/route\")",@@ -504,7 +504,6 @@"/vendor/promotions/:id/target-rules/batch": "typeof import(\"@mercurjs/core/api/vendor/promotions/[id]/target-rules/batch/route\")","/vendor/promotions/rule-attribute-options/:rule_type": "typeof import(\"@mercurjs/core/api/vendor/promotions/rule-attribute-options/[rule_type]/route\")","/vendor/promotions/rule-value-options/:rule_type/:rule_attribute_id": "typeof import(\"@mercurjs/core/api/vendor/promotions/rule-value-options/[rule_type]/[rule_attribute_id]/route\")",- "/vendor/rbac/me/permissions": "typeof import(\"@mercurjs/core/api/vendor/rbac/me/permissions/route\")","/vendor/refund-reasons": "typeof import(\"@mercurjs/core/api/vendor/refund-reasons/route\")","/vendor/refund-reasons/:id": "typeof import(\"@mercurjs/core/api/vendor/refund-reasons/[id]/route\")","/vendor/regions": "typeof import(\"@mercurjs/core/api/vendor/regions/route\")",diff --git a/packages/core/.mercur/routes.d.ts b/packages/core/.mercur/routes.d.tsindex 3a2593509..8e68a3d46 100644--- a/packages/core/.mercur/routes.d.ts+++ b/packages/core/.mercur/routes.d.ts@@ -483,7 +483,7 @@ export type Routes = {$roleId: typeof import("@medusajs/medusa/api/admin/users/[id]/roles/[role_id]/route");};};- me: typeof import("@medusajs/medusa/api/admin/users/me/route");+ me: typeof import("../src/api/admin/users/me/route");};views: {$entity: {@@ -931,11 +931,6 @@ export type Routes = {};stores: typeof import("../src/api/vendor/stores/route");uploads: typeof import("../src/api/vendor/uploads/route");- rbac: {- me: {- permissions: typeof import("../src/api/vendor/rbac/me/permissions/route");- };- };reviews: typeof import("../src/api/vendor/reviews/route") & {$id: typeof import("../src/api/vendor/reviews/[id]/route");};diff --git a/packages/core/src/__tests__/with-mercur.unit.spec.ts b/packages/core/src/__tests__/with-mercur.unit.spec.tsindex 51cb67ae5..1df17ba89 100644--- a/packages/core/src/__tests__/with-mercur.unit.spec.ts+++ b/packages/core/src/__tests__/with-mercur.unit.spec.ts@@ -9,8 +9,6 @@ jest.mock("../utils/disable-medusa-middlewares", () => ({import { withMercur } from "../with-mercur"-// Medusa's defineConfig registers rbac itself as `disable: true` when the flag-// is off, so only count entries that would actually load.const rbacModules = (config: ReturnType<typeof withMercur>) =>Object.values(config.modules ?? {}).filter((m) =>@@ -20,26 +18,10 @@ const rbacModules = (config: ReturnType<typeof withMercur>) =>)describe("withMercur", () => {- it("leaves the rbac flag and module out by default", () => {+ it("never enables Medusa's rbac flag or module", () => {const config = withMercur()- expect(config.featureFlags?.rbac).toBe(false)+ expect(config.featureFlags?.rbac).toBeFalsy()expect(rbacModules(config)).toHaveLength(0)})-- it("registers the rbac module when the flag is enabled", () => {- const config = withMercur({ featureFlags: { rbac: true } })-- expect(config.featureFlags?.rbac).toBe(true)- expect(rbacModules(config)).toHaveLength(1)- })-- it("does not duplicate an rbac module the project already registers", () => {- const config = withMercur({- featureFlags: { rbac: true },- modules: [{ resolve: "@medusajs/medusa/rbac" }],- })-- expect(rbacModules(config)).toHaveLength(1)- })})diff --git a/packages/core/src/api/__tests__/route-permissions.unit.spec.ts b/packages/core/src/api/__tests__/route-permissions.unit.spec.tsnew file mode 100644index 000000000..1ee692ac8--- /dev/null+++ b/packages/core/src/api/__tests__/route-permissions.unit.spec.ts@@ -0,0 +1,162 @@+jest.mock("sanitize-html", () =>+ Object.assign(+ jest.fn((value: string) => value),+ { simpleTransform: jest.fn() }+ )+)++import fs from "fs"+import path from "path"+import { MiddlewareRoute } from "@medusajs/framework/http"+import { PermissionRequirement } from "@mercurjs/types"++import { adminMiddlewares } from "../admin/middlewares"+import { vendorMiddlewares } from "../vendor/middlewares"+import { matchCoreRoutePermission } from "../admin/core-route-permissions"+import { REQUIRED_PERMISSION } from "../utils/permissions-middleware"+import { getPermission } from "../../permissions"++const API_DIR = path.join(__dirname, "..")+const METHODS = ["GET", "POST", "DELETE"] as const++// Reachable without a seller context or intentionally self-service.+const VENDOR_EXEMPT = [+ /^\/vendor\/sellers$/,+ /^\/vendor\/sellers\/select$/,+ /^\/vendor\/sellers\/me$/,+ /^\/vendor\/stores$/,+ /^\/vendor\/feature-flags$/,+ /^\/vendor\/members\/me$/,+ /^\/vendor\/members\/invites\/accept$/,+]++type RouteFile = { file: string; path: string; methods: string[] }++const crawl = (dir: string): string[] =>+ fs.readdirSync(dir, { withFileTypes: true }).flatMap((entry) => {+ const full = path.join(dir, entry.name)+ if (entry.isDirectory()) {+ return entry.name === "__tests__" ? [] : crawl(full)+ }+ return entry.name === "route.ts" ? [full] : []+ })++const routeFiles = (surface: "admin" | "vendor"): RouteFile[] =>+ crawl(path.join(API_DIR, surface)).map((file) => {+ const content = fs.readFileSync(file, "utf-8")+ const url =+ "/" ++ path+ .relative(API_DIR, path.dirname(file))+ .replace(/\\/g, "/")+ .replace(/\[([^\]]+)\]/g, "sample_$1")++ return {+ file,+ path: url,+ methods: METHODS.filter((method) =>+ new RegExp(`export\\s+(const|async function|function)\\s+${method}\\b`).test(content)+ ),+ authenticated: !/export\s+const\s+AUTHENTICATE\s*=\s*false/.test(content),+ }+ }).filter((route) => route.authenticated) as RouteFile[]++const matcherToRegex = (matcher: string | RegExp): RegExp => {+ if (matcher instanceof RegExp) {+ return matcher+ }+ const source = matcher+ .split("/")+ .map((segment) =>+ segment === "*"+ ? ".*"+ : segment.startsWith(":")+ ? "[^/]+"+ : segment.replace(/[.*+?^${}()|[\]\\]/g, "\\$&").replace(/\\\*/g, ".*")+ )+ .join("/")+ return new RegExp(`^${source}$`)+}++const routeRequirements = (+ routes: MiddlewareRoute[],+ url: string,+ method: string+): PermissionRequirement[] =>+ routes+ .filter((route) => {+ const methods = route.method+ ? Array.isArray(route.method)+ ? route.method+ : [route.method]+ : undefined+ return (+ (!methods || methods.includes(method as never)) &&+ matcherToRegex(route.matcher as string | RegExp).test(url)+ )+ })+ .flatMap((route) => route.middlewares ?? [])+ .map(+ (middleware) =>+ (middleware as unknown as Record<symbol, PermissionRequirement | undefined>)[+ REQUIRED_PERMISSION+ ]+ )+ .filter((requirement): requirement is PermissionRequirement => !!requirement)++describe("route permissions", () => {+ it("every authenticated vendor route declares a permission", () => {+ const missing = routeFiles("vendor").flatMap((route) =>+ VENDOR_EXEMPT.some((pattern) => pattern.test(route.path))+ ? []+ : route.methods+ .filter(+ (method) =>+ !routeRequirements(vendorMiddlewares, route.path, method).length+ )+ .map((method) => `${method} ${route.path}`)+ )++ expect(missing).toEqual([])+ })++ it("every Mercur admin route declares a permission", () => {+ const missing = routeFiles("admin").flatMap((route) =>+ route.methods+ .filter(+ (method) =>+ !routeRequirements(adminMiddlewares, route.path, method).length &&+ matchCoreRoutePermission(route.path, method) === undefined+ )+ .map((method) => `${method} ${route.path}`)+ )++ expect(missing).toEqual([])+ })++ it("only references permissions that exist for the surface", () => {+ const unknown = (["admin", "vendor"] as const).flatMap((surface) => {+ const routes = surface === "admin" ? adminMiddlewares : vendorMiddlewares+ return routes+ .flatMap((route) => route.middlewares ?? [])+ .map(+ (middleware) =>+ (middleware as unknown as Record<symbol, PermissionRequirement | undefined>)[+ REQUIRED_PERMISSION+ ]+ )+ .filter((requirement): requirement is PermissionRequirement => !!requirement)+ .filter((requirement) => {+ const definition = getPermission(requirement.key)+ return (+ !definition ||+ !definition.surface.includes(surface) ||+ !definition.rights.includes(requirement.right)+ )+ })+ .map((requirement) => `${surface} ${requirement.key}:${requirement.right}`)+ })++ expect([...new Set(unknown)]).toEqual([])+ })+})diff --git a/packages/core/src/api/admin/campaigns/middlewares.ts b/packages/core/src/api/admin/campaigns/middlewares.tsindex 59e915425..794fabbda 100644--- a/packages/core/src/api/admin/campaigns/middlewares.ts+++ b/packages/core/src/api/admin/campaigns/middlewares.ts@@ -1,5 +1,4 @@-import { PolicyOperation } from "@medusajs/framework/utils"-import { PolicyResource } from "../../utils/policy-resources"+import { requirePermission } from "../../utils"import { validateAndTransformQuery } from "@medusajs/framework"import { MiddlewareRoute } from "@medusajs/framework/http"import { listTransformQueryConfig } from "@medusajs/medusa/api/admin/campaigns/query-config"@@ -45,17 +44,12 @@ export const adminCampaignsMiddlewares: MiddlewareRoute[] = [method: ["GET"],matcher: LIST_MATCHER,middlewares: [+ requirePermission("campaigns", "view"),validateAndTransformQuery(AdminGetCampaignsWithFilters,listTransformQueryConfig),applyCampaignFilters,],- policies: [- {- resource: PolicyResource.campaign,- operation: PolicyOperation.read,- },- ],},]diff --git a/packages/core/src/api/admin/collections/middlewares.ts b/packages/core/src/api/admin/collections/middlewares.tsindex acd313e91..17d8a6391 100644--- a/packages/core/src/api/admin/collections/middlewares.ts+++ b/packages/core/src/api/admin/collections/middlewares.ts@@ -1,5 +1,4 @@-import { PolicyResource } from "../../utils/policy-resources"-import { PolicyOperation } from "@medusajs/framework/utils"+import { requirePermission } from "../../utils"import { MiddlewareRoute } from "@medusajs/framework/http"import {validateAndTransformBody,@@ -31,77 +30,53 @@ export const adminCollectionsMiddlewares: MiddlewareRoute[] = [method: ["GET"],matcher: "/admin/collections",middlewares: [+ requirePermission("product_collections", "view"),validateAndTransformQuery(AdminCollectionsParams,adminCollectionQueryConfig.list),],- policies: [- {- resource: PolicyResource.product_collection,- operation: PolicyOperation.read,- },- ],},{method: ["POST"],matcher: "/admin/collections",middlewares: [+ requirePermission("product_collections", "edit"),validateAndTransformBody(AdminCreateCollection),validateAndTransformQuery(AdminCollectionParams,adminCollectionQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.product_collection,- operation: PolicyOperation.create,- },- ],},{method: ["GET"],matcher: "/admin/collections/:id",middlewares: [+ requirePermission("product_collections", "view"),validateAndTransformQuery(AdminCollectionParams,adminCollectionQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.product_collection,- operation: PolicyOperation.read,- },- ],},{method: ["POST"],matcher: "/admin/collections/:id",middlewares: [+ requirePermission("product_collections", "edit"),validateAndTransformBody(AdminUpdateCollection),validateAndTransformQuery(AdminCollectionParams,adminCollectionQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.product_collection,- operation: PolicyOperation.update,- },- ],},{method: ["DELETE"],matcher: "/admin/collections/:id",- middlewares: [],- policies: [- {- resource: PolicyResource.product_collection,- operation: PolicyOperation.delete,- },+ middlewares: [+ requirePermission("product_collections", "manage"),],},]diff --git a/packages/core/src/api/admin/commission-rates/middlewares.ts b/packages/core/src/api/admin/commission-rates/middlewares.tsindex 381aafb1b..4b398d549 100644--- a/packages/core/src/api/admin/commission-rates/middlewares.ts+++ b/packages/core/src/api/admin/commission-rates/middlewares.ts@@ -1,5 +1,4 @@-import { PolicyResource } from "../../utils/policy-resources"-import { PolicyOperation } from "@medusajs/framework/utils"+import { requirePermission } from "../../utils"import { MiddlewareRoute } from "@medusajs/framework/http"import {validateAndTransformBody,@@ -20,90 +19,61 @@ export const adminCommissionRatesMiddlewares: MiddlewareRoute[] = [method: ["GET"],matcher: "/admin/commission-rates",middlewares: [+ requirePermission("commission_rates", "view"),validateAndTransformQuery(AdminGetCommissionRatesParams,adminCommissionRateQueryConfig.list),],- policies: [- {- resource: PolicyResource.commission_rate,- operation: PolicyOperation.read,- },- ],},{method: ["POST"],matcher: "/admin/commission-rates",middlewares: [+ requirePermission("commission_rates", "edit"),validateAndTransformBody(AdminCreateCommissionRate),validateAndTransformQuery(AdminGetCommissionRateParams,adminCommissionRateQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.commission_rate,- operation: PolicyOperation.create,- },- ],},{method: ["GET"],matcher: "/admin/commission-rates/:id",middlewares: [+ requirePermission("commission_rates", "view"),validateAndTransformQuery(AdminGetCommissionRateParams,adminCommissionRateQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.commission_rate,- operation: PolicyOperation.read,- },- ],},{method: ["POST"],matcher: "/admin/commission-rates/:id",middlewares: [+ requirePermission("commission_rates", "edit"),validateAndTransformBody(AdminUpdateCommissionRate),validateAndTransformQuery(AdminGetCommissionRateParams,adminCommissionRateQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.commission_rate,- operation: PolicyOperation.update,- },- ],},{method: ["DELETE"],matcher: "/admin/commission-rates/:id",- middlewares: [],- policies: [- {- resource: PolicyResource.commission_rate,- operation: PolicyOperation.delete,- },+ middlewares: [+ requirePermission("commission_rates", "manage"),],},{method: ["POST"],matcher: "/admin/commission-rates/:id/rules",middlewares: [+ requirePermission("commission_rates", "edit"),validateAndTransformBody(AdminBatchCommissionRules),],- policies: [- {- resource: PolicyResource.commission_rate,- operation: PolicyOperation.update,- },- ],},]diff --git a/packages/core/src/api/admin/core-route-permissions.ts b/packages/core/src/api/admin/core-route-permissions.tsnew file mode 100644index 000000000..02a643b20--- /dev/null+++ b/packages/core/src/api/admin/core-route-permissions.ts@@ -0,0 +1,109 @@+import {+ AuthenticatedMedusaRequest,+ MedusaNextFunction,+ MedusaResponse,+} from "@medusajs/framework"+import { PermissionRight } from "@mercurjs/types"++import { requirePermission } from "../utils/permissions-middleware"++type CoreRoutePermission = {+ pattern: RegExp+ key: string+ methods?: Partial<Record<string, PermissionRight>>+}++const byMethod = (method: string): PermissionRight =>+ method === "GET" || method === "HEAD"+ ? "view"+ : method === "DELETE"+ ? "manage"+ : "edit"++// First match wins, so specific rules come before their domain's catch-all.+export const CORE_ROUTE_PERMISSIONS: CoreRoutePermission[] = [+ { pattern: /^\/admin\/sellers\/[^/]+\/(approve|suspend|unsuspend|terminate|unterminate)$/, key: "sellers.approval" },+ { pattern: /^\/admin\/products\/[^/]+\/(confirm|reject|request-changes)$/, key: "products.review" },+ { pattern: /^\/admin\/product-changes\/[^/]+\/(confirm|decline|cancel)$/, key: "products.review" },++ { pattern: /^\/admin\/orders\/[^/]+\/(refund|credit-lines)/, key: "orders.refunds" },+ { pattern: /^\/admin\/payments\/[^/]+\/refund/, key: "orders.refunds" },+ { pattern: /^\/admin\/(returns|claims|exchanges)(\/|$)/, key: "orders.returns" },+ { pattern: /^\/admin\/(order-edits|order-changes)(\/|$)/, key: "orders.edits" },+ { pattern: /^\/admin\/(orders|draft-orders)(\/|$)/, key: "orders" },+ { pattern: /^\/admin\/(payments|payment-collections)(\/|$)/, key: "payments" },++ { pattern: /^\/admin\/customer-groups(\/|$)/, key: "customer_groups" },+ { pattern: /^\/admin\/customers(\/|$)/, key: "customers" },++ { pattern: /^\/admin\/product-categories(\/|$)/, key: "product_categories" },+ { pattern: /^\/admin\/collections(\/|$)/, key: "product_collections" },+ { pattern: /^\/admin\/product-types(\/|$)/, key: "product_types" },+ { pattern: /^\/admin\/product-tags(\/|$)/, key: "product_tags" },+ { pattern: /^\/admin\/(products|product-variants|product-options)(\/|$)/, key: "products" },+ { pattern: /^\/admin\/inventory-items(\/|$)/, key: "inventory_items" },+ { pattern: /^\/admin\/reservations(\/|$)/, key: "reservations" },+ { pattern: /^\/admin\/stock-locations(\/|$)/, key: "stock_locations" },+ { pattern: /^\/admin\/price-preferences(\/|$)/, key: "price_preferences" },+ { pattern: /^\/admin\/price-lists(\/|$)/, key: "price_lists" },+ { pattern: /^\/admin\/promotions(\/|$)/, key: "promotions" },+ { pattern: /^\/admin\/campaigns(\/|$)/, key: "campaigns" },+ { pattern: /^\/admin\/shipping-profiles(\/|$)/, key: "shipping_profiles" },+ { pattern: /^\/admin\/(shipping-options|shipping-option-types)(\/|$)/, key: "shipping_options" },+ { pattern: /^\/admin\/(fulfillment-sets|fulfillment-providers|fulfillments)(\/|$)/, key: "fulfillment_sets" },++ { pattern: /^\/admin\/(regions|currencies)(\/|$)/, key: "regions" },+ { pattern: /^\/admin\/(tax-regions|tax-rates|tax-providers)(\/|$)/, key: "tax_regions" },+ { pattern: /^\/admin\/sales-channels(\/|$)/, key: "sales_channels" },+ { pattern: /^\/admin\/return-reasons(\/|$)/, key: "return_reasons" },+ { pattern: /^\/admin\/refund-reasons(\/|$)/, key: "refund_reasons" },+ { pattern: /^\/admin\/stores(\/|$)/, key: "store" },+ { pattern: /^\/admin\/invites(\/|$)/, key: "users" },+ { pattern: /^\/admin\/users\/me$/, key: "users", methods: { GET: undefined } },+ { pattern: /^\/admin\/users(\/|$)/, key: "users" },+ { pattern: /^\/admin\/api-keys(\/|$)/, key: "api_keys" },+ { pattern: /^\/admin\/(translations|locales)(\/|$)/, key: "translations" },+ { pattern: /^\/admin\/notifications(\/|$)/, key: "notifications" },+ { pattern: /^\/admin\/workflows-executions(\/|$)/, key: "workflow_executions" },+ { pattern: /^\/admin\/(search|search-indexes|index|views|property-labels|plugins|layouts)(\/|$)/, key: "store" },+]++export function matchCoreRoutePermission(+ path: string,+ method: string+): { key: string; right: PermissionRight } | null | undefined {+ const rule = CORE_ROUTE_PERMISSIONS.find((candidate) =>+ candidate.pattern.test(path)+ )++ if (!rule) {+ return undefined+ }++ const upper = method.toUpperCase()+ if (rule.methods && upper in rule.methods) {+ const right = rule.methods[upper]+ return right ? { key: rule.key, right } : null+ }++ return { key: rule.key, right: byMethod(upper) }+}++/**+ * Guards the core Medusa admin routes Mercur exposes. The map is Mercur's own+ * and deliberately independent of Medusa's route `policies` declarations.+ */+export function enforceCoreRoutePermissions(+ req: AuthenticatedMedusaRequest,+ res: MedusaResponse,+ next: MedusaNextFunction+) {+ const path = (req.originalUrl ?? req.url).split("?")[0]+ const match = matchCoreRoutePermission(path, req.method)++ if (!match) {+ return next()+ }++ return requirePermission(match.key, match.right)(req, res, next)+}diff --git a/packages/core/src/api/admin/customer-groups/middlewares.ts b/packages/core/src/api/admin/customer-groups/middlewares.tsindex e894d1723..3e2a933ef 100644--- a/packages/core/src/api/admin/customer-groups/middlewares.ts+++ b/packages/core/src/api/admin/customer-groups/middlewares.ts@@ -1,5 +1,4 @@-import { PolicyOperation } from "@medusajs/framework/utils"-import { PolicyResource } from "../../utils/policy-resources"+import { requirePermission } from "../../utils"import {AuthenticatedMedusaRequest,maybeApplyLinkFilter,@@ -53,17 +52,12 @@ export const adminCustomerGroupsMiddlewares: MiddlewareRoute[] = [method: ["GET"],matcher: LIST_MATCHER,middlewares: [+ requirePermission("customer_groups", "view"),validateAndTransformQuery(AdminGetCustomerGroupsParams,listTransformQueryConfig),maybeApplyCustomerGroupSellerFilter,],- policies: [- {- resource: PolicyResource.customer_group,- operation: PolicyOperation.read,- },- ],},]diff --git a/packages/core/src/api/admin/inventory-items/middlewares.ts b/packages/core/src/api/admin/inventory-items/middlewares.tsindex 6e1d8cca8..23f7e42b1 100644--- a/packages/core/src/api/admin/inventory-items/middlewares.ts+++ b/packages/core/src/api/admin/inventory-items/middlewares.ts@@ -1,5 +1,4 @@-import { PolicyOperation } from "@medusajs/framework/utils"-import { PolicyResource } from "../../utils/policy-resources"+import { requirePermission } from "../../utils"import {AuthenticatedMedusaRequest,maybeApplyLinkFilter,@@ -59,17 +58,12 @@ export const adminInventoryItemsMiddlewares: MiddlewareRoute[] = [method: ["GET"],matcher: LIST_MATCHER,middlewares: [+ requirePermission("inventory_items", "view"),validateAndTransformQuery(AdminGetInventoryItemsParamsWithSeller,listTransformQueryConfig),maybeApplySellerInventoryFilter,],- policies: [- {- resource: PolicyResource.inventory_item,- operation: PolicyOperation.read,- },- ],},]diff --git a/packages/core/src/api/admin/members/middlewares.ts b/packages/core/src/api/admin/members/middlewares.tsindex 0e1723d4e..fe40bf319 100644--- a/packages/core/src/api/admin/members/middlewares.ts+++ b/packages/core/src/api/admin/members/middlewares.ts@@ -1,5 +1,4 @@-import { PolicyResource } from "../../utils/policy-resources"-import { PolicyOperation } from "@medusajs/framework/utils"+import { requirePermission } from "../../utils"import { MiddlewareRoute } from "@medusajs/framework/http"import { validateAndTransformQuery } from "@medusajs/framework"@@ -11,16 +10,11 @@ export const adminMembersMiddlewares: MiddlewareRoute[] = [method: ["GET"],matcher: "/admin/members",middlewares: [+ requirePermission("members", "view"),validateAndTransformQuery(AdminGetMembersParams,adminMemberListQueryConfig.list),],- policies: [- {- resource: PolicyResource.seller_member,- operation: PolicyOperation.read,- },- ],},]diff --git a/packages/core/src/api/admin/middlewares.ts b/packages/core/src/api/admin/middlewares.tsindex 657980829..fc0b76358 100644--- a/packages/core/src/api/admin/middlewares.ts+++ b/packages/core/src/api/admin/middlewares.ts@@ -1,7 +1,8 @@import { MiddlewareRoute } from "@medusajs/framework/http"import { validateAndTransformQuery } from "@medusajs/framework"-import { resolveAdminRolesMiddleware } from "../utils"+import { resolvePermissionsMiddleware } from "../utils"+import { enforceCoreRoutePermissions } from "./core-route-permissions"import { adminOrderGroupsMiddlewares } from "./order-groups/middlewares"import { adminOrderGroupQueryConfig } from "./order-groups/query-config"import { AdminGetOrderGroupParams } from "./order-groups/validators"@@ -31,7 +32,10 @@ import { adminReviewsMiddlewares } from "./reviews/middlewares"export const adminMiddlewares: MiddlewareRoute[] = [{matcher: "/admin/*",- middlewares: [resolveAdminRolesMiddleware],+ middlewares: [+ resolvePermissionsMiddleware("admin"),+ enforceCoreRoutePermissions,+ ],},...adminOrderGroupsMiddlewares,{diff --git a/packages/core/src/api/admin/offers/middlewares.ts b/packages/core/src/api/admin/offers/middlewares.tsindex d9355a191..d857f2951 100644--- a/packages/core/src/api/admin/offers/middlewares.ts+++ b/packages/core/src/api/admin/offers/middlewares.ts@@ -1,5 +1,4 @@-import { PolicyResource } from "../../utils/policy-resources"-import { PolicyOperation } from "@medusajs/framework/utils"+import { requirePermission } from "../../utils"import { MiddlewareRoute } from "@medusajs/framework/http"import {validateAndTransformBody,@@ -15,54 +14,44 @@ import {} from "./validators"export const adminOffersMiddlewares: MiddlewareRoute[] = [+ {+ method: ["DELETE"],+ matcher: "/admin/offers/:id",+ middlewares: [requirePermission("offers", "manage")],+ },{method: ["GET"],matcher: "/admin/offers",middlewares: [+ requirePermission("offers", "view"),validateAndTransformQuery(AdminGetOffersParams,adminOfferQueryConfig.list),applyGroupedOfferProductFilter,],- policies: [- {- resource: PolicyResource.offer,- operation: PolicyOperation.read,- },- ],},{method: ["POST"],matcher: "/admin/offers/batch",middlewares: [+ requirePermission("offers", "edit"),validateAndTransformBody(AdminCreateOffersBatch),validateAndTransformQuery(AdminGetOffersParams,adminOfferQueryConfig.list),],- policies: [- {- resource: PolicyResource.offer,- operation: PolicyOperation.create,- },- ],},{method: ["GET"],matcher: "/admin/offers/:id",middlewares: [+ requirePermission("offers", "view"),validateAndTransformQuery(AdminGetOfferParams,adminOfferQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.offer,- operation: PolicyOperation.read,- },- ],},]diff --git a/packages/core/src/api/admin/order-groups/middlewares.ts b/packages/core/src/api/admin/order-groups/middlewares.tsindex 195e7d15b..47a41daf6 100644--- a/packages/core/src/api/admin/order-groups/middlewares.ts+++ b/packages/core/src/api/admin/order-groups/middlewares.ts@@ -1,5 +1,4 @@-import { PolicyResource } from "../../utils/policy-resources"-import { PolicyOperation } from "@medusajs/framework/utils"+import { requirePermission } from "../../utils"import {validateAndTransformQuery,} from "@medusajs/framework"@@ -17,33 +16,23 @@ export const adminOrderGroupsMiddlewares: MiddlewareRoute[] = [method: ["GET"],matcher: "/admin/order-groups",middlewares: [+ requirePermission("order_groups", "view"),validateAndTransformQuery(AdminGetOrderGroupsParams,adminOrderGroupQueryConfig.list),applyOrderGroupSellerFilter,],- policies: [- {- resource: PolicyResource.order_group,- operation: PolicyOperation.read,- },- ],},{method: ["GET"],matcher: "/admin/order-groups/:id",middlewares: [+ requirePermission("order_groups", "view"),validateAndTransformQuery(AdminGetOrderGroupParams,adminOrderGroupQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.order_group,- operation: PolicyOperation.read,- },- ],},]diff --git a/packages/core/src/api/admin/orders/middlewares.ts b/packages/core/src/api/admin/orders/middlewares.tsindex e5bd85163..d3c5459ca 100644--- a/packages/core/src/api/admin/orders/middlewares.ts+++ b/packages/core/src/api/admin/orders/middlewares.ts@@ -1,5 +1,4 @@-import { PolicyOperation } from "@medusajs/framework/utils"-import { PolicyResource } from "../../utils/policy-resources"+import { requirePermission } from "../../utils"import {AuthenticatedMedusaRequest,maybeApplyLinkFilter,@@ -51,14 +50,9 @@ export const adminOrdersMiddlewares: MiddlewareRoute[] = [method: ["GET"],matcher: LIST_MATCHER,middlewares: [+ requirePermission("orders", "view"),validateAndTransformQuery(AdminGetOrdersParams, listTransformQueryConfig),maybeApplySellerOrderFilter,],- policies: [- {- resource: PolicyResource.order,- operation: PolicyOperation.read,- },- ],},]diff --git a/packages/core/src/api/admin/payouts/middlewares.ts b/packages/core/src/api/admin/payouts/middlewares.tsindex d806d7364..b7f80fdd2 100644--- a/packages/core/src/api/admin/payouts/middlewares.ts+++ b/packages/core/src/api/admin/payouts/middlewares.ts@@ -1,5 +1,4 @@-import { PolicyResource } from "../../utils/policy-resources"-import { PolicyOperation } from "@medusajs/framework/utils"+import { requirePermission } from "../../utils"import { MiddlewareRoute } from "@medusajs/framework/http"import { validateAndTransformQuery } from "@medusajs/framework"@@ -11,32 +10,22 @@ export const adminPayoutsMiddlewares: MiddlewareRoute[] = [method: ["GET"],matcher: "/admin/payouts",middlewares: [+ requirePermission("payouts", "view"),validateAndTransformQuery(AdminGetPayoutsParams,adminPayoutQueryConfig.list),],- policies: [- {- resource: PolicyResource.payout,- operation: PolicyOperation.read,- },- ],},{method: ["GET"],matcher: "/admin/payouts/:id",middlewares: [+ requirePermission("payouts", "view"),validateAndTransformQuery(AdminGetPayoutParams,adminPayoutQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.payout,- operation: PolicyOperation.read,- },- ],},]diff --git a/packages/core/src/api/admin/price-lists/middlewares.ts b/packages/core/src/api/admin/price-lists/middlewares.tsindex c784c3a0e..812eebf80 100644--- a/packages/core/src/api/admin/price-lists/middlewares.ts+++ b/packages/core/src/api/admin/price-lists/middlewares.ts@@ -1,5 +1,4 @@-import { PolicyOperation } from "@medusajs/framework/utils"-import { PolicyResource } from "../../utils/policy-resources"+import { requirePermission } from "../../utils"import { validateAndTransformQuery } from "@medusajs/framework"import { MiddlewareRoute } from "@medusajs/framework/http"import { listPriceListQueryConfig } from "@medusajs/medusa/api/admin/price-lists/query-config"@@ -62,16 +61,11 @@ export const adminPriceListsMiddlewares: MiddlewareRoute[] = [method: ["GET"],matcher: LIST_MATCHER,middlewares: [+ requirePermission("price_lists", "view"),validateAndTransformQuery(AdminGetPriceListsWithFilters,listPriceListQueryConfig),],- policies: [- {- resource: PolicyResource.price_list,- operation: PolicyOperation.read,- },- ],},]diff --git a/packages/core/src/api/admin/product-attributes/middlewares.ts b/packages/core/src/api/admin/product-attributes/middlewares.tsindex 87c2a6383..bd9d9543a 100644--- a/packages/core/src/api/admin/product-attributes/middlewares.ts+++ b/packages/core/src/api/admin/product-attributes/middlewares.ts@@ -1,5 +1,4 @@-import { PolicyResource } from "../../utils/policy-resources"-import { PolicyOperation } from "@medusajs/framework/utils"+import { requirePermission } from "../../utils"import {MedusaNextFunction,MedusaRequest,@@ -49,6 +48,7 @@ export const adminProductAttributesMiddlewares: MiddlewareRoute[] = [method: ["GET"],matcher: "/admin/product-attributes",middlewares: [+ requirePermission("product_attributes", "view"),validateAndTransformQuery(AdminGetProductAttributesParams,adminProductAttributeQueryConfig.list@@ -57,72 +57,47 @@ export const adminProductAttributesMiddlewares: MiddlewareRoute[] = [renameCategoryIdFilter,filterAttributesByCategoryLinkOrGlobal,],- policies: [- {- resource: PolicyResource.product_attribute,- operation: PolicyOperation.read,- },- ],},{method: ["POST"],matcher: "/admin/product-attributes",middlewares: [+ requirePermission("product_attributes", "edit"),validateAndTransformBody(AdminCreateProductAttribute),validateAndTransformQuery(AdminGetProductAttributeParams,adminProductAttributeQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.product_attribute,- operation: PolicyOperation.create,- },- ],},{method: ["GET"],matcher: "/admin/product-attributes/:id",middlewares: [+ requirePermission("product_attributes", "view"),validateAndTransformQuery(AdminGetProductAttributeParams,adminProductAttributeQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.product_attribute,- operation: PolicyOperation.read,- },- ],},{method: ["POST"],matcher: "/admin/product-attributes/:id",middlewares: [+ requirePermission("product_attributes", "edit"),validateAndTransformBody(AdminUpdateProductAttribute),validateAndTransformQuery(AdminGetProductAttributeParams,adminProductAttributeQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.product_attribute,- operation: PolicyOperation.update,- },- ],},{method: ["DELETE"],matcher: "/admin/product-attributes/:id",- middlewares: [],- policies: [- {- resource: PolicyResource.product_attribute,- operation: PolicyOperation.delete,- },+ middlewares: [+ requirePermission("product_attributes", "manage"),],},@@ -130,50 +105,35 @@ export const adminProductAttributesMiddlewares: MiddlewareRoute[] = [method: ["POST"],matcher: "/admin/product-attributes/:id/values",middlewares: [+ requirePermission("product_attributes", "edit"),validateAndTransformBody(AdminUpsertProductAttributeValues),validateAndTransformQuery(AdminGetProductAttributeParams,adminProductAttributeQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.product_attribute,- operation: PolicyOperation.update,- },- ],},{method: ["POST"],matcher: "/admin/product-attributes/:id/values/:value_id",middlewares: [+ requirePermission("product_attributes", "edit"),validateAndTransformBody(AdminUpdateProductAttributeValue),validateAndTransformQuery(AdminGetProductAttributeParams,adminProductAttributeQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.product_attribute,- operation: PolicyOperation.update,- },- ],},{method: ["DELETE"],matcher: "/admin/product-attributes/:id/values/:value_id",middlewares: [+ requirePermission("product_attributes", "manage"),validateAndTransformQuery(AdminGetProductAttributeParams,adminProductAttributeQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.product_attribute,- operation: PolicyOperation.delete,- },- ],},]diff --git a/packages/core/src/api/admin/product-categories/middlewares.ts b/packages/core/src/api/admin/product-categories/middlewares.tsindex 32bd64524..d47cd89d5 100644--- a/packages/core/src/api/admin/product-categories/middlewares.ts+++ b/packages/core/src/api/admin/product-categories/middlewares.ts@@ -1,5 +1,4 @@-import { PolicyResource } from "../../utils/policy-resources"-import { PolicyOperation } from "@medusajs/framework/utils"+import { requirePermission } from "../../utils"import { MiddlewareRoute } from "@medusajs/framework/http"import {validateAndTransformBody,@@ -22,100 +21,68 @@ const overrides: MiddlewareRoute[] = [method: ["GET"],matcher: "/admin/product-categories",middlewares: [+ requirePermission("product_categories", "view"),validateAndTransformQuery(AdminProductCategoriesParams,adminProductCategoryQueryConfig.list),],- policies: [- {- resource: PolicyResource.product_category,- operation: PolicyOperation.read,- },- ],},{method: ["POST"],matcher: "/admin/product-categories",middlewares: [+ requirePermission("product_categories", "edit"),validateAndTransformBody(AdminCreateProductCategory),validateAndTransformQuery(AdminProductCategoryParams,adminProductCategoryQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.product_category,- operation: PolicyOperation.create,- },- ],},{method: ["GET"],matcher: "/admin/product-categories/:id",middlewares: [+ requirePermission("product_categories", "view"),validateAndTransformQuery(AdminProductCategoryParams,adminProductCategoryQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.product_category,- operation: PolicyOperation.read,- },- ],},{method: ["POST"],matcher: "/admin/product-categories/:id",middlewares: [+ requirePermission("product_categories", "edit"),validateAndTransformBody(AdminUpdateProductCategory),validateAndTransformQuery(AdminProductCategoryParams,adminProductCategoryQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.product_category,- operation: PolicyOperation.update,- },- ],},{method: ["DELETE"],matcher: "/admin/product-categories/:id",- middlewares: [],- policies: [- {- resource: PolicyResource.product_category,- operation: PolicyOperation.delete,- },+ middlewares: [+ requirePermission("product_categories", "manage"),],},{method: ["POST"],matcher: "/admin/product-categories/:id/products",- middlewares: [validateAndTransformBody(AdminBatchLinkProductsToCategory)],- policies: [- {- resource: PolicyResource.product_category,- operation: PolicyOperation.update,- },- ],+ middlewares: [+ requirePermission("product_categories", "edit"),+ validateAndTransformBody(AdminBatchLinkProductsToCategory)],},{method: ["POST"],matcher: "/admin/product-categories/:id/sellers",- middlewares: [validateAndTransformBody(AdminBatchLinkSellersToCategory)],- policies: [- {- resource: PolicyResource.product_category,- operation: PolicyOperation.update,- },- ],+ middlewares: [+ requirePermission("product_categories", "edit"),+ validateAndTransformBody(AdminBatchLinkSellersToCategory)],},]diff --git a/packages/core/src/api/admin/product-changes/middlewares.ts b/packages/core/src/api/admin/product-changes/middlewares.tsindex c0d64e188..fb961123e 100644--- a/packages/core/src/api/admin/product-changes/middlewares.ts+++ b/packages/core/src/api/admin/product-changes/middlewares.ts@@ -1,5 +1,4 @@-import { PolicyResource } from "../../utils/policy-resources"-import { PolicyOperation } from "@medusajs/framework/utils"+import { requirePermission } from "../../utils"import { MiddlewareRoute } from "@medusajs/framework/http"import { validateAndTransformBody } from "@medusajs/framework"@@ -12,23 +11,15 @@ export const adminProductChangesMiddlewares: MiddlewareRoute[] = [{method: ["POST"],matcher: "/admin/product-changes/:id/confirm",- middlewares: [validateAndTransformBody(AdminConfirmProductChange)],- policies: [- {- resource: PolicyResource.product_change,- operation: PolicyOperation.update,- },- ],+ middlewares: [+ requirePermission("products.review", "edit"),+ validateAndTransformBody(AdminConfirmProductChange)],},{method: ["POST"],matcher: "/admin/product-changes/:id/cancel",- middlewares: [validateAndTransformBody(AdminCancelProductChange)],- policies: [- {- resource: PolicyResource.product_change,- operation: PolicyOperation.update,- },- ],+ middlewares: [+ requirePermission("products.review", "edit"),+ validateAndTransformBody(AdminCancelProductChange)],},]diff --git a/packages/core/src/api/admin/products/middlewares.ts b/packages/core/src/api/admin/products/middlewares.tsindex e3791a378..a2100bcb4 100644--- a/packages/core/src/api/admin/products/middlewares.ts+++ b/packages/core/src/api/admin/products/middlewares.ts@@ -1,5 +1,4 @@-import { PolicyResource } from "../../utils/policy-resources"-import { PolicyOperation } from "@medusajs/framework/utils"+import { requirePermission } from "../../utils"import { MiddlewareRoute } from "@medusajs/framework/http"import {validateAndTransformBody,@@ -35,259 +34,181 @@ const overrides: MiddlewareRoute[] = [method: ["GET"],matcher: "/admin/products",middlewares: [+ requirePermission("products", "view"),validateAndTransformQuery(AdminGetProductsParams,adminProductQueryConfig.list),applyOfferedProductsFilter,],- policies: [- {- resource: PolicyResource.product,- operation: PolicyOperation.read,- },- ],},{method: ["POST"],matcher: "/admin/products",middlewares: [+ requirePermission("products", "edit"),validateAndTransformBody(AdminCreateProduct),validateAndTransformQuery(AdminGetProductParams,adminProductQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.product,- operation: PolicyOperation.create,- },- ],},{method: ["POST"],matcher: "/admin/products/batch",middlewares: [+ requirePermission("products", "edit"),validateAndTransformBody(AdminBatchProducts),validateAndTransformQuery(AdminGetProductsParams,adminProductQueryConfig.list),],- policies: [- {- resource: PolicyResource.product,- operation: PolicyOperation.create,- },- ],},{method: ["GET"],matcher: "/admin/products/:id",middlewares: [+ requirePermission("products", "view"),validateAndTransformQuery(AdminGetProductParams,adminProductQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.product,- operation: PolicyOperation.read,- },- ],},{method: ["POST"],matcher: "/admin/products/:id",middlewares: [+ requirePermission("products", "edit"),validateAndTransformBody(AdminUpdateProduct),validateAndTransformQuery(AdminGetProductParams,adminProductQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.product,- operation: PolicyOperation.update,- },- ],},{method: ["DELETE"],matcher: "/admin/products/:id",- middlewares: [],- policies: [- {- resource: PolicyResource.product,- operation: PolicyOperation.delete,- },+ middlewares: [+ requirePermission("products", "manage"),],},{method: ["POST"],matcher: "/admin/products/:id/confirm",middlewares: [+ requirePermission("products.review", "edit"),validateAndTransformBody(AdminConfirmProduct),validateAndTransformQuery(AdminGetProductParams,adminProductQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.product,- operation: PolicyOperation.update,- },- ],},{method: ["POST"],matcher: "/admin/products/:id/request-changes",middlewares: [+ requirePermission("products.review", "edit"),validateAndTransformBody(AdminRequestProductChanges),validateAndTransformQuery(AdminGetProductParams,adminProductQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.product,- operation: PolicyOperation.update,- },- ],},{method: ["POST"],matcher: "/admin/products/:id/reject",middlewares: [+ requirePermission("products.review", "edit"),validateAndTransformBody(AdminRejectProduct),validateAndTransformQuery(AdminGetProductParams,adminProductQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.product,- operation: PolicyOperation.update,- },- ],},{method: ["GET"],matcher: "/admin/products/:id/variants",middlewares: [+ requirePermission("products", "view"),validateAndTransformQuery(AdminGetProductVariantsParams,adminProductVariantQueryConfig.list),],- policies: [- {- resource: PolicyResource.product_variant,- operation: PolicyOperation.read,- },- ],},{method: ["POST"],matcher: "/admin/products/:id/variants",middlewares: [+ requirePermission("products", "edit"),validateAndTransformBody(AdminCreateProductVariant),validateAndTransformQuery(AdminGetProductParams,adminProductQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.product_variant,- operation: PolicyOperation.update,- },- ],},{method: ["GET"],matcher: "/admin/products/:id/variants/:variant_id",middlewares: [+ requirePermission("products", "view"),validateAndTransformQuery(AdminGetProductVariantParams,adminProductVariantQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.product_variant,- operation: PolicyOperation.read,- },- ],},{method: ["POST"],matcher: "/admin/products/:id/variants/:variant_id",middlewares: [+ requirePermission("products", "edit"),validateAndTransformBody(AdminUpdateProductVariant),validateAndTransformQuery(AdminGetProductParams,adminProductQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.product_variant,- operation: PolicyOperation.update,- },- ],},{method: ["DELETE"],matcher: "/admin/products/:id/variants/:variant_id",middlewares: [+ requirePermission("products", "manage"),validateAndTransformQuery(AdminGetProductParams,adminProductQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.product_variant,- operation: PolicyOperation.delete,- },- ],},{method: ["POST"],matcher: "/admin/products/:id/attributes/batch",middlewares: [+ requirePermission("products", "edit"),validateAndTransformBody(AdminBatchProductAttributes),validateAndTransformQuery(AdminGetProductParams,adminProductQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.product,- operation: PolicyOperation.update,- },- ],},{method: ["POST"],matcher: "/admin/products/:id/sellers",- middlewares: [validateAndTransformBody(createLinkBody())],- policies: [- {- resource: PolicyResource.product,- operation: PolicyOperation.update,- },- ],+ middlewares: [+ requirePermission("products", "edit"),+ validateAndTransformBody(createLinkBody())],},]diff --git a/packages/core/src/api/admin/promotions/middlewares.ts b/packages/core/src/api/admin/promotions/middlewares.tsindex 4e85af98a..d6842a780 100644--- a/packages/core/src/api/admin/promotions/middlewares.ts+++ b/packages/core/src/api/admin/promotions/middlewares.ts@@ -1,5 +1,4 @@-import { PolicyResource } from "../../utils/policy-resources"-import { PolicyOperation } from "@medusajs/framework/utils"+import { requirePermission } from "../../utils"import {validateAndTransformBody,validateAndTransformQuery,@@ -63,44 +62,30 @@ export const adminPromotionsMiddlewares: MiddlewareRoute[] = [method: ["GET"],matcher: LIST_MATCHER,middlewares: [+ requirePermission("promotions", "view"),validateAndTransformQuery(AdminGetPromotionsWithSeller,listTransformQueryConfig),applyPromotionSellerFilter,],- policies: [- {- resource: PolicyResource.promotion,- operation: PolicyOperation.read,- },- ],},{method: ["GET"],matcher: RULE_VALUE_MATCHER,middlewares: [+ requirePermission("promotions", "view"),validateAndTransformQuery(AdminGetPromotionsRuleValueWithSeller,listRuleValueTransformQueryConfig),],- policies: [- {- resource: PolicyResource.promotion,- operation: PolicyOperation.read,- },- ],},{method: ["POST"],matcher: "/admin/promotions/:id/cost",- middlewares: [validateAndTransformBody(AdminUpsertPromotionCost)],- policies: [- {- resource: PolicyResource.promotion,- operation: PolicyOperation.update,- },- ],+ middlewares: [+ requirePermission("promotions", "edit"),+ validateAndTransformBody(AdminUpsertPromotionCost)],},]diff --git a/packages/core/src/api/admin/reservations/middlewares.ts b/packages/core/src/api/admin/reservations/middlewares.tsindex 1836716c6..a9ee50153 100644--- a/packages/core/src/api/admin/reservations/middlewares.ts+++ b/packages/core/src/api/admin/reservations/middlewares.ts@@ -1,5 +1,4 @@-import { PolicyOperation } from "@medusajs/framework/utils"-import { PolicyResource } from "../../utils/policy-resources"+import { requirePermission } from "../../utils"import {AuthenticatedMedusaRequest,maybeApplyLinkFilter,@@ -81,6 +80,7 @@ export const adminReservationsMiddlewares: MiddlewareRoute[] = [method: ["GET"],matcher: LIST_MATCHER,middlewares: [+ requirePermission("reservations", "view"),validateAndTransformQuery(AdminGetReservationsParams,listTransformQueryConfig@@ -98,11 +98,5 @@ export const adminReservationsMiddlewares: MiddlewareRoute[] = [// the already-resolved inventory_item_id set instead of replacing it.maybeApplyInventoryItemSkuFilter,],- policies: [- {- resource: PolicyResource.reservation_item,- operation: PolicyOperation.read,- },- ],},]diff --git a/packages/core/src/api/admin/reviews/middlewares.ts b/packages/core/src/api/admin/reviews/middlewares.tsindex 8be562bb8..8039620a8 100644--- a/packages/core/src/api/admin/reviews/middlewares.ts+++ b/packages/core/src/api/admin/reviews/middlewares.ts@@ -1,5 +1,4 @@-import { PolicyResource } from "../../utils/policy-resources"-import { PolicyOperation } from "@medusajs/framework/utils"+import { requirePermission } from "../../utils"import { validateAndTransformBody, validateAndTransformQuery } from "@medusajs/framework"import { maybeApplyLinkFilter } from "@medusajs/framework/http"import { MiddlewareRoute } from "@medusajs/medusa"@@ -18,6 +17,7 @@ export const adminReviewsMiddlewares: MiddlewareRoute[] = [method: ["GET"],matcher: "/admin/reviews",middlewares: [+ requirePermission("reviews", "view"),validateAndTransformQuery(AdminGetReviewsParams, adminReviewsConfig.list),maybeApplyLinkFilter({entryPoint: sellerReview.entryPoint,@@ -30,72 +30,47 @@ export const adminReviewsMiddlewares: MiddlewareRoute[] = [filterableField: "customer_id",}),],- policies: [- {- resource: PolicyResource.review,- operation: PolicyOperation.read,- },- ],},{method: ["GET"],matcher: "/admin/reviews/:id",middlewares: [+ requirePermission("reviews", "view"),validateAndTransformQuery(AdminGetReviewsParams,adminReviewsConfig.retrieve),],- policies: [- {- resource: PolicyResource.review,- operation: PolicyOperation.read,- },- ],},{method: ["POST"],matcher: "/admin/reviews/:id",middlewares: [+ requirePermission("reviews", "edit"),validateAndTransformQuery(AdminGetReviewsParams,adminReviewsConfig.retrieve),validateAndTransformBody(AdminUpdateReview),],- policies: [- {- resource: PolicyResource.review,- operation: PolicyOperation.update,- },- ],},{method: ["POST"],matcher: "/admin/reviews/:id/respond",middlewares: [+ requirePermission("reviews", "edit"),validateAndTransformQuery(AdminGetReviewsParams,adminReviewsConfig.retrieve),validateAndTransformBody(AdminRespondReview),],- policies: [- {- resource: PolicyResource.review,- operation: PolicyOperation.update,- },- ],},{method: ["DELETE"],matcher: "/admin/reviews/:id",- middlewares: [],- policies: [- {- resource: PolicyResource.review,- operation: PolicyOperation.delete,- },+ middlewares: [+ requirePermission("reviews", "manage"),],},]diff --git a/packages/core/src/api/admin/sellers/middlewares.ts b/packages/core/src/api/admin/sellers/middlewares.tsindex f81d2ccb5..f1a9f6cbf 100644--- a/packages/core/src/api/admin/sellers/middlewares.ts+++ b/packages/core/src/api/admin/sellers/middlewares.ts@@ -1,5 +1,4 @@-import { PolicyResource } from "../../utils/policy-resources"-import { PolicyOperation } from "@medusajs/framework/utils"+import { requirePermission } from "../../utils"import { MiddlewareRoute } from "@medusajs/framework/http"import {validateAndTransformBody,@@ -31,307 +30,223 @@ import {} from "./validators"export const adminSellersMiddlewares: MiddlewareRoute[] = [+ {+ method: ["POST"],+ matcher: "/admin/sellers/:id/members/invites/:invite_id/resend",+ middlewares: [requirePermission("members.invites", "edit")],+ },+ {+ method: ["DELETE"],+ matcher: "/admin/sellers/:id/members/invites/:invite_id",+ middlewares: [requirePermission("members.invites", "manage")],+ },{method: ["GET"],matcher: "/admin/sellers",middlewares: [+ requirePermission("sellers", "view"),validateAndTransformQuery(AdminGetSellersParams,adminSellerQueryConfig.list),],- policies: [- {- resource: PolicyResource.seller,- operation: PolicyOperation.read,- },- ],},{method: ["POST"],matcher: "/admin/sellers",middlewares: [+ requirePermission("sellers", "edit"),validateAndTransformBody(AdminCreateSeller),validateAndTransformQuery(AdminGetSellerParams,adminSellerQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.seller,- operation: PolicyOperation.create,- },- ],},{method: ["GET"],matcher: "/admin/sellers/:id",middlewares: [+ requirePermission("sellers", "view"),validateAndTransformQuery(AdminGetSellerParams,adminSellerQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.seller,- operation: PolicyOperation.read,- },- ],},{method: ["POST"],matcher: "/admin/sellers/:id",middlewares: [+ requirePermission("sellers", "edit"),validateAndTransformBody(AdminUpdateSeller),validateAndTransformQuery(AdminGetSellerParams,adminSellerQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.seller,- operation: PolicyOperation.update,- },- ],},{method: ["POST"],matcher: "/admin/sellers/:id/suspend",middlewares: [+ requirePermission("sellers.approval", "edit"),validateAndTransformBody(AdminSuspendSeller),validateAndTransformQuery(AdminGetSellerParams,adminSellerQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.seller,- operation: PolicyOperation.update,- },- ],},{method: ["POST"],matcher: "/admin/sellers/:id/unsuspend",middlewares: [+ requirePermission("sellers.approval", "edit"),validateAndTransformBody(AdminUnsuspendSeller),validateAndTransformQuery(AdminGetSellerParams,adminSellerQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.seller,- operation: PolicyOperation.update,- },- ],},{method: ["POST"],matcher: "/admin/sellers/:id/approve",middlewares: [+ requirePermission("sellers.approval", "edit"),validateAndTransformBody(AdminApproveSeller),validateAndTransformQuery(AdminGetSellerParams,adminSellerQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.seller,- operation: PolicyOperation.update,- },- ],},{method: ["POST"],matcher: "/admin/sellers/:id/terminate",middlewares: [+ requirePermission("sellers.approval", "edit"),validateAndTransformBody(AdminTerminateSeller),validateAndTransformQuery(AdminGetSellerParams,adminSellerQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.seller,- operation: PolicyOperation.update,- },- ],},{method: ["POST"],matcher: "/admin/sellers/:id/unterminate",middlewares: [+ requirePermission("sellers.approval", "edit"),validateAndTransformBody(AdminUnterminateSeller),validateAndTransformQuery(AdminGetSellerParams,adminSellerQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.seller,- operation: PolicyOperation.update,- },- ],},{method: ["POST"],matcher: "/admin/sellers/:id/address",middlewares: [+ requirePermission("sellers", "edit"),validateAndTransformBody(AdminUpsertSellerAddress),validateAndTransformQuery(AdminGetSellerParams,adminSellerQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.seller,- operation: PolicyOperation.update,- },- ],},{method: ["POST"],matcher: "/admin/sellers/:id/payment-details",middlewares: [+ requirePermission("sellers", "edit"),validateAndTransformBody(AdminUpsertSellerPaymentDetails),validateAndTransformQuery(AdminGetSellerParams,adminSellerQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.seller,- operation: PolicyOperation.update,- },- ],},{method: ["POST"],matcher: "/admin/sellers/:id/professional-details",middlewares: [+ requirePermission("sellers", "edit"),validateAndTransformBody(AdminUpsertSellerProfessionalDetails),validateAndTransformQuery(AdminGetSellerParams,adminSellerQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.seller,- operation: PolicyOperation.update,- },- ],},{method: ["DELETE"],matcher: "/admin/sellers/:id/professional-details",middlewares: [+ requirePermission("sellers", "manage"),validateAndTransformQuery(AdminGetSellerParams,adminSellerQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.seller,- operation: PolicyOperation.delete,- },- ],},{method: ["GET"],matcher: "/admin/sellers/:id/members",middlewares: [+ requirePermission("members", "view"),validateAndTransformQuery(AdminGetSellersParams,adminMembersQueryConfig.list),],- policies: [- {- resource: PolicyResource.seller_member,- operation: PolicyOperation.read,- },- ],},{method: ["GET"],matcher: "/admin/sellers/:id/products",middlewares: [+ requirePermission("products", "view"),validateAndTransformQuery(AdminGetSellerProductsParams,adminSellerProductsQueryConfig.list),],- policies: [- {- resource: PolicyResource.product,- operation: PolicyOperation.read,- },- ],},{method: ["POST"],matcher: "/admin/sellers/:id/members",middlewares: [+ requirePermission("members", "edit"),validateAndTransformBody(AdminAddSellerMember),],- policies: [- {- resource: PolicyResource.seller_member,- operation: PolicyOperation.update,- },- ],},{method: ["GET"],matcher: "/admin/sellers/:id/members/invites",middlewares: [+ requirePermission("members.invites", "view"),validateAndTransformQuery(AdminGetSellersParams,adminMemberInvitesQueryConfig.list),],- policies: [- {- resource: PolicyResource.member_invite,- operation: PolicyOperation.read,- },- ],},{method: ["POST"],matcher: "/admin/sellers/:id/members/invite",middlewares: [+ requirePermission("members.invites", "edit"),validateAndTransformBody(AdminInviteSellerMember),],- policies: [- {- resource: PolicyResource.member_invite,- operation: PolicyOperation.update,- },- ],},{method: ["DELETE"],matcher: "/admin/sellers/:id/members/:member_id",- middlewares: [],- policies: [- {- resource: PolicyResource.seller_member,- operation: PolicyOperation.delete,- },+ middlewares: [+ requirePermission("members", "manage"),],},]diff --git a/packages/core/src/api/admin/sellers/query-config.ts b/packages/core/src/api/admin/sellers/query-config.tsindex 1a85c89f6..e87eb9d1f 100644--- a/packages/core/src/api/admin/sellers/query-config.ts+++ b/packages/core/src/api/admin/sellers/query-config.ts@@ -1,4 +1,3 @@-import { withRbacRoleFields } from "../../utils/rbac-role-fields"export const adminSellerFields = ["id",@@ -55,7 +54,7 @@ export const adminSellerQueryConfig = {export const adminMembersQueryConfig = {list: {get defaults() {- return withRbacRoleFields([+ return (["id","is_owner","member.*",diff --git a/packages/core/src/api/admin/shipping-options/middlewares.ts b/packages/core/src/api/admin/shipping-options/middlewares.tsindex 48c5e86d9..bc98b7d10 100644--- a/packages/core/src/api/admin/shipping-options/middlewares.ts+++ b/packages/core/src/api/admin/shipping-options/middlewares.ts@@ -1,5 +1,4 @@-import { PolicyOperation } from "@medusajs/framework/utils"-import { PolicyResource } from "../../utils/policy-resources"+import { requirePermission } from "../../utils"import {AuthenticatedMedusaRequest,maybeApplyLinkFilter,@@ -59,17 +58,12 @@ export const adminShippingOptionsMiddlewares: MiddlewareRoute[] = [method: ["GET"],matcher: LIST_MATCHER,middlewares: [+ requirePermission("shipping_options", "view"),validateAndTransformQuery(AdminGetShippingOptionsParamsWithSeller,listTransformQueryConfig),maybeApplySellerShippingOptionFilter,],- policies: [- {- resource: PolicyResource.shipping_option,- operation: PolicyOperation.read,- },- ],},]diff --git a/packages/core/src/api/admin/shipping-profiles/middlewares.ts b/packages/core/src/api/admin/shipping-profiles/middlewares.tsindex afa4c554d..942dcea0f 100644--- a/packages/core/src/api/admin/shipping-profiles/middlewares.ts+++ b/packages/core/src/api/admin/shipping-profiles/middlewares.ts@@ -1,5 +1,4 @@-import { PolicyOperation } from "@medusajs/framework/utils"-import { PolicyResource } from "../../utils/policy-resources"+import { requirePermission } from "../../utils"import { MiddlewareRoute } from "@medusajs/framework/http"import { validateAndTransformQuery } from "@medusajs/framework"import { AdminGetShippingProfilesParams } from "@medusajs/medusa/api/admin/shipping-profiles/validators"@@ -29,16 +28,11 @@ export const adminShippingProfilesMiddlewares: MiddlewareRoute[] = [method: ["GET"],matcher: LIST_MATCHER,middlewares: [+ requirePermission("shipping_profiles", "view"),validateAndTransformQuery(AdminGetShippingProfilesParams,listTransformQueryConfig),],- policies: [- {- resource: PolicyResource.shipping_profile,- operation: PolicyOperation.read,- },- ],},]diff --git a/packages/core/src/api/admin/stock-locations/middlewares.ts b/packages/core/src/api/admin/stock-locations/middlewares.tsindex 6731dea5d..bbda39699 100644--- a/packages/core/src/api/admin/stock-locations/middlewares.ts+++ b/packages/core/src/api/admin/stock-locations/middlewares.ts@@ -1,5 +1,4 @@-import { PolicyOperation } from "@medusajs/framework/utils"-import { PolicyResource } from "../../utils/policy-resources"+import { requirePermission } from "../../utils"import {AuthenticatedMedusaRequest,maybeApplyLinkFilter,@@ -59,17 +58,12 @@ export const adminStockLocationsMiddlewares: MiddlewareRoute[] = [method: ["GET"],matcher: LIST_MATCHER,middlewares: [+ requirePermission("stock_locations", "view"),validateAndTransformQuery(AdminGetStockLocationsParamsWithSeller,listTransformQueryConfig),maybeApplySellerStockLocationFilter,],- policies: [- {- resource: PolicyResource.stock_location,- operation: PolicyOperation.read,- },- ],},]diff --git a/packages/core/src/api/admin/users/me/route.ts b/packages/core/src/api/admin/users/me/route.tsnew file mode 100644index 000000000..3887c80c7--- /dev/null+++ b/packages/core/src/api/admin/users/me/route.ts@@ -0,0 +1,42 @@+import {+ AuthenticatedMedusaRequest,+ MedusaResponse,+} from "@medusajs/framework/http"+import {+ ContainerRegistrationKeys,+ MedusaError,+} from "@medusajs/framework/utils"+import { HttpTypes } from "@mercurjs/types"++import { attachPermissions, takePermissionsField } from "../../../utils"++export const GET = async (+ req: AuthenticatedMedusaRequest<HttpTypes.AdminUserParams>,+ res: MedusaResponse<HttpTypes.AdminUserWithPermissionsResponse>+) => {+ const id = req.auth_context.actor_id++ if (!id) {+ throw new MedusaError(MedusaError.Types.NOT_FOUND, `User ID not found`)+ }++ const query = req.scope.resolve(ContainerRegistrationKeys.QUERY)+ const withPermissions = takePermissionsField(req)++ const {+ data: [user],+ } = await query.graph({+ entity: "user",+ fields: req.queryConfig.fields,+ filters: { id },+ })++ if (!user) {+ throw new MedusaError(+ MedusaError.Types.NOT_FOUND,+ `User with id: ${id} was not found`+ )+ }++ res.status(200).json({ user: attachPermissions(req, user, withPermissions) })+}diff --git a/packages/core/src/api/utils/__tests__/permissions-middleware.unit.spec.ts b/packages/core/src/api/utils/__tests__/permissions-middleware.unit.spec.tsnew file mode 100644index 000000000..ba9ad9345--- /dev/null+++ b/packages/core/src/api/utils/__tests__/permissions-middleware.unit.spec.ts@@ -0,0 +1,94 @@+import {+ AuthenticatedMedusaRequest,+ MedusaResponse,+} from "@medusajs/framework"+import {+ IPermissionResolver,+ PERMISSIONS_MODULE,+ PermissionMap,+} from "@mercurjs/types"++import {+ requirePermission,+ resolvePermissionsMiddleware,+} from "../permissions-middleware"++const makeReq = (resolver?: IPermissionResolver) =>+ ({+ auth_context: { actor_id: "mem_1", actor_type: "member" },+ seller_context: { seller_id: "sel_1", seller_member: { id: "selmem_1" } },+ scope: {+ resolve: (key: string) =>+ key === PERMISSIONS_MODULE+ ? resolver+ : { modules: resolver ? { [PERMISSIONS_MODULE]: {} } : {} },+ },+ }) as unknown as AuthenticatedMedusaRequest++const makeRes = () => {+ const res = { statusCode: 200, body: undefined as unknown }+ const api = {+ status(code: number) {+ res.statusCode = code+ return api+ },+ json(body: unknown) {+ res.body = body+ return api+ },+ }+ return { res, api: api as unknown as MedusaResponse }+}++const run = async (req: AuthenticatedMedusaRequest, key: string, right: "view" | "edit") => {+ const next = jest.fn()+ await resolvePermissionsMiddleware("vendor")(req, makeRes().api, next)+ const { res, api } = makeRes()+ const allowed = jest.fn()+ requirePermission(key, right)(req, api, allowed)+ return { res, allowed }+}++describe("permissions middleware", () => {+ it("allows everything when the permissions module is not configured", async () => {+ const req = makeReq()+ const { allowed } = await run(req, "payouts", "edit")++ expect(allowed).toHaveBeenCalled()+ expect(req.permissions?.orders).toBe("manage")+ })++ it("passes the seller context to the resolver", async () => {+ const resolvePermissions = jest.fn(async (): Promise<PermissionMap> => ({}))+ await run(makeReq({ resolvePermissions }), "orders", "view")++ expect(resolvePermissions).toHaveBeenCalledWith(+ expect.objectContaining({+ actor_id: "mem_1",+ surface: "vendor",+ seller_id: "sel_1",+ seller_member_id: "selmem_1",+ }),+ expect.any(Array)+ )+ })++ it("enforces the resolved rights", async () => {+ const resolver = {+ resolvePermissions: async (): Promise<PermissionMap> => ({ orders: "edit" }),+ }++ expect((await run(makeReq(resolver), "orders", "view")).allowed).toHaveBeenCalled()++ const denied = await run(makeReq(resolver), "payouts", "view")+ expect(denied.allowed).not.toHaveBeenCalled()+ expect(denied.res.statusCode).toBe(403)+ expect(denied.res.body).toEqual(+ expect.objectContaining({+ code: "MISSING_PERMISSION",+ permission: "payouts",+ right: "view",+ })+ )+ })+})diff --git a/packages/core/src/api/utils/ensure-seller-middleware.ts b/packages/core/src/api/utils/ensure-seller-middleware.tsindex 65efbe766..6933ea49a 100644--- a/packages/core/src/api/utils/ensure-seller-middleware.ts+++ b/packages/core/src/api/utils/ensure-seller-middleware.ts@@ -5,13 +5,8 @@ import {} from "@medusajs/framework"import {ContainerRegistrationKeys,- FeatureFlag,MedusaError,- Modules,} from "@medusajs/framework/utils"-import { IRbacModuleService } from "@medusajs/types"-import { SellerRole } from "@mercurjs/types"-import { ensureSellerDefaultRoles } from "../../modules/seller/utils/ensure-seller-default-roles"import { SellerContext } from "../../types/seller-context"const SELLER_ID_HEADER = "x-seller-id"@@ -64,21 +59,5 @@ export async function ensureSellerMiddleware(currency_code: sellerMember.seller.currency_code,} as SellerContext- if (!FeatureFlag.isFeatureEnabled("rbac")) {- return next()- }-- const rbacService: IRbacModuleService = req.scope.resolve(Modules.RBAC)-- await ensureSellerDefaultRoles(rbacService)-- req.auth_context.app_metadata = {- ...req.auth_context.app_metadata,- // Members predating RBAC have no role. Route policy checks reject an actor- // with an empty role list outright, so fall back to the administration role- // rather than locking them out of their own store.- roles: [sellerMember.role_id || SellerRole.SELLER_ADMINISTRATION],- }-next()}diff --git a/packages/core/src/api/utils/index.ts b/packages/core/src/api/utils/index.tsindex cc0cb3bc2..60143d16f 100644--- a/packages/core/src/api/utils/index.ts+++ b/packages/core/src/api/utils/index.ts@@ -2,8 +2,7 @@ export * from "./unless-base-url"export * from "./scan-unauthenticated-routes"export * from "./ensure-seller-middleware"export * from "./ensure-seller-scope-middleware"-export * from "./resolve-admin-roles-middleware"-export * from "./policy-resources"+export * from "./permissions-middleware"export * from "./filter-by-seller-id"export * from "./vendor-cors-middleware"export * from "./format-product-attributes"diff --git a/packages/core/src/api/utils/permissions-middleware.ts b/packages/core/src/api/utils/permissions-middleware.tsnew file mode 100644index 000000000..6a6b3f983--- /dev/null+++ b/packages/core/src/api/utils/permissions-middleware.ts@@ -0,0 +1,160 @@+import {+ AuthenticatedMedusaRequest,+ MedusaNextFunction,+ MedusaResponse,+} from "@medusajs/framework"+import { ConfigModule } from "@medusajs/framework/types"+import { ContainerRegistrationKeys } from "@medusajs/framework/utils"+import {+ IPermissionResolver,+ MISSING_PERMISSION_CODE,+ PERMISSIONS_MODULE,+ PermissionActor,+ PermissionMap,+ PermissionRequirement,+ PermissionRight,+ PermissionSurface,+} from "@mercurjs/types"++import {+ getPermissionCatalog,+ grantAll,+ satisfiesRight,+ validatePermissionCatalog,+} from "../../permissions"++declare module "express" {+ interface Request {+ permissions?: PermissionMap+ permissions_enforced?: boolean+ required_permissions?: PermissionRequirement[]+ }+}++export function isPermissionsModuleEnabled(config: ConfigModule): boolean {+ const modules = config.modules as Record<string, unknown> | undefined+ const entry = modules?.[PERMISSIONS_MODULE]++ if (!entry) {+ return false+ }++ return !(typeof entry === "object" && "disable" in entry && entry.disable)+}++function getResolver(+ req: AuthenticatedMedusaRequest+): IPermissionResolver | undefined {+ const config = req.scope.resolve<ConfigModule>(+ ContainerRegistrationKeys.CONFIG_MODULE+ )++ if (!isPermissionsModuleEnabled(config)) {+ return undefined+ }++ return req.scope.resolve<IPermissionResolver>(PERMISSIONS_MODULE)+}++let catalogValidated = false++export function resolvePermissionsMiddleware(surface: PermissionSurface) {+ return async (+ req: AuthenticatedMedusaRequest,+ _res: MedusaResponse,+ next: MedusaNextFunction+ ) => {+ const catalog = getPermissionCatalog()+ if (!catalogValidated) {+ validatePermissionCatalog(catalog)+ catalogValidated = true+ }+ const resolver = getResolver(req)+ const actorId = req.auth_context?.actor_id++ if (!resolver || !actorId) {+ req.permissions = grantAll(catalog)+ req.permissions_enforced = false+ return next()+ }++ const actor: PermissionActor = {+ actor_type: req.auth_context.actor_type,+ actor_id: actorId,+ surface,+ seller_id: req.seller_context?.seller_id,+ seller_member_id: req.seller_context?.seller_member?.id,+ }++ try {+ req.permissions = await resolver.resolvePermissions(actor, catalog)+ req.permissions_enforced = true+ next()+ } catch (error) {+ next(error)+ }+ }+}++export const REQUIRED_PERMISSION = Symbol.for("mercur:required-permission")++export function requirePermission(key: string, right: PermissionRight) {+ const middleware = (+ req: AuthenticatedMedusaRequest,+ res: MedusaResponse,+ next: MedusaNextFunction+ ) => {+ req.required_permissions ??= []+ req.required_permissions.push({ key, right })++ // Routes reached before the resolving middleware (public or pre-seller+ // routes) have nothing to enforce against.+ if (!req.permissions_enforced) {+ return next()+ }++ if (satisfiesRight(req.permissions?.[key], right)) {+ return next()+ }++ res.status(403).json({+ type: "not_allowed",+ code: MISSING_PERMISSION_CODE,+ message: `Missing required permission: ${key}:${right}`,+ permission: key,+ right,+ })+ }++ return Object.assign(middleware, {+ [REQUIRED_PERMISSION]: { key, right } as PermissionRequirement,+ })+}++export const PERMISSIONS_FIELD = "permissions"++/**+ * `permissions` is a virtual field: pull it out of the query config before it+ * reaches `query.graph`, and report whether the client asked for it.+ */+export function takePermissionsField(req: AuthenticatedMedusaRequest): boolean {+ const fields = req.queryConfig?.fields ?? []+ const requested = fields.includes(PERMISSIONS_FIELD)++ if (requested) {+ req.queryConfig.fields = fields.filter((field) => field !== PERMISSIONS_FIELD)+ }++ return requested+}++export function attachPermissions<T extends object>(+ req: AuthenticatedMedusaRequest,+ entity: T,+ requested: boolean+): T & { permissions?: PermissionMap } {+ if (!requested || !req.permissions_enforced || !req.permissions) {+ return entity+ }+ return { ...entity, permissions: req.permissions }+}diff --git a/packages/core/src/api/utils/policy-resources.ts b/packages/core/src/api/utils/policy-resources.tsdeleted file mode 100644index 21f7d9767..000000000--- a/packages/core/src/api/utils/policy-resources.ts+++ /dev/null@@ -1,64 +0,0 @@-/**- * Resource names used in route `policies` declarations. Mercur-owned resources- * are declared in `src/policies/*`; the rest come from Medusa's own catalog.- *- * Keep the values in sync with those catalogs — an unknown resource name is- * not a type error, it silently never matches a granted policy.- */-export const PolicyResource = {- // Mercur- seller: "seller",- seller_member: "seller_member",- member_invite: "member_invite",- order_group: "order_group",- offer: "offer",- commission_rule: "commission_rule",- commission_rate: "commission_rate",- commission_line: "commission_line",- payout: "payout",- payout_account: "payout_account",- product_attribute: "product_attribute",- product_attribute_value: "product_attribute_value",- product_change: "product_change",- review: "review",-- // Medusa- product: "product",- product_variant: "product_variant",- product_option: "product_option",- product_tag: "product_tag",- product_type: "product_type",- product_category: "product_category",- product_collection: "product_collection",- order: "order",- order_change: "order_change",- order_claim: "order_claim",- order_exchange: "order_exchange",- return: "return",- return_reason: "return_reason",- refund_reason: "refund_reason",- customer: "customer",- customer_group: "customer_group",- inventory_item: "inventory_item",- reservation_item: "reservation_item",- stock_location: "stock_location",- price_list: "price_list",- price_preference: "price_preference",- currency: "currency",- promotion: "promotion",- campaign: "campaign",- region: "region",- sales_channel: "sales_channel",- store: "store",- payment: "payment",- shipping_option: "shipping_option",- shipping_option_type: "shipping_option_type",- shipping_profile: "shipping_profile",- fulfillment: "fulfillment",- fulfillment_provider: "fulfillment_provider",- fulfillment_set: "fulfillment_set",- file: "file",-} as const--export type PolicyResourceName =- (typeof PolicyResource)[keyof typeof PolicyResource]diff --git a/packages/core/src/api/utils/rbac-role-fields.ts b/packages/core/src/api/utils/rbac-role-fields.tsdeleted file mode 100644index 6c1666231..000000000--- a/packages/core/src/api/utils/rbac-role-fields.ts+++ /dev/null@@ -1,7 +0,0 @@-import { FeatureFlag } from "@medusajs/framework/utils"--// The seller_member <-> rbac_role link is only registered while the rbac flag is-// on, so requesting `rbac_role.*` without it fails. Call this at request time,-// not at module load: feature flags aren't resolved when route files are imported.-export const withRbacRoleFields = (fields: string[]): string[] =>- FeatureFlag.isFeatureEnabled("rbac") ? [...fields, "rbac_role.*"] : fieldsdiff --git a/packages/core/src/api/utils/resolve-admin-roles-middleware.ts b/packages/core/src/api/utils/resolve-admin-roles-middleware.tsdeleted file mode 100644index 97797cb79..000000000--- a/packages/core/src/api/utils/resolve-admin-roles-middleware.ts+++ /dev/null@@ -1,71 +0,0 @@-import { MedusaNextFunction, MedusaResponse } from "@medusajs/framework"-import { AuthenticatedMedusaRequest } from "@medusajs/framework/http"-import {- ContainerRegistrationKeys,- FeatureFlag,-} from "@medusajs/framework/utils"--/**- * Seeded by the RBAC module's initial-data loader; holds the `*:*` policy.- */-export const SUPER_ADMIN_ROLE_ID = "role_super_admin"--/**- * Resolves the acting admin user's RBAC roles per request.- *- * Medusa bakes roles into the JWT at login, which means a role change only- * takes effect once the token is re-issued. Reading them here instead keeps- * enforcement current, and mirrors what `ensureSellerMiddleware` already does- * on the vendor side.- *- * A user with no roles falls back to super admin rather than being denied.- * Route policy checks reject an actor with an empty role list outright, so- * without this fallback every admin predating RBAC would lose access.- */-export async function resolveAdminRolesMiddleware(- req: AuthenticatedMedusaRequest,- _res: MedusaResponse,- next: MedusaNextFunction-) {- const actorId = req.auth_context?.actor_id-- // Route policies are only enforced while the flag is on, so skip the lookup- // entirely otherwise — this runs on every admin request.- if (!actorId || !FeatureFlag.isFeatureEnabled("rbac")) {- return next()- }-- const query = req.scope.resolve(ContainerRegistrationKeys.QUERY)-- let roles: string[] = []-- try {- const { data } = await query.graph(- {- entity: "user",- fields: ["rbac_roles.id"],- filters: { id: actorId },- },- { cache: { enable: true } }- )-- roles = (data?.[0]?.rbac_roles ?? [])- .map((role: { id: string }) => role.id)- .filter(Boolean)- } catch {- // The user <-> role link only exists while the rbac flag is on. Treat a- // failed lookup the same as "no roles assigned".- }-- // The link is the source of truth, but fall back to whatever the token- // carries so callers that assign roles outside the link keep working.- const tokenRoles = (req.auth_context.app_metadata?.roles as string[]) ?? []- const resolved = roles.length ? roles : tokenRoles-- req.auth_context.app_metadata = {- ...req.auth_context.app_metadata,- roles: resolved.length ? resolved : [SUPER_ADMIN_ROLE_ID],- }-- return next()-}diff --git a/packages/core/src/api/vendor/campaigns/middlewares.ts b/packages/core/src/api/vendor/campaigns/middlewares.tsindex f4f365cc2..333e030f1 100644--- a/packages/core/src/api/vendor/campaigns/middlewares.ts+++ b/packages/core/src/api/vendor/campaigns/middlewares.ts@@ -1,5 +1,4 @@-import { PolicyResource } from "../../utils/policy-resources"-import { PolicyOperation } from "@medusajs/framework/utils"+import { requirePermission } from "../../utils"import {AuthenticatedMedusaRequest,maybeApplyLinkFilter,@@ -41,6 +40,7 @@ export const vendorCampaignsMiddlewares: MiddlewareRoute[] = [method: ["GET"],matcher: "/vendor/campaigns",middlewares: [+ requirePermission("campaigns", "view"),validateAndTransformQuery(VendorGetCampaignsParams,vendorCampaignQueryConfig.list@@ -48,89 +48,59 @@ export const vendorCampaignsMiddlewares: MiddlewareRoute[] = [applySellerCampaignLinkFilter,applyCampaignFilters,],- policies: [- {- resource: PolicyResource.campaign,- operation: PolicyOperation.read,- },- ],},{method: ["POST"],matcher: "/vendor/campaigns",middlewares: [+ requirePermission("campaigns", "edit"),validateAndTransformBody(VendorCreateCampaign),validateAndTransformQuery(VendorGetCampaignParams,vendorCampaignQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.campaign,- operation: PolicyOperation.create,- },- ],},{method: ["GET"],matcher: "/vendor/campaigns/:id",middlewares: [+ requirePermission("campaigns", "view"),validateAndTransformQuery(VendorGetCampaignParams,vendorCampaignQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.campaign,- operation: PolicyOperation.read,- },- ],},{method: ["POST"],matcher: "/vendor/campaigns/:id",middlewares: [+ requirePermission("campaigns", "edit"),validateAndTransformBody(VendorUpdateCampaign),validateAndTransformQuery(VendorGetCampaignParams,vendorCampaignQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.campaign,- operation: PolicyOperation.update,- },- ],},{method: ["DELETE"],matcher: "/vendor/campaigns/:id",- middlewares: [],- policies: [- {- resource: PolicyResource.campaign,- operation: PolicyOperation.delete,- },+ middlewares: [+ requirePermission("campaigns", "manage"),],},{method: ["POST"],matcher: "/vendor/campaigns/:id/promotions",middlewares: [+ requirePermission("campaigns", "edit"),validateAndTransformBody(createLinkBody()),validateAndTransformQuery(VendorGetCampaignParams,vendorCampaignQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.campaign,- operation: PolicyOperation.update,- },- ],},]diff --git a/packages/core/src/api/vendor/claims/middlewares.ts b/packages/core/src/api/vendor/claims/middlewares.tsindex 3c5774491..c44cc515b 100644--- a/packages/core/src/api/vendor/claims/middlewares.ts+++ b/packages/core/src/api/vendor/claims/middlewares.ts@@ -1,5 +1,4 @@-import { PolicyResource } from "../../utils/policy-resources"-import { PolicyOperation } from "@medusajs/framework/utils"+import { requirePermission } from "../../utils"import {AuthenticatedMedusaRequest,maybeApplyLinkFilter,@@ -81,279 +80,181 @@ export const vendorClaimsMiddlewares: MiddlewareRoute[] = [method: ["GET"],matcher: "/vendor/claims",middlewares: [+ requirePermission("orders.returns", "view"),validateAndTransformQuery(VendorGetClaimsParams,vendorClaimQueryConfig.list),applySellerClaimsFilter,],- policies: [- {- resource: PolicyResource.order_claim,- operation: PolicyOperation.read,- },- ],},{method: ["POST"],matcher: "/vendor/claims",middlewares: [+ requirePermission("orders.returns", "edit"),validateAndTransformBody(VendorPostOrderClaimsReq),assertSellerOwnsOrderInBody,],- policies: [- {- resource: PolicyResource.order_claim,- operation: PolicyOperation.create,- },- ],},{method: ["GET"],matcher: "/vendor/claims/:id",middlewares: [+ requirePermission("orders.returns", "view"),validateAndTransformQuery(VendorGetClaimParams,vendorClaimQueryConfig.retrieve),assertSellerOwnsClaimInParam,],- policies: [- {- resource: PolicyResource.order_claim,- operation: PolicyOperation.read,- },- ],},{method: ["POST"],matcher: "/vendor/claims/:id/cancel",middlewares: [+ requirePermission("orders.returns", "edit"),validateAndTransformBody(VendorPostCancelClaimReq),assertSellerOwnsClaimInParam,],- policies: [- {- resource: PolicyResource.order_claim,- operation: PolicyOperation.update,- },- ],},{method: ["POST"],matcher: "/vendor/claims/:id/request",- middlewares: [assertSellerOwnsClaimInParam],- policies: [- {- resource: PolicyResource.order_claim,- operation: PolicyOperation.update,- },- ],+ middlewares: [+ requirePermission("orders.returns", "edit"),+ assertSellerOwnsClaimInParam],},{method: ["DELETE"],matcher: "/vendor/claims/:id/request",- middlewares: [assertSellerOwnsClaimInParam],- policies: [- {- resource: PolicyResource.order_claim,- operation: PolicyOperation.delete,- },- ],+ middlewares: [+ requirePermission("orders.returns", "manage"),+ assertSellerOwnsClaimInParam],},{method: ["POST"],matcher: "/vendor/claims/:id/claim-items",middlewares: [+ requirePermission("orders.returns", "edit"),validateAndTransformBody(VendorPostClaimItemsReq),assertSellerOwnsClaimInParam,],- policies: [- {- resource: PolicyResource.order_claim,- operation: PolicyOperation.update,- },- ],},{method: ["POST"],matcher: "/vendor/claims/:id/claim-items/:action_id",middlewares: [+ requirePermission("orders.returns", "edit"),validateAndTransformBody(VendorPostClaimsItemsActionReq),assertSellerOwnsClaimInParam,],- policies: [- {- resource: PolicyResource.order_claim,- operation: PolicyOperation.update,- },- ],},{method: ["DELETE"],matcher: "/vendor/claims/:id/claim-items/:action_id",- middlewares: [assertSellerOwnsClaimInParam],- policies: [- {- resource: PolicyResource.order_claim,- operation: PolicyOperation.delete,- },- ],+ middlewares: [+ requirePermission("orders.returns", "manage"),+ assertSellerOwnsClaimInParam],},{method: ["POST"],matcher: "/vendor/claims/:id/inbound/items",middlewares: [+ requirePermission("orders.returns", "edit"),validateAndTransformBody(VendorPostClaimsRequestReturnItemsReq),assertSellerOwnsClaimInParam,],- policies: [- {- resource: PolicyResource.order_claim,- operation: PolicyOperation.update,- },- ],},{method: ["POST"],matcher: "/vendor/claims/:id/inbound/items/:action_id",middlewares: [+ requirePermission("orders.returns", "edit"),validateAndTransformBody(VendorPostClaimsRequestItemsReturnActionReq),assertSellerOwnsClaimInParam,],- policies: [- {- resource: PolicyResource.order_claim,- operation: PolicyOperation.update,- },- ],},{method: ["DELETE"],matcher: "/vendor/claims/:id/inbound/items/:action_id",- middlewares: [assertSellerOwnsClaimInParam],- policies: [- {- resource: PolicyResource.order_claim,- operation: PolicyOperation.delete,- },- ],+ middlewares: [+ requirePermission("orders.returns", "manage"),+ assertSellerOwnsClaimInParam],},{method: ["POST"],matcher: "/vendor/claims/:id/inbound/shipping-method",middlewares: [+ requirePermission("orders.returns", "edit"),validateAndTransformBody(VendorPostClaimsShippingReq),assertSellerOwnsClaimInParam,],- policies: [- {- resource: PolicyResource.order_claim,- operation: PolicyOperation.update,- },- ],},{method: ["POST"],matcher: "/vendor/claims/:id/inbound/shipping-method/:action_id",middlewares: [+ requirePermission("orders.returns", "edit"),validateAndTransformBody(VendorPostClaimsShippingActionReq),assertSellerOwnsClaimInParam,],- policies: [- {- resource: PolicyResource.order_claim,- operation: PolicyOperation.update,- },- ],},{method: ["DELETE"],matcher: "/vendor/claims/:id/inbound/shipping-method/:action_id",- middlewares: [assertSellerOwnsClaimInParam],- policies: [- {- resource: PolicyResource.order_claim,- operation: PolicyOperation.delete,- },- ],+ middlewares: [+ requirePermission("orders.returns", "manage"),+ assertSellerOwnsClaimInParam],},{method: ["POST"],matcher: "/vendor/claims/:id/outbound/items",middlewares: [+ requirePermission("orders.returns", "edit"),validateAndTransformBody(VendorPostClaimsAddItemsReq),assertSellerOwnsClaimInParam,],- policies: [- {- resource: PolicyResource.order_claim,- operation: PolicyOperation.update,- },- ],},{method: ["POST"],matcher: "/vendor/claims/:id/outbound/items/:action_id",middlewares: [+ requirePermission("orders.returns", "edit"),validateAndTransformBody(VendorPostClaimsAddItemsActionReq),assertSellerOwnsClaimInParam,],- policies: [- {- resource: PolicyResource.order_claim,- operation: PolicyOperation.update,- },- ],},{method: ["DELETE"],matcher: "/vendor/claims/:id/outbound/items/:action_id",- middlewares: [assertSellerOwnsClaimInParam],- policies: [- {- resource: PolicyResource.order_claim,- operation: PolicyOperation.delete,- },- ],+ middlewares: [+ requirePermission("orders.returns", "manage"),+ assertSellerOwnsClaimInParam],},{method: ["POST"],matcher: "/vendor/claims/:id/outbound/shipping-method",middlewares: [+ requirePermission("orders.returns", "edit"),validateAndTransformBody(VendorPostClaimsShippingReq),assertSellerOwnsClaimInParam,],- policies: [- {- resource: PolicyResource.order_claim,- operation: PolicyOperation.update,- },- ],},{method: ["POST"],matcher: "/vendor/claims/:id/outbound/shipping-method/:action_id",middlewares: [+ requirePermission("orders.returns", "edit"),validateAndTransformBody(VendorPostClaimsShippingActionReq),assertSellerOwnsClaimInParam,],- policies: [- {- resource: PolicyResource.order_claim,- operation: PolicyOperation.update,- },- ],},{method: ["DELETE"],matcher: "/vendor/claims/:id/outbound/shipping-method/:action_id",- middlewares: [assertSellerOwnsClaimInParam],- policies: [- {- resource: PolicyResource.order_claim,- operation: PolicyOperation.delete,- },- ],+ middlewares: [+ requirePermission("orders.returns", "manage"),+ assertSellerOwnsClaimInParam],},]diff --git a/packages/core/src/api/vendor/collections/middlewares.ts b/packages/core/src/api/vendor/collections/middlewares.tsindex 2dad1274c..d83c1ad82 100644--- a/packages/core/src/api/vendor/collections/middlewares.ts+++ b/packages/core/src/api/vendor/collections/middlewares.ts@@ -1,5 +1,4 @@-import { PolicyResource } from "../../utils/policy-resources"-import { PolicyOperation } from "@medusajs/framework/utils"+import { requirePermission } from "../../utils"import { MiddlewareRoute } from "@medusajs/framework/http"import {validateAndTransformBody,@@ -21,49 +20,34 @@ export const vendorCollectionsMiddlewares: MiddlewareRoute[] = [method: ["GET"],matcher: "/vendor/collections",middlewares: [+ requirePermission("product_collections", "view"),validateAndTransformQuery(VendorGetCollectionsParams,listTransformQueryConfig),],- policies: [- {- resource: PolicyResource.product_collection,- operation: PolicyOperation.read,- },- ],},{method: ["GET"],matcher: "/vendor/collections/:id",middlewares: [+ requirePermission("product_collections", "view"),validateAndTransformQuery(VendorGetCollectionParams,retrieveTransformQueryConfig),],- policies: [- {- resource: PolicyResource.product_collection,- operation: PolicyOperation.read,- },- ],},{method: ["POST"],matcher: "/vendor/collections/:id/products",middlewares: [+ requirePermission("product_collections", "edit"),validateAndTransformBody(createLinkBody()),validateAndTransformQuery(VendorGetCollectionParams,retrieveTransformQueryConfig),],- policies: [- {- resource: PolicyResource.product_collection,- operation: PolicyOperation.update,- },- ],},]diff --git a/packages/core/src/api/vendor/currencies/middlewares.ts b/packages/core/src/api/vendor/currencies/middlewares.tsindex e98a1c0bd..484f20a86 100644--- a/packages/core/src/api/vendor/currencies/middlewares.ts+++ b/packages/core/src/api/vendor/currencies/middlewares.ts@@ -1,5 +1,4 @@-import { PolicyResource } from "../../utils/policy-resources"-import { PolicyOperation } from "@medusajs/framework/utils"+import { requirePermission } from "../../utils"import { MiddlewareRoute } from "@medusajs/framework/http"import { validateAndTransformQuery } from "@medusajs/framework"@@ -11,32 +10,22 @@ export const vendorCurrenciesMiddlewares: MiddlewareRoute[] = [method: ["GET"],matcher: "/vendor/currencies",middlewares: [+ requirePermission("regions", "view"),validateAndTransformQuery(VendorGetCurrenciesParams,vendorCurrencyQueryConfig.list),],- policies: [- {- resource: PolicyResource.currency,- operation: PolicyOperation.read,- },- ],},{method: ["GET"],matcher: "/vendor/currencies/:code",middlewares: [+ requirePermission("regions", "view"),validateAndTransformQuery(VendorGetCurrencyParams,vendorCurrencyQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.currency,- operation: PolicyOperation.read,- },- ],},]diff --git a/packages/core/src/api/vendor/customer-groups/middlewares.ts b/packages/core/src/api/vendor/customer-groups/middlewares.tsindex 2e8e5fb87..a5a8b5438 100644--- a/packages/core/src/api/vendor/customer-groups/middlewares.ts+++ b/packages/core/src/api/vendor/customer-groups/middlewares.ts@@ -1,5 +1,4 @@-import { PolicyResource } from "../../utils/policy-resources"-import { PolicyOperation } from "@medusajs/framework/utils"+import { requirePermission } from "../../utils"import {AuthenticatedMedusaRequest,maybeApplyLinkFilter,@@ -40,95 +39,66 @@ export const vendorCustomerGroupsMiddlewares: MiddlewareRoute[] = [method: ["GET"],matcher: "/vendor/customer-groups",middlewares: [+ requirePermission("customer_groups", "view"),validateAndTransformQuery(VendorGetCustomerGroupsParams,vendorCustomerGroupQueryConfig.list),applySellerCustomerGroupLinkFilter,],- policies: [- {- resource: PolicyResource.customer_group,- operation: PolicyOperation.read,- },- ],},{method: ["POST"],matcher: "/vendor/customer-groups",middlewares: [+ requirePermission("customer_groups", "edit"),validateAndTransformBody(VendorCreateCustomerGroup),validateAndTransformQuery(VendorGetCustomerGroupParams,vendorCustomerGroupQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.customer_group,- operation: PolicyOperation.create,- },- ],},{method: ["GET"],matcher: "/vendor/customer-groups/:id",middlewares: [+ requirePermission("customer_groups", "view"),validateAndTransformQuery(VendorGetCustomerGroupParams,vendorCustomerGroupQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.customer_group,- operation: PolicyOperation.read,- },- ],},{method: ["POST"],matcher: "/vendor/customer-groups/:id",middlewares: [+ requirePermission("customer_groups", "edit"),validateAndTransformBody(VendorUpdateCustomerGroup),validateAndTransformQuery(VendorGetCustomerGroupParams,vendorCustomerGroupQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.customer_group,- operation: PolicyOperation.update,- },- ],},{method: ["DELETE"],matcher: "/vendor/customer-groups/:id",- middlewares: [],- policies: [- {- resource: PolicyResource.customer_group,- operation: PolicyOperation.delete,- },+ middlewares: [+ requirePermission("customer_groups", "manage"),],},{method: ["POST"],matcher: "/vendor/customer-groups/:id/customers",middlewares: [+ requirePermission("customer_groups", "edit"),validateAndTransformBody(VendorManageCustomerGroupCustomers),validateAndTransformQuery(VendorGetCustomerGroupParams,vendorCustomerGroupQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.customer_group,- operation: PolicyOperation.update,- },- ],},]diff --git a/packages/core/src/api/vendor/customers/middlewares.ts b/packages/core/src/api/vendor/customers/middlewares.tsindex bff551270..e4d457fc2 100644--- a/packages/core/src/api/vendor/customers/middlewares.ts+++ b/packages/core/src/api/vendor/customers/middlewares.ts@@ -1,5 +1,4 @@-import { PolicyResource } from "../../utils/policy-resources"-import { PolicyOperation } from "@medusajs/framework/utils"+import { requirePermission } from "../../utils"import {AuthenticatedMedusaRequest,maybeApplyLinkFilter,@@ -38,50 +37,35 @@ export const vendorCustomersMiddlewares: MiddlewareRoute[] = [method: ["GET"],matcher: "/vendor/customers",middlewares: [+ requirePermission("customers", "view"),validateAndTransformQuery(VendorGetCustomersParams,vendorCustomerQueryConfig.list),applySellerCustomerLinkFilter,],- policies: [- {- resource: PolicyResource.customer,- operation: PolicyOperation.read,- },- ],},{method: ["GET"],matcher: "/vendor/customers/:id",middlewares: [+ requirePermission("customers", "view"),validateAndTransformQuery(VendorGetCustomerParams,vendorCustomerQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.customer,- operation: PolicyOperation.read,- },- ],},{method: ["POST"],matcher: "/vendor/customers/:id/customer-groups",middlewares: [+ requirePermission("customers", "edit"),validateAndTransformBody(VendorManageCustomerCustomerGroups),validateAndTransformQuery(VendorGetCustomerParams,vendorCustomerQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.customer,- operation: PolicyOperation.update,- },- ],},]diff --git a/packages/core/src/api/vendor/exchanges/middlewares.ts b/packages/core/src/api/vendor/exchanges/middlewares.tsindex 06e0e6cc1..a424b9b24 100644--- a/packages/core/src/api/vendor/exchanges/middlewares.ts+++ b/packages/core/src/api/vendor/exchanges/middlewares.ts@@ -1,5 +1,4 @@-import { PolicyResource } from "../../utils/policy-resources"-import { PolicyOperation } from "@medusajs/framework/utils"+import { requirePermission } from "../../utils"import {AuthenticatedMedusaRequest,maybeApplyLinkFilter,@@ -78,223 +77,144 @@ export const vendorExchangesMiddlewares: MiddlewareRoute[] = [method: ["GET"],matcher: "/vendor/exchanges",middlewares: [+ requirePermission("orders.returns", "view"),validateAndTransformQuery(VendorGetExchangesParams,vendorExchangeQueryConfig.list),applySellerExchangesFilter,],- policies: [- {- resource: PolicyResource.order_exchange,- operation: PolicyOperation.read,- },- ],},{method: ["POST"],matcher: "/vendor/exchanges",middlewares: [+ requirePermission("orders.returns", "edit"),validateAndTransformBody(VendorPostOrderExchangesReq),assertSellerOwnsOrderInBody,],- policies: [- {- resource: PolicyResource.order_exchange,- operation: PolicyOperation.create,- },- ],},{method: ["POST"],matcher: "/vendor/exchanges/:id/cancel",middlewares: [+ requirePermission("orders.returns", "edit"),validateAndTransformBody(VendorPostCancelExchangeReq),assertSellerOwnsExchangeInParam,],- policies: [- {- resource: PolicyResource.order_exchange,- operation: PolicyOperation.update,- },- ],},{method: ["POST"],matcher: "/vendor/exchanges/:id/request",- middlewares: [assertSellerOwnsExchangeInParam],- policies: [- {- resource: PolicyResource.order_exchange,- operation: PolicyOperation.update,- },- ],+ middlewares: [+ requirePermission("orders.returns", "edit"),+ assertSellerOwnsExchangeInParam],},{method: ["DELETE"],matcher: "/vendor/exchanges/:id/request",- middlewares: [assertSellerOwnsExchangeInParam],- policies: [- {- resource: PolicyResource.order_exchange,- operation: PolicyOperation.delete,- },- ],+ middlewares: [+ requirePermission("orders.returns", "manage"),+ assertSellerOwnsExchangeInParam],},{method: ["POST"],matcher: "/vendor/exchanges/:id/inbound/items",middlewares: [+ requirePermission("orders.returns", "edit"),validateAndTransformBody(VendorPostExchangesReturnRequestItemsReq),assertSellerOwnsExchangeInParam,],- policies: [- {- resource: PolicyResource.order_exchange,- operation: PolicyOperation.update,- },- ],},{method: ["POST"],matcher: "/vendor/exchanges/:id/inbound/items/:action_id",middlewares: [+ requirePermission("orders.returns", "edit"),validateAndTransformBody(VendorPostExchangesRequestItemsReturnActionReq),assertSellerOwnsExchangeInParam,],- policies: [- {- resource: PolicyResource.order_exchange,- operation: PolicyOperation.update,- },- ],},{method: ["DELETE"],matcher: "/vendor/exchanges/:id/inbound/items/:action_id",- middlewares: [assertSellerOwnsExchangeInParam],- policies: [- {- resource: PolicyResource.order_exchange,- operation: PolicyOperation.delete,- },- ],+ middlewares: [+ requirePermission("orders.returns", "manage"),+ assertSellerOwnsExchangeInParam],},{method: ["POST"],matcher: "/vendor/exchanges/:id/inbound/shipping-method",middlewares: [+ requirePermission("orders.returns", "edit"),validateAndTransformBody(VendorPostExchangesShippingReq),assertSellerOwnsExchangeInParam,],- policies: [- {- resource: PolicyResource.order_exchange,- operation: PolicyOperation.update,- },- ],},{method: ["POST"],matcher: "/vendor/exchanges/:id/inbound/shipping-method/:action_id",middlewares: [+ requirePermission("orders.returns", "edit"),validateAndTransformBody(VendorPostExchangesShippingActionReq),assertSellerOwnsExchangeInParam,],- policies: [- {- resource: PolicyResource.order_exchange,- operation: PolicyOperation.update,- },- ],},{method: ["DELETE"],matcher: "/vendor/exchanges/:id/inbound/shipping-method/:action_id",- middlewares: [assertSellerOwnsExchangeInParam],- policies: [- {- resource: PolicyResource.order_exchange,- operation: PolicyOperation.delete,- },- ],+ middlewares: [+ requirePermission("orders.returns", "manage"),+ assertSellerOwnsExchangeInParam],},{method: ["POST"],matcher: "/vendor/exchanges/:id/outbound/items",middlewares: [+ requirePermission("orders.returns", "edit"),validateAndTransformBody(VendorPostExchangesAddItemsReq),assertSellerOwnsExchangeInParam,],- policies: [- {- resource: PolicyResource.order_exchange,- operation: PolicyOperation.update,- },- ],},{method: ["POST"],matcher: "/vendor/exchanges/:id/outbound/items/:action_id",middlewares: [+ requirePermission("orders.returns", "edit"),validateAndTransformBody(VendorPostExchangesItemsActionReq),assertSellerOwnsExchangeInParam,],- policies: [- {- resource: PolicyResource.order_exchange,- operation: PolicyOperation.update,- },- ],},{method: ["DELETE"],matcher: "/vendor/exchanges/:id/outbound/items/:action_id",- middlewares: [assertSellerOwnsExchangeInParam],- policies: [- {- resource: PolicyResource.order_exchange,- operation: PolicyOperation.delete,- },- ],+ middlewares: [+ requirePermission("orders.returns", "manage"),+ assertSellerOwnsExchangeInParam],},{method: ["POST"],matcher: "/vendor/exchanges/:id/outbound/shipping-method",middlewares: [+ requirePermission("orders.returns", "edit"),validateAndTransformBody(VendorPostExchangesShippingReq),assertSellerOwnsExchangeInParam,],- policies: [- {- resource: PolicyResource.order_exchange,- operation: PolicyOperation.update,- },- ],},{method: ["POST"],matcher: "/vendor/exchanges/:id/outbound/shipping-method/:action_id",middlewares: [+ requirePermission("orders.returns", "edit"),validateAndTransformBody(VendorPostExchangesShippingActionReq),assertSellerOwnsExchangeInParam,],- policies: [- {- resource: PolicyResource.order_exchange,- operation: PolicyOperation.update,- },- ],},{method: ["DELETE"],matcher: "/vendor/exchanges/:id/outbound/shipping-method/:action_id",- middlewares: [assertSellerOwnsExchangeInParam],- policies: [- {- resource: PolicyResource.order_exchange,- operation: PolicyOperation.delete,- },- ],+ middlewares: [+ requirePermission("orders.returns", "manage"),+ assertSellerOwnsExchangeInParam],},]diff --git a/packages/core/src/api/vendor/fulfillment-providers/middlewares.ts b/packages/core/src/api/vendor/fulfillment-providers/middlewares.tsindex 075908cf6..a5f508fb3 100644--- a/packages/core/src/api/vendor/fulfillment-providers/middlewares.ts+++ b/packages/core/src/api/vendor/fulfillment-providers/middlewares.ts@@ -1,5 +1,4 @@-import { PolicyResource } from "../../utils/policy-resources"-import { PolicyOperation } from "@medusajs/framework/utils"+import { requirePermission } from "../../utils"import { MiddlewareRoute } from "@medusajs/framework/http"import { validateAndTransformQuery } from "@medusajs/framework"@@ -11,16 +10,11 @@ export const vendorFulfillmentProvidersMiddlewares: MiddlewareRoute[] = [method: ["GET"],matcher: "/vendor/fulfillment-providers",middlewares: [+ requirePermission("fulfillment_sets", "view"),validateAndTransformQuery(VendorGetFulfillmentProvidersParams,vendorFulfillmentProviderQueryConfig.list),],- policies: [- {- resource: PolicyResource.fulfillment_provider,- operation: PolicyOperation.read,- },- ],},]diff --git a/packages/core/src/api/vendor/fulfillment-sets/middlewares.ts b/packages/core/src/api/vendor/fulfillment-sets/middlewares.tsindex 8ad39cb56..ed881dc27 100644--- a/packages/core/src/api/vendor/fulfillment-sets/middlewares.ts+++ b/packages/core/src/api/vendor/fulfillment-sets/middlewares.ts@@ -1,5 +1,4 @@-import { PolicyResource } from "../../utils/policy-resources"-import { PolicyOperation } from "@medusajs/framework/utils"+import { requirePermission } from "../../utils"import { MiddlewareRoute } from "@medusajs/framework/http"import {validateAndTransformBody,@@ -21,78 +20,54 @@ export const vendorFulfillmentSetsMiddlewares: MiddlewareRoute[] = [{method: ["DELETE"],matcher: "/vendor/fulfillment-sets/:id",- middlewares: [],- policies: [- {- resource: PolicyResource.fulfillment_set,- operation: PolicyOperation.delete,- },+ middlewares: [+ requirePermission("fulfillment_sets", "manage"),],},{method: ["POST"],matcher: "/vendor/fulfillment-sets/:id/service-zones",middlewares: [+ requirePermission("fulfillment_sets", "edit"),validateAndTransformBody(VendorCreateServiceZone),validateAndTransformQuery(VendorFulfillmentSetParams,vendorFulfillmentSetQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.fulfillment_set,- operation: PolicyOperation.update,- },- ],},{method: ["GET"],matcher: "/vendor/fulfillment-sets/:id/service-zones/:zone_id",middlewares: [+ requirePermission("fulfillment_sets", "view"),validateAndTransformQuery(VendorServiceZoneParams,vendorServiceZoneQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.fulfillment_set,- operation: PolicyOperation.read,- },- ],},{method: ["POST"],matcher: "/vendor/fulfillment-sets/:id/service-zones/:zone_id",middlewares: [+ requirePermission("fulfillment_sets", "edit"),validateAndTransformBody(VendorUpdateServiceZone),validateAndTransformQuery(VendorFulfillmentSetParams,vendorFulfillmentSetQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.fulfillment_set,- operation: PolicyOperation.update,- },- ],},{method: ["DELETE"],matcher: "/vendor/fulfillment-sets/:id/service-zones/:zone_id",middlewares: [+ requirePermission("fulfillment_sets", "manage"),validateAndTransformQuery(VendorFulfillmentSetParams,vendorFulfillmentSetQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.fulfillment_set,- operation: PolicyOperation.delete,- },- ],},]diff --git a/packages/core/src/api/vendor/inventory-items/middlewares.ts b/packages/core/src/api/vendor/inventory-items/middlewares.tsindex 4cef3e1ee..3ebb3833c 100644--- a/packages/core/src/api/vendor/inventory-items/middlewares.ts+++ b/packages/core/src/api/vendor/inventory-items/middlewares.ts@@ -1,5 +1,4 @@-import { PolicyResource } from "../../utils/policy-resources"-import { PolicyOperation } from "@medusajs/framework/utils"+import { requirePermission } from "../../utils"import {AuthenticatedMedusaRequest,maybeApplyLinkFilter,@@ -45,178 +44,124 @@ export const vendorInventoryItemsMiddlewares: MiddlewareRoute[] = [method: ["GET"],matcher: "/vendor/inventory-items",middlewares: [+ requirePermission("inventory_items", "view"),validateAndTransformQuery(VendorGetInventoryItemsParams,vendorInventoryItemQueryConfig.list),applySellerInventoryItemLinkFilter,],- policies: [- {- resource: PolicyResource.inventory_item,- operation: PolicyOperation.read,- },- ],},{method: ["GET"],matcher: "/vendor/inventory-items/:id",middlewares: [+ requirePermission("inventory_items", "view"),validateAndTransformQuery(VendorGetInventoryItemParams,vendorInventoryItemQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.inventory_item,- operation: PolicyOperation.read,- },- ],},{method: ["POST"],matcher: "/vendor/inventory-items",middlewares: [+ requirePermission("inventory_items", "edit"),validateAndTransformBody(VendorCreateInventoryItem),validateAndTransformQuery(VendorGetInventoryItemParams,vendorInventoryItemQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.inventory_item,- operation: PolicyOperation.create,- },- ],},{method: ["POST"],matcher: "/vendor/inventory-items/:id",middlewares: [+ requirePermission("inventory_items", "edit"),validateAndTransformBody(VendorUpdateInventoryItem),validateAndTransformQuery(VendorGetInventoryItemParams,vendorInventoryItemQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.inventory_item,- operation: PolicyOperation.update,- },- ],},{method: ["DELETE"],matcher: "/vendor/inventory-items/:id",- middlewares: [],- policies: [- {- resource: PolicyResource.inventory_item,- operation: PolicyOperation.delete,- },+ middlewares: [+ requirePermission("inventory_items", "manage"),],},{method: ["GET"],matcher: "/vendor/inventory-items/:id/location-levels",middlewares: [+ requirePermission("inventory_items", "view"),validateAndTransformQuery(VendorGetInventoryLocationLevelsParams,vendorLocationLevelQueryConfig.list),],- policies: [- {- resource: PolicyResource.inventory_item,- operation: PolicyOperation.read,- },- ],},{method: ["POST"],matcher: "/vendor/inventory-items/location-levels/batch",middlewares: [+ requirePermission("inventory_items", "edit"),validateAndTransformBody(VendorBatchInventoryItemLevels),validateAndTransformQuery(VendorGetInventoryLocationLevelParams,vendorLocationLevelQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.inventory_item,- operation: PolicyOperation.create,- },- ],},{method: ["POST"],matcher: "/vendor/inventory-items/:id/location-levels",middlewares: [+ requirePermission("inventory_items", "edit"),validateAndTransformBody(VendorCreateInventoryLocationLevel),validateAndTransformQuery(VendorGetInventoryItemParams,vendorInventoryItemQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.inventory_item,- operation: PolicyOperation.update,- },- ],},{method: ["POST"],matcher: "/vendor/inventory-items/:id/location-levels/batch",middlewares: [+ requirePermission("inventory_items", "edit"),validateAndTransformBody(VendorBatchInventoryItemLocationsLevel),validateAndTransformQuery(VendorGetInventoryLocationLevelParams,vendorLocationLevelQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.inventory_item,- operation: PolicyOperation.update,- },- ],},{method: ["POST"],matcher: "/vendor/inventory-items/:id/location-levels/:location_id",middlewares: [+ requirePermission("inventory_items", "edit"),validateAndTransformBody(VendorUpdateInventoryLocationLevel),validateAndTransformQuery(VendorGetInventoryItemParams,vendorInventoryItemQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.inventory_item,- operation: PolicyOperation.update,- },- ],},{method: ["DELETE"],matcher: "/vendor/inventory-items/:id/location-levels/:location_id",middlewares: [+ requirePermission("inventory_items", "manage"),validateAndTransformQuery(VendorGetInventoryItemParams,vendorInventoryItemQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.inventory_item,- operation: PolicyOperation.delete,- },- ],},]diff --git a/packages/core/src/api/vendor/members/me/route.ts b/packages/core/src/api/vendor/members/me/route.tsindex 4a6c83d82..a877e7272 100644--- a/packages/core/src/api/vendor/members/me/route.ts+++ b/packages/core/src/api/vendor/members/me/route.ts@@ -10,6 +10,7 @@ import { HttpTypes } from "@mercurjs/types"import { updateMemberWorkflow } from "../../../../workflows/seller/workflows"import { VendorUpdateMemberType } from "../validators"+import { attachPermissions, takePermissionsField } from "../../../utils"export const GET = async (req: AuthenticatedMedusaRequest,@@ -18,6 +19,7 @@ export const GET = async (const query = req.scope.resolve(ContainerRegistrationKeys.QUERY)const memberId = req.auth_context.actor_idconst sellerId = req.seller_context!.seller_id+ const withPermissions = takePermissionsField(req)const { data: sellerMembers } = await query.graph({entity: "seller_member",@@ -35,9 +37,9 @@ export const GET = async ()}- const sellerMember = sellerMembers[0]-- res.json({ seller_member: sellerMember })+ res.json({+ seller_member: attachPermissions(req, sellerMembers[0], withPermissions),+ })}export const POST = async (diff --git a/packages/core/src/api/vendor/members/middlewares.ts b/packages/core/src/api/vendor/members/middlewares.tsindex 4399625e9..16d9967bd 100644--- a/packages/core/src/api/vendor/members/middlewares.ts+++ b/packages/core/src/api/vendor/members/middlewares.ts@@ -1,6 +1,3 @@-import { withRbacRoleFields } from "../../utils/rbac-role-fields"-import { PolicyResource } from "../../utils/policy-resources"-import { PolicyOperation } from "@medusajs/framework/utils"import {authenticate,validateAndTransformBody,@@ -13,7 +10,7 @@ import { VendorAcceptMemberInvite, VendorUpdateMember } from "./validators"const retrieveVendorMemberMeQueryConfig = {get defaults() {- return withRbacRoleFields([+ return (["id","is_owner","member.*",@@ -45,12 +42,6 @@ export const vendorMembersMiddlewares: MiddlewareRoute[] = [retrieveVendorMemberMeQueryConfig),],- policies: [- {- resource: PolicyResource.seller_member,- operation: PolicyOperation.read,- },- ],},{method: ["POST"],@@ -62,11 +53,5 @@ export const vendorMembersMiddlewares: MiddlewareRoute[] = [retrieveVendorMemberMeQueryConfig),],- policies: [- {- resource: PolicyResource.seller_member,- operation: PolicyOperation.update,- },- ],},]diff --git a/packages/core/src/api/vendor/middlewares.ts b/packages/core/src/api/vendor/middlewares.tsindex 79da3f8c4..39b19f9b9 100644--- a/packages/core/src/api/vendor/middlewares.ts+++ b/packages/core/src/api/vendor/middlewares.ts@@ -41,7 +41,7 @@ import { vendorShippingProfilesMiddlewares } from "./shipping-profiles/middlewarimport { vendorStockLocationsMiddlewares } from "./stock-locations/middlewares"import { vendorStoresMiddlewares } from "./stores/middlewares"import { vendorUploadsMiddlewares } from "./uploads/middlewares"-import { ensureSellerMiddleware, scanUnauthenticatedRoutes, unlessBaseUrl, vendorCorsMiddleware } from "../utils"+import { ensureSellerMiddleware, resolvePermissionsMiddleware, scanUnauthenticatedRoutes, unlessBaseUrl, vendorCorsMiddleware } from "../utils"import { vendorProductAttributesMiddlewares } from "./product-attributes/middlewares"import { vendorProductTagsMiddlewares } from "./product-tags/middlewares"@@ -100,6 +100,10 @@ export const vendorMiddlewares: MiddlewareRoute[] = [sellerlessRoutes,ensureSellerMiddleware),+ unlessBaseUrl(+ sellerlessRoutes,+ resolvePermissionsMiddleware("vendor")+ ),],},...vendorMembersMiddlewares,diff --git a/packages/core/src/api/vendor/offers/middlewares.ts b/packages/core/src/api/vendor/offers/middlewares.tsindex d39d5543c..7a1446eb2 100644--- a/packages/core/src/api/vendor/offers/middlewares.ts+++ b/packages/core/src/api/vendor/offers/middlewares.ts@@ -1,5 +1,4 @@-import { PolicyResource } from "../../utils/policy-resources"-import { PolicyOperation } from "@medusajs/framework/utils"+import { requirePermission } from "../../utils"import {AuthenticatedMedusaRequest,MedusaNextFunction,@@ -35,112 +34,78 @@ export const vendorOffersMiddlewares: MiddlewareRoute[] = [method: ["GET"],matcher: "/vendor/offers",middlewares: [+ requirePermission("offers", "view"),validateAndTransformQuery(VendorGetOffersParams,vendorOfferQueryConfig.list),applySellerOfferFilter,],- policies: [- {- resource: PolicyResource.offer,- operation: PolicyOperation.read,- },- ],},{method: ["POST"],matcher: "/vendor/offers",middlewares: [+ requirePermission("offers", "edit"),validateAndTransformBody(VendorCreateOffer),validateAndTransformQuery(VendorGetOfferParams,vendorOfferQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.offer,- operation: PolicyOperation.create,- },- ],},{method: ["POST"],matcher: "/vendor/offers/batch",middlewares: [+ requirePermission("offers", "edit"),validateAndTransformBody(VendorCreateOffersBatch),validateAndTransformQuery(VendorGetOfferParams,vendorOfferQueryConfig.list),],- policies: [- {- resource: PolicyResource.offer,- operation: PolicyOperation.create,- },- ],},{method: ["GET"],matcher: "/vendor/offers/:id",middlewares: [+ requirePermission("offers", "view"),validateAndTransformQuery(VendorGetOfferParams,vendorOfferQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.offer,- operation: PolicyOperation.read,- },- ],},{method: ["POST"],matcher: "/vendor/offers/:id",middlewares: [+ requirePermission("offers", "edit"),validateAndTransformBody(VendorUpdateOffer),validateAndTransformQuery(VendorGetOfferParams,vendorOfferQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.offer,- operation: PolicyOperation.update,- },- ],},{method: ["DELETE"],matcher: "/vendor/offers/:id",- middlewares: [],- policies: [- {- resource: PolicyResource.offer,- operation: PolicyOperation.delete,- },+ middlewares: [+ requirePermission("offers", "manage"),],},{method: ["POST"],matcher: "/vendor/offers/:id/inventory-items/batch",middlewares: [+ requirePermission("offers", "edit"),validateAndTransformBody(VendorBatchOfferInventoryItems),validateAndTransformQuery(VendorGetOfferParams,vendorOfferQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.offer,- operation: PolicyOperation.update,- },- ],},]diff --git a/packages/core/src/api/vendor/order-edits/middlewares.ts b/packages/core/src/api/vendor/order-edits/middlewares.tsindex f4c798574..aad42cfdb 100644--- a/packages/core/src/api/vendor/order-edits/middlewares.ts+++ b/packages/core/src/api/vendor/order-edits/middlewares.ts@@ -1,5 +1,4 @@-import { PolicyResource } from "../../utils/policy-resources"-import { PolicyOperation } from "@medusajs/framework/utils"+import { requirePermission } from "../../utils"import {AuthenticatedMedusaRequest,MedusaNextFunction,@@ -45,139 +44,89 @@ export const vendorOrderEditsMiddlewares: MiddlewareRoute[] = [method: ["POST"],matcher: "/vendor/order-edits",middlewares: [+ requirePermission("orders.edits", "edit"),validateAndTransformBody(VendorPostOrderEditsReq),assertSellerOwnsOrderInBody,],- policies: [- {- resource: PolicyResource.order_change,- operation: PolicyOperation.create,- },- ],},{method: ["DELETE"],matcher: "/vendor/order-edits/:id",- middlewares: [assertSellerOwnsOrderInParam],- policies: [- {- resource: PolicyResource.order_change,- operation: PolicyOperation.delete,- },- ],+ middlewares: [+ requirePermission("orders.edits", "manage"),+ assertSellerOwnsOrderInParam],},{method: ["POST"],matcher: "/vendor/order-edits/:id/request",- middlewares: [assertSellerOwnsOrderInParam],- policies: [- {- resource: PolicyResource.order_change,- operation: PolicyOperation.update,- },- ],+ middlewares: [+ requirePermission("orders.edits", "edit"),+ assertSellerOwnsOrderInParam],},{method: ["POST"],matcher: "/vendor/order-edits/:id/confirm",- middlewares: [assertSellerOwnsOrderInParam],- policies: [- {- resource: PolicyResource.order_change,- operation: PolicyOperation.update,- },- ],+ middlewares: [+ requirePermission("orders.edits", "edit"),+ assertSellerOwnsOrderInParam],},{method: ["POST"],matcher: "/vendor/order-edits/:id/items",middlewares: [+ requirePermission("orders.edits", "edit"),validateAndTransformBody(VendorPostOrderEditsAddItemsReq),assertSellerOwnsOrderInParam,],- policies: [- {- resource: PolicyResource.order_change,- operation: PolicyOperation.update,- },- ],},{method: ["POST"],matcher: "/vendor/order-edits/:id/items/:action_id",middlewares: [+ requirePermission("orders.edits", "edit"),validateAndTransformBody(VendorPostOrderEditsItemsActionReq),assertSellerOwnsOrderInParam,],- policies: [- {- resource: PolicyResource.order_change,- operation: PolicyOperation.update,- },- ],},{method: ["DELETE"],matcher: "/vendor/order-edits/:id/items/:action_id",- middlewares: [assertSellerOwnsOrderInParam],- policies: [- {- resource: PolicyResource.order_change,- operation: PolicyOperation.delete,- },- ],+ middlewares: [+ requirePermission("orders.edits", "manage"),+ assertSellerOwnsOrderInParam],},{method: ["POST"],matcher: "/vendor/order-edits/:id/items/item/:item_id",middlewares: [+ requirePermission("orders.edits", "edit"),validateAndTransformBody(VendorPostOrderEditsUpdateItemQuantityReq),assertSellerOwnsOrderInParam,],- policies: [- {- resource: PolicyResource.order_change,- operation: PolicyOperation.update,- },- ],},{method: ["POST"],matcher: "/vendor/order-edits/:id/shipping-method",middlewares: [+ requirePermission("orders.edits", "edit"),validateAndTransformBody(VendorPostOrderEditsShippingReq),assertSellerOwnsOrderInParam,],- policies: [- {- resource: PolicyResource.order_change,- operation: PolicyOperation.update,- },- ],},{method: ["POST"],matcher: "/vendor/order-edits/:id/shipping-method/:action_id",middlewares: [+ requirePermission("orders.edits", "edit"),validateAndTransformBody(VendorPostOrderEditsShippingActionReq),assertSellerOwnsOrderInParam,],- policies: [- {- resource: PolicyResource.order_change,- operation: PolicyOperation.update,- },- ],},{method: ["DELETE"],matcher: "/vendor/order-edits/:id/shipping-method/:action_id",- middlewares: [assertSellerOwnsOrderInParam],- policies: [- {- resource: PolicyResource.order_change,- operation: PolicyOperation.delete,- },- ],+ middlewares: [+ requirePermission("orders.edits", "manage"),+ assertSellerOwnsOrderInParam],},]diff --git a/packages/core/src/api/vendor/orders/middlewares.ts b/packages/core/src/api/vendor/orders/middlewares.tsindex 40544b780..86f468e60 100644--- a/packages/core/src/api/vendor/orders/middlewares.ts+++ b/packages/core/src/api/vendor/orders/middlewares.ts@@ -1,5 +1,4 @@-import { PolicyResource } from "../../utils/policy-resources"-import { PolicyOperation } from "@medusajs/framework/utils"+import { requirePermission } from "../../utils"import {AuthenticatedMedusaRequest,maybeApplyLinkFilter,@@ -40,159 +39,115 @@ const applySellerLinkFilter = (}export const vendorOrdersMiddlewares: MiddlewareRoute[] = [+ {+ method: ["GET"],+ matcher: "/vendor/orders/:id/commission-lines",+ middlewares: [requirePermission("commission_lines", "view")],+ },{method: ["GET"],matcher: "/vendor/orders",middlewares: [+ requirePermission("orders", "view"),validateAndTransformQuery(VendorGetOrdersParams,vendorOrderQueryConfig.list),applySellerLinkFilter,],- policies: [- {- resource: PolicyResource.order,- operation: PolicyOperation.read,- },- ],},{method: ["GET"],matcher: "/vendor/orders/:id",middlewares: [+ requirePermission("orders", "view"),validateAndTransformQuery(VendorGetOrderParams,vendorOrderQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.order,- operation: PolicyOperation.read,- },- ],},{method: ["GET"],matcher: "/vendor/orders/:id/preview",- middlewares: [],- policies: [- {- resource: PolicyResource.order,- operation: PolicyOperation.read,- },+ middlewares: [+ requirePermission("orders", "view"),],},{method: ["POST"],matcher: "/vendor/orders/:id/cancel",middlewares: [+ requirePermission("orders", "edit"),validateAndTransformQuery(VendorGetOrderParams,vendorOrderQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.order,- operation: PolicyOperation.update,- },- ],},{method: ["POST"],matcher: "/vendor/orders/:id/complete",middlewares: [+ requirePermission("orders", "edit"),validateAndTransformQuery(VendorGetOrderParams,vendorOrderQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.order,- operation: PolicyOperation.update,- },- ],},{method: ["GET"],matcher: "/vendor/orders/:id/changes",middlewares: [+ requirePermission("orders", "view"),validateAndTransformQuery(VendorGetOrderChangesParams,vendorOrderChangesQueryConfig.list),],- policies: [- {- resource: PolicyResource.order,- operation: PolicyOperation.read,- },- ],},{method: ["POST"],matcher: "/vendor/orders/:id/fulfillments",middlewares: [+ requirePermission("orders", "edit"),validateAndTransformBody(VendorCreateFulfillment),],- policies: [- {- resource: PolicyResource.order,- operation: PolicyOperation.update,- },- ],},{method: ["POST"],matcher: "/vendor/orders/:id/fulfillments/:fulfillment_id/cancel",middlewares: [+ requirePermission("orders", "edit"),validateAndTransformBody(VendorCancelFulfillment),validateAndTransformQuery(VendorGetOrderParams,vendorOrderQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.order,- operation: PolicyOperation.update,- },- ],},{method: ["POST"],matcher: "/vendor/orders/:id/fulfillments/:fulfillment_id/mark-as-delivered",middlewares: [+ requirePermission("orders", "edit"),validateAndTransformQuery(VendorGetOrderParams,vendorOrderQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.order,- operation: PolicyOperation.update,- },- ],},{method: ["POST"],matcher: "/vendor/orders/:id/fulfillments/:fulfillment_id/shipments",middlewares: [+ requirePermission("orders", "edit"),validateAndTransformBody(VendorCreateShipment),validateAndTransformQuery(VendorGetOrderParams,vendorOrderQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.order,- operation: PolicyOperation.update,- },- ],},]diff --git a/packages/core/src/api/vendor/payments/middlewares.ts b/packages/core/src/api/vendor/payments/middlewares.tsindex 342421e0f..cfdf95abc 100644--- a/packages/core/src/api/vendor/payments/middlewares.ts+++ b/packages/core/src/api/vendor/payments/middlewares.ts@@ -1,5 +1,4 @@-import { PolicyResource } from "../../utils/policy-resources"-import { PolicyOperation } from "@medusajs/framework/utils"+import { requirePermission } from "../../utils"import {AuthenticatedMedusaRequest,maybeApplyLinkFilter,@@ -43,83 +42,58 @@ export const vendorPaymentsMiddlewares: MiddlewareRoute[] = [method: ["GET"],matcher: "/vendor/payments",middlewares: [+ requirePermission("payments", "view"),validateAndTransformQuery(VendorGetPaymentsParams,vendorPaymentQueryConfig.list),applySellerPaymentLinkFilter,],- policies: [- {- resource: PolicyResource.payment,- operation: PolicyOperation.read,- },- ],},{method: ["GET"],matcher: "/vendor/payments/payment-providers",middlewares: [+ requirePermission("payments", "view"),validateAndTransformQuery(VendorGetPaymentProvidersParams,vendorPaymentProviderQueryConfig.list),],- policies: [- {- resource: PolicyResource.payment,- operation: PolicyOperation.read,- },- ],},{method: ["GET"],matcher: "/vendor/payments/:id",middlewares: [+ requirePermission("payments", "view"),validateAndTransformQuery(VendorGetPaymentParams,vendorPaymentQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.payment,- operation: PolicyOperation.read,- },- ],},{method: ["POST"],matcher: "/vendor/payments/:id/capture",middlewares: [+ requirePermission("payments", "edit"),validateAndTransformBody(VendorCreatePaymentCapture),validateAndTransformQuery(VendorGetPaymentParams,vendorPaymentQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.payment,- operation: PolicyOperation.update,- },- ],},{method: ["POST"],matcher: "/vendor/payments/:id/refund",middlewares: [+ requirePermission("payments", "edit"),validateAndTransformBody(VendorCreatePaymentRefund),validateAndTransformQuery(VendorGetPaymentParams,vendorPaymentQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.payment,- operation: PolicyOperation.update,- },- ],},]diff --git a/packages/core/src/api/vendor/payout-accounts/middlewares.ts b/packages/core/src/api/vendor/payout-accounts/middlewares.tsindex 1be8ca894..b10d9a98a 100644--- a/packages/core/src/api/vendor/payout-accounts/middlewares.ts+++ b/packages/core/src/api/vendor/payout-accounts/middlewares.ts@@ -1,5 +1,4 @@-import { PolicyResource } from "../../utils/policy-resources"-import { PolicyOperation } from "@medusajs/framework/utils"+import { requirePermission } from "../../utils"import {AuthenticatedMedusaRequest,maybeApplyLinkFilter,@@ -42,67 +41,47 @@ export const vendorPayoutAccountsMiddlewares: MiddlewareRoute[] = [method: ["GET"],matcher: "/vendor/payout-accounts",middlewares: [+ requirePermission("payout_accounts", "view"),validateAndTransformQuery(VendorGetPayoutAccountsParams,vendorPayoutAccountQueryConfig.list),applySellerPayoutAccountLinkFilter,],- policies: [- {- resource: PolicyResource.payout_account,- operation: PolicyOperation.read,- },- ],},{method: ["POST"],matcher: "/vendor/payout-accounts",middlewares: [+ requirePermission("payout_accounts", "edit"),validateAndTransformBody(VendorCreatePayoutAccount),validateAndTransformQuery(VendorGetPayoutAccountParams,vendorPayoutAccountQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.payout_account,- operation: PolicyOperation.create,- },- ],},{method: ["GET"],matcher: "/vendor/payout-accounts/:id",middlewares: [+ requirePermission("payout_accounts", "view"),validateAndTransformQuery(VendorGetPayoutAccountParams,vendorPayoutAccountQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.payout_account,- operation: PolicyOperation.read,- },- ],},{method: ["POST"],matcher: "/vendor/payout-accounts/:id/onboarding",middlewares: [+ requirePermission("payout_accounts", "edit"),validateAndTransformBody(VendorCreateOnboarding),validateAndTransformQuery(VendorGetPayoutAccountParams,vendorOnboardingQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.payout_account,- operation: PolicyOperation.update,- },- ],},]diff --git a/packages/core/src/api/vendor/payouts/middlewares.ts b/packages/core/src/api/vendor/payouts/middlewares.tsindex 574ae1a87..dc745c958 100644--- a/packages/core/src/api/vendor/payouts/middlewares.ts+++ b/packages/core/src/api/vendor/payouts/middlewares.ts@@ -1,5 +1,4 @@-import { PolicyResource } from "../../utils/policy-resources"-import { PolicyOperation } from "@medusajs/framework/utils"+import { requirePermission } from "../../utils"import {AuthenticatedMedusaRequest,maybeApplyLinkFilter,@@ -31,33 +30,23 @@ export const vendorPayoutsMiddlewares: MiddlewareRoute[] = [method: ["GET"],matcher: "/vendor/payouts",middlewares: [+ requirePermission("payouts", "view"),validateAndTransformQuery(VendorGetPayoutsParams,vendorPayoutQueryConfig.list),applySellerPayoutLinkFilter,],- policies: [- {- resource: PolicyResource.payout,- operation: PolicyOperation.read,- },- ],},{method: ["GET"],matcher: "/vendor/payouts/:id",middlewares: [+ requirePermission("payouts", "view"),validateAndTransformQuery(VendorGetPayoutParams,vendorPayoutQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.payout,- operation: PolicyOperation.read,- },- ],},]diff --git a/packages/core/src/api/vendor/price-lists/middlewares.ts b/packages/core/src/api/vendor/price-lists/middlewares.tsindex 0569bb111..fc7d52034 100644--- a/packages/core/src/api/vendor/price-lists/middlewares.ts+++ b/packages/core/src/api/vendor/price-lists/middlewares.ts@@ -1,5 +1,4 @@-import { PolicyResource } from "../../utils/policy-resources"-import { PolicyOperation } from "@medusajs/framework/utils"+import { requirePermission } from "../../utils"import {AuthenticatedMedusaRequest,maybeApplyLinkFilter,@@ -43,117 +42,84 @@ export const vendorPriceListsMiddlewares: MiddlewareRoute[] = [method: ["GET"],matcher: "/vendor/price-lists",middlewares: [+ requirePermission("price_lists", "view"),validateAndTransformQuery(VendorGetPriceListsParams,QueryConfig.listPriceListQueryConfig),applySellerPriceListLinkFilter,],- policies: [- {- resource: PolicyResource.price_list,- operation: PolicyOperation.read,- },- ],},{method: ["GET"],matcher: "/vendor/price-lists/:id",middlewares: [+ requirePermission("price_lists", "view"),validateAndTransformQuery(VendorGetPriceListParams,QueryConfig.retrievePriceListQueryConfig),],- policies: [- {- resource: PolicyResource.price_list,- operation: PolicyOperation.read,- },- ],},{method: ["POST"],matcher: "/vendor/price-lists",middlewares: [+ requirePermission("price_lists", "edit"),validateAndTransformBody(VendorCreatePriceList),validateAndTransformQuery(VendorGetPriceListParams,QueryConfig.retrievePriceListQueryConfig),],- policies: [- {- resource: PolicyResource.price_list,- operation: PolicyOperation.create,- },- ],},{method: ["POST"],matcher: "/vendor/price-lists/:id",middlewares: [+ requirePermission("price_lists", "edit"),validateAndTransformBody(VendorUpdatePriceList),validateAndTransformQuery(VendorGetPriceListParams,QueryConfig.retrievePriceListQueryConfig),],- policies: [- {- resource: PolicyResource.price_list,- operation: PolicyOperation.update,- },- ],},{method: ["DELETE"],matcher: "/vendor/price-lists/:id",- middlewares: [],- policies: [- {- resource: PolicyResource.price_list,- operation: PolicyOperation.delete,- },+ middlewares: [+ requirePermission("price_lists", "manage"),],},{method: ["POST"],matcher: "/vendor/price-lists/:id/products",middlewares: [+ requirePermission("price_lists", "edit"),validateAndTransformBody(createLinkBody()),validateAndTransformQuery(VendorGetPriceListParams,QueryConfig.retrievePriceListQueryConfig),],- policies: [- {- resource: PolicyResource.price_list,- operation: PolicyOperation.update,- },- ],},{method: ["GET"],matcher: "/vendor/price-lists/:id/prices",middlewares: [+ requirePermission("price_lists", "view"),validateAndTransformQuery(VendorGetPriceListPricesParams,QueryConfig.listPriceListPriceQueryConfig),],- policies: [- {- resource: PolicyResource.price_list,- operation: PolicyOperation.read,- },- ],},{method: ["POST"],matcher: "/vendor/price-lists/:id/prices/batch",middlewares: [+ requirePermission("price_lists", "edit"),validateAndTransformBody(createBatchBody(VendorCreatePriceListPrice, VendorUpdatePriceListPrice)),@@ -162,11 +128,5 @@ export const vendorPriceListsMiddlewares: MiddlewareRoute[] = [QueryConfig.listPriceListPriceQueryConfig),],- policies: [- {- resource: PolicyResource.price_list,- operation: PolicyOperation.update,- },- ],},]diff --git a/packages/core/src/api/vendor/price-preferences/middlewares.ts b/packages/core/src/api/vendor/price-preferences/middlewares.tsindex ff198dab2..11a98f5dd 100644--- a/packages/core/src/api/vendor/price-preferences/middlewares.ts+++ b/packages/core/src/api/vendor/price-preferences/middlewares.ts@@ -1,5 +1,4 @@-import { PolicyResource } from "../../utils/policy-resources"-import { PolicyOperation } from "@medusajs/framework/utils"+import { requirePermission } from "../../utils"import { MiddlewareRoute } from "@medusajs/framework/http"import { validateAndTransformQuery } from "@medusajs/framework"@@ -17,32 +16,22 @@ export const vendorPricePreferencesMiddlewares: MiddlewareRoute[] = [method: ["GET"],matcher: "/vendor/price-preferences",middlewares: [+ requirePermission("price_preferences", "view"),validateAndTransformQuery(VendorGetPricePreferencesParams,listTransformQueryConfig),],- policies: [- {- resource: PolicyResource.price_preference,- operation: PolicyOperation.read,- },- ],},{method: ["GET"],matcher: "/vendor/price-preferences/:id",middlewares: [+ requirePermission("price_preferences", "view"),validateAndTransformQuery(VendorGetPricePreferenceParams,retrieveTransformQueryConfig),],- policies: [- {- resource: PolicyResource.price_preference,- operation: PolicyOperation.read,- },- ],},]diff --git a/packages/core/src/api/vendor/product-attributes/middlewares.ts b/packages/core/src/api/vendor/product-attributes/middlewares.tsindex 05304241d..9b2d44ab3 100644--- a/packages/core/src/api/vendor/product-attributes/middlewares.ts+++ b/packages/core/src/api/vendor/product-attributes/middlewares.ts@@ -1,5 +1,4 @@-import { PolicyResource } from "../../utils/policy-resources"-import { PolicyOperation } from "@medusajs/framework/utils"+import { requirePermission } from "../../utils"import {MedusaNextFunction,MedusaRequest,@@ -38,6 +37,7 @@ export const vendorProductAttributesMiddlewares: MiddlewareRoute[] = [method: ["GET"],matcher: "/vendor/product-attributes",middlewares: [+ requirePermission("product_attributes", "view"),validateAndTransformQuery(VendorGetProductAttributesParams,vendorProductAttributeQueryConfig.list@@ -45,27 +45,16 @@ export const vendorProductAttributesMiddlewares: MiddlewareRoute[] = [renameCategoryIdFilter,filterAttributesByCategoryLinkOrGlobal,],- policies: [- {- resource: PolicyResource.product_attribute,- operation: PolicyOperation.read,- },- ],},{method: ["GET"],matcher: "/vendor/product-attributes/:id",middlewares: [+ requirePermission("product_attributes", "view"),validateAndTransformQuery(VendorGetProductAttributeParams,vendorProductAttributeQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.product_attribute,- operation: PolicyOperation.read,- },- ],},]diff --git a/packages/core/src/api/vendor/product-categories/middlewares.ts b/packages/core/src/api/vendor/product-categories/middlewares.tsindex 5b2f5834d..c8d7a5db7 100644--- a/packages/core/src/api/vendor/product-categories/middlewares.ts+++ b/packages/core/src/api/vendor/product-categories/middlewares.ts@@ -1,5 +1,4 @@-import { PolicyResource } from "../../utils/policy-resources"-import { PolicyOperation } from "@medusajs/framework/utils"+import { requirePermission } from "../../utils"import { MiddlewareRoute } from "@medusajs/framework/http"import {validateAndTransformBody,@@ -18,49 +17,34 @@ export const vendorProductCategoriesMiddlewares: MiddlewareRoute[] = [method: ["GET"],matcher: "/vendor/product-categories",middlewares: [+ requirePermission("product_categories", "view"),validateAndTransformQuery(VendorGetProductCategoriesParams,vendorProductCategoryQueryConfig.list),],- policies: [- {- resource: PolicyResource.product_category,- operation: PolicyOperation.read,- },- ],},{method: ["GET"],matcher: "/vendor/product-categories/:id",middlewares: [+ requirePermission("product_categories", "view"),validateAndTransformQuery(VendorProductCategoryParams,vendorProductCategoryQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.product_category,- operation: PolicyOperation.read,- },- ],},{method: ["POST"],matcher: "/vendor/product-categories/:id/products",middlewares: [+ requirePermission("product_categories", "edit"),validateAndTransformBody(VendorBatchLinkProductsToCategory),validateAndTransformQuery(VendorProductCategoryParams,vendorProductCategoryQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.product_category,- operation: PolicyOperation.update,- },- ],},]diff --git a/packages/core/src/api/vendor/product-tags/middlewares.ts b/packages/core/src/api/vendor/product-tags/middlewares.tsindex 2fd2f1fe0..4440187a7 100644--- a/packages/core/src/api/vendor/product-tags/middlewares.ts+++ b/packages/core/src/api/vendor/product-tags/middlewares.ts@@ -1,5 +1,4 @@-import { PolicyResource } from "../../utils/policy-resources"-import { PolicyOperation } from "@medusajs/framework/utils"+import { requirePermission } from "../../utils"import { MiddlewareRoute } from "@medusajs/framework/http"import { validateAndTransformQuery } from "@medusajs/framework"@@ -14,32 +13,22 @@ export const vendorProductTagsMiddlewares: MiddlewareRoute[] = [method: ["GET"],matcher: "/vendor/product-tags",middlewares: [+ requirePermission("product_tags", "view"),validateAndTransformQuery(VendorGetProductTagsParams,vendorProductTagsQueryConfig.list),],- policies: [- {- resource: PolicyResource.product_tag,- operation: PolicyOperation.read,- },- ],},{method: ["GET"],matcher: "/vendor/product-tags/:id",middlewares: [+ requirePermission("product_tags", "view"),validateAndTransformQuery(VendorGetProductTagParams,vendorProductTagsQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.product_tag,- operation: PolicyOperation.read,- },- ],},]diff --git a/packages/core/src/api/vendor/product-types/middlewares.ts b/packages/core/src/api/vendor/product-types/middlewares.tsindex 1c069800c..8b669adec 100644--- a/packages/core/src/api/vendor/product-types/middlewares.ts+++ b/packages/core/src/api/vendor/product-types/middlewares.ts@@ -1,5 +1,4 @@-import { PolicyResource } from "../../utils/policy-resources"-import { PolicyOperation } from "@medusajs/framework/utils"+import { requirePermission } from "../../utils"import { MiddlewareRoute } from "@medusajs/framework/http"import { validateAndTransformQuery } from "@medusajs/framework"@@ -14,32 +13,22 @@ export const vendorProductTypesMiddlewares: MiddlewareRoute[] = [method: ["GET"],matcher: "/vendor/product-types",middlewares: [+ requirePermission("product_types", "view"),validateAndTransformQuery(VendorGetProductTypesParams,vendorProductTypeQueryConfig.list),],- policies: [- {- resource: PolicyResource.product_type,- operation: PolicyOperation.read,- },- ],},{method: ["GET"],matcher: "/vendor/product-types/:id",middlewares: [+ requirePermission("product_types", "view"),validateAndTransformQuery(VendorGetProductTypeParams,vendorProductTypeQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.product_type,- operation: PolicyOperation.read,- },- ],},]diff --git a/packages/core/src/api/vendor/product-variants/middlewares.ts b/packages/core/src/api/vendor/product-variants/middlewares.tsindex d6cb25759..399a654f6 100644--- a/packages/core/src/api/vendor/product-variants/middlewares.ts+++ b/packages/core/src/api/vendor/product-variants/middlewares.ts@@ -1,5 +1,4 @@-import { PolicyResource } from "../../utils/policy-resources"-import { PolicyOperation } from "@medusajs/framework/utils"+import { requirePermission } from "../../utils"import {AuthenticatedMedusaRequest,MedusaNextFunction,@@ -56,17 +55,12 @@ export const vendorProductVariantsMiddlewares: MiddlewareRoute[] = [method: ["GET"],matcher: "/vendor/product-variants",middlewares: [+ requirePermission("products", "view"),validateAndTransformQuery(VendorGetProductVariantsParams,vendorProductVariantsQueryConfig.list),applySellerProductVariantFilter,],- policies: [- {- resource: PolicyResource.product_variant,- operation: PolicyOperation.read,- },- ],},]diff --git a/packages/core/src/api/vendor/products/middlewares.ts b/packages/core/src/api/vendor/products/middlewares.tsindex 8d9e75889..0259a4baa 100644--- a/packages/core/src/api/vendor/products/middlewares.ts+++ b/packages/core/src/api/vendor/products/middlewares.ts@@ -1,5 +1,4 @@-import { PolicyResource } from "../../utils/policy-resources"-import { PolicyOperation } from "@medusajs/framework/utils"+import { requirePermission } from "../../utils"import {AuthenticatedMedusaRequest,MedusaNextFunction,@@ -98,10 +97,16 @@ const ensureVariantBelongsToProduct = async (}export const vendorProductsMiddlewares: MiddlewareRoute[] = [+ {+ method: ["GET"],+ matcher: "/vendor/products/:id/preview",+ middlewares: [requirePermission("products", "view")],+ },{method: ["GET"],matcher: "/vendor/products",middlewares: [+ requirePermission("products", "view"),validateAndTransformQuery(VendorGetProductsParams,vendorProductQueryConfig.list@@ -109,142 +114,99 @@ export const vendorProductsMiddlewares: MiddlewareRoute[] = [applySellerProductLinkFilter,applyOfferedProductsFilter,],- policies: [- {- resource: PolicyResource.product,- operation: PolicyOperation.read,- },- ],},{method: ["POST"],matcher: "/vendor/products",middlewares: [+ requirePermission("products", "edit"),validateAndTransformBody(VendorCreateProduct),validateAndTransformQuery(VendorGetProductParams,vendorProductQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.product,- operation: PolicyOperation.create,- },- ],},{method: ["GET"],matcher: "/vendor/products/:id",middlewares: [+ requirePermission("products", "view"),validateAndTransformQuery(VendorGetProductParams,vendorProductQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.product,- operation: PolicyOperation.read,- },- ],},{method: ["POST"],matcher: "/vendor/products/:id",middlewares: [+ requirePermission("products", "edit"),validateAndTransformBody(VendorUpdateProduct),validateAndTransformQuery(VendorGetProductParams,vendorProductQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.product,- operation: PolicyOperation.update,- },- ],},{method: ["DELETE"],matcher: "/vendor/products/:id",- middlewares: [],- policies: [- {- resource: PolicyResource.product,- operation: PolicyOperation.delete,- },+ middlewares: [+ requirePermission("products", "manage"),],},{method: ["POST"],matcher: "/vendor/products/:id/cancel",- middlewares: [validateAndTransformBody(VendorCancelProductChange)],- policies: [- {- resource: PolicyResource.product,- operation: PolicyOperation.update,- },- ],+ middlewares: [+ requirePermission("products", "edit"),+ validateAndTransformBody(VendorCancelProductChange)],},{method: ["GET"],matcher: "/vendor/products/:id/variants",middlewares: [+ requirePermission("products", "view"),validateAndTransformQuery(VendorGetProductVariantsParams,vendorProductVariantQueryConfig.list),],- policies: [- {- resource: PolicyResource.product_variant,- operation: PolicyOperation.read,- },- ],},{method: ["POST"],matcher: "/vendor/products/:id/variants",middlewares: [+ requirePermission("products", "edit"),validateAndTransformBody(VendorAddProductVariant),validateAndTransformQuery(VendorGetProductParams,vendorProductQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.product_variant,- operation: PolicyOperation.update,- },- ],},{method: ["GET"],matcher: "/vendor/products/:id/variants/:variant_id",middlewares: [+ requirePermission("products", "view"),validateAndTransformQuery(VendorGetProductVariantParams,vendorProductVariantQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.product_variant,- operation: PolicyOperation.read,- },- ],},{method: ["POST"],matcher: "/vendor/products/:id/variants/:variant_id",middlewares: [+ requirePermission("products", "edit"),ensureVariantBelongsToProduct,validateAndTransformBody(VendorUpdateProductVariant),validateAndTransformQuery(@@ -252,40 +214,25 @@ export const vendorProductsMiddlewares: MiddlewareRoute[] = [vendorProductQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.product_variant,- operation: PolicyOperation.update,- },- ],},{method: ["DELETE"],matcher: "/vendor/products/:id/variants/:variant_id",- middlewares: [ensureVariantBelongsToProduct],- policies: [- {- resource: PolicyResource.product_variant,- operation: PolicyOperation.delete,- },- ],+ middlewares: [+ requirePermission("products", "manage"),+ ensureVariantBelongsToProduct],},{method: ["POST"],matcher: "/vendor/products/:id/attributes/batch",middlewares: [+ requirePermission("products", "edit"),validateAndTransformBody(VendorBatchProductAttributes),validateAndTransformQuery(VendorGetProductParams,vendorProductQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.product,- operation: PolicyOperation.update,- },- ],},]diff --git a/packages/core/src/api/vendor/promotions/middlewares.ts b/packages/core/src/api/vendor/promotions/middlewares.tsindex 54c6a1697..d7dced973 100644--- a/packages/core/src/api/vendor/promotions/middlewares.ts+++ b/packages/core/src/api/vendor/promotions/middlewares.ts@@ -1,5 +1,4 @@-import { PolicyResource } from "../../utils/policy-resources"-import { PolicyOperation } from "@medusajs/framework/utils"+import { requirePermission } from "../../utils"import {AuthenticatedMedusaRequest,maybeApplyLinkFilter,@@ -45,132 +44,94 @@ export const vendorPromotionsMiddlewares: MiddlewareRoute[] = [method: ["GET"],matcher: "/vendor/promotions",middlewares: [+ requirePermission("promotions", "view"),validateAndTransformQuery(VendorGetPromotionsParams,vendorPromotionQueryConfig.list),applySellerPromotionLinkFilter,],- policies: [- {- resource: PolicyResource.promotion,- operation: PolicyOperation.read,- },- ],},{method: ["POST"],matcher: "/vendor/promotions",middlewares: [+ requirePermission("promotions", "edit"),validateAndTransformBody(VendorCreatePromotion),validateAndTransformQuery(VendorGetPromotionParams,vendorPromotionQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.promotion,- operation: PolicyOperation.create,- },- ],},{method: ["GET"],matcher: "/vendor/promotions/rule-attribute-options/:rule_type",middlewares: [+ requirePermission("promotions", "view"),validateAndTransformQuery(VendorGetPromotionRuleParams,vendorPromotionRuleQueryConfig.list),],- policies: [- {- resource: PolicyResource.promotion,- operation: PolicyOperation.read,- },- ],},{method: ["GET"],matcher: "/vendor/promotions/rule-value-options/:rule_type/:rule_attribute_id",middlewares: [+ requirePermission("promotions", "view"),validateAndTransformQuery(VendorGetPromotionsRuleValueParams,vendorRuleValueQueryConfig.list),],- policies: [- {- resource: PolicyResource.promotion,- operation: PolicyOperation.read,- },- ],},{method: ["GET"],matcher: "/vendor/promotions/:id",middlewares: [+ requirePermission("promotions", "view"),validateAndTransformQuery(VendorGetPromotionParams,vendorPromotionQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.promotion,- operation: PolicyOperation.read,- },- ],},{method: ["POST"],matcher: "/vendor/promotions/:id",middlewares: [+ requirePermission("promotions", "edit"),validateAndTransformBody(VendorUpdatePromotion),validateAndTransformQuery(VendorGetPromotionParams,vendorPromotionQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.promotion,- operation: PolicyOperation.update,- },- ],},{method: ["DELETE"],matcher: "/vendor/promotions/:id",- middlewares: [],- policies: [- {- resource: PolicyResource.promotion,- operation: PolicyOperation.delete,- },+ middlewares: [+ requirePermission("promotions", "manage"),],},{method: ["GET"],matcher: "/vendor/promotions/:id/:rule_type",middlewares: [+ requirePermission("promotions", "view"),validateAndTransformQuery(VendorGetPromotionRuleTypeParams,vendorPromotionQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.promotion,- operation: PolicyOperation.read,- },- ],},{method: ["POST"],matcher: "/vendor/promotions/:id/rules/batch",middlewares: [+ requirePermission("promotions", "edit"),validateAndTransformBody(createBatchBody(VendorCreatePromotionRule, VendorUpdatePromotionRule)),@@ -179,17 +140,12 @@ export const vendorPromotionsMiddlewares: MiddlewareRoute[] = [vendorPromotionRuleQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.promotion,- operation: PolicyOperation.update,- },- ],},{method: ["POST"],matcher: "/vendor/promotions/:id/target-rules/batch",middlewares: [+ requirePermission("promotions", "edit"),validateAndTransformBody(createBatchBody(VendorCreatePromotionRule, VendorUpdatePromotionRule)),@@ -198,17 +154,12 @@ export const vendorPromotionsMiddlewares: MiddlewareRoute[] = [vendorPromotionRuleQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.promotion,- operation: PolicyOperation.update,- },- ],},{method: ["POST"],matcher: "/vendor/promotions/:id/buy-rules/batch",middlewares: [+ requirePermission("promotions", "edit"),validateAndTransformBody(createBatchBody(VendorCreatePromotionRule, VendorUpdatePromotionRule)),@@ -217,11 +168,5 @@ export const vendorPromotionsMiddlewares: MiddlewareRoute[] = [vendorPromotionRuleQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.promotion,- operation: PolicyOperation.update,- },- ],},]diff --git a/packages/core/src/api/vendor/rbac/me/permissions/route.ts b/packages/core/src/api/vendor/rbac/me/permissions/route.tsdeleted file mode 100644index 141d46f2c..000000000--- a/packages/core/src/api/vendor/rbac/me/permissions/route.ts+++ /dev/null@@ -1,81 +0,0 @@-import {- AuthenticatedMedusaRequest,- MedusaResponse,- resolvePermissions,-} from "@medusajs/framework"-import {- ContainerRegistrationKeys,- FeatureFlag,- Policy,- WILDCARD,-} from "@medusajs/framework/utils"--type PolicyTuple = { resource: string; operation: string }--/**- * The acting member's effective permissions for the current seller, as a flat- * list of `resource:operation` strings with wildcards expanded.- *- * Roles come from `req.auth_context.app_metadata`, which `ensureSellerMiddleware`- * populates from the member's `seller_member.role_id`. Reading them there rather- * than from the member keeps this scoped to the seller the request is acting on —- * one member can belong to several sellers with a different role in each.- *- * When the rbac flag is off `resolvePermissions` returns the whole universe, so- * the panel sees an unrestricted policy rather than an empty one.- */-export const GET = async (- req: AuthenticatedMedusaRequest,- res: MedusaResponse<{ permissions: string[] }>-) => {- const roleIds = (req.auth_context?.app_metadata?.roles as string[]) ?? []-- const query = req.scope.resolve(ContainerRegistrationKeys.QUERY)-- const universe: PolicyTuple[] = []- const seen = new Set<string>()-- const consider = (resource?: string, operation?: string) => {- if (- !resource ||- !operation ||- resource === WILDCARD ||- operation === WILDCARD- ) {- return- }-- const key = `${resource}:${operation}`-- if (seen.has(key)) {- return- }-- seen.add(key)- universe.push({ resource, operation })- }-- for (const definition of Object.values(Policy)) {- consider(definition?.resource, definition?.operation)- }-- // Covers policies persisted at runtime that the code registry doesn't know.- if (FeatureFlag.isFeatureEnabled("rbac")) {- const { data: persistedPolicies } = await query.graph({- entity: "rbac_policy",- fields: ["resource", "operation"],- })-- for (const policy of persistedPolicies ?? []) {- consider(policy?.resource, policy?.operation)- }- }-- const granted = await resolvePermissions({- roles: roleIds,- universe,- container: req.scope,- })-- res.status(200).json({ permissions: Array.from(granted).sort() })-}diff --git a/packages/core/src/api/vendor/refund-reasons/middlewares.ts b/packages/core/src/api/vendor/refund-reasons/middlewares.tsindex ab5ff7b65..f2b3d6a87 100644--- a/packages/core/src/api/vendor/refund-reasons/middlewares.ts+++ b/packages/core/src/api/vendor/refund-reasons/middlewares.ts@@ -1,5 +1,4 @@-import { PolicyResource } from "../../utils/policy-resources"-import { PolicyOperation } from "@medusajs/framework/utils"+import { requirePermission } from "../../utils"import { MiddlewareRoute } from "@medusajs/framework/http"import { validateAndTransformQuery } from "@medusajs/framework"@@ -14,32 +13,22 @@ export const vendorRefundReasonsMiddlewares: MiddlewareRoute[] = [method: ["GET"],matcher: "/vendor/refund-reasons",middlewares: [+ requirePermission("refund_reasons", "view"),validateAndTransformQuery(VendorGetRefundReasonsParams,vendorRefundReasonQueryConfig.list),],- policies: [- {- resource: PolicyResource.refund_reason,- operation: PolicyOperation.read,- },- ],},{method: ["GET"],matcher: "/vendor/refund-reasons/:id",middlewares: [+ requirePermission("refund_reasons", "view"),validateAndTransformQuery(VendorGetRefundReasonParams,vendorRefundReasonQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.refund_reason,- operation: PolicyOperation.read,- },- ],},]diff --git a/packages/core/src/api/vendor/regions/middlewares.ts b/packages/core/src/api/vendor/regions/middlewares.tsindex 9a38652aa..5976e2001 100644--- a/packages/core/src/api/vendor/regions/middlewares.ts+++ b/packages/core/src/api/vendor/regions/middlewares.ts@@ -1,5 +1,4 @@-import { PolicyResource } from "../../utils/policy-resources"-import { PolicyOperation } from "@medusajs/framework/utils"+import { requirePermission } from "../../utils"import { MiddlewareRoute } from "@medusajs/framework/http"import { validateAndTransformQuery } from "@medusajs/framework"@@ -11,32 +10,22 @@ export const vendorRegionsMiddlewares: MiddlewareRoute[] = [method: ["GET"],matcher: "/vendor/regions",middlewares: [+ requirePermission("regions", "view"),validateAndTransformQuery(VendorGetRegionsParams,vendorRegionQueryConfig.list),],- policies: [- {- resource: PolicyResource.region,- operation: PolicyOperation.read,- },- ],},{method: ["GET"],matcher: "/vendor/regions/:id",middlewares: [+ requirePermission("regions", "view"),validateAndTransformQuery(VendorGetRegionParams,vendorRegionQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.region,- operation: PolicyOperation.read,- },- ],},]diff --git a/packages/core/src/api/vendor/reservations/middlewares.ts b/packages/core/src/api/vendor/reservations/middlewares.tsindex e9f6d3bbb..f95115232 100644--- a/packages/core/src/api/vendor/reservations/middlewares.ts+++ b/packages/core/src/api/vendor/reservations/middlewares.ts@@ -1,5 +1,4 @@-import { PolicyResource } from "../../utils/policy-resources"-import { PolicyOperation } from "@medusajs/framework/utils"+import { requirePermission } from "../../utils"import {AuthenticatedMedusaRequest,MedusaNextFunction,@@ -189,6 +188,7 @@ export const vendorReservationsMiddlewares: MiddlewareRoute[] = [method: ["GET"],matcher: "/vendor/reservations",middlewares: [+ requirePermission("reservations", "view"),validateAndTransformQuery(VendorGetReservationsParams,vendorReservationQueryConfig.list@@ -196,34 +196,24 @@ export const vendorReservationsMiddlewares: MiddlewareRoute[] = [maybeApplyInventoryItemSkuFilter,applySellerReservationsFilter,],- policies: [- {- resource: PolicyResource.reservation_item,- operation: PolicyOperation.read,- },- ],},{method: ["GET"],matcher: "/vendor/reservations/:id",middlewares: [+ requirePermission("reservations", "view"),validateAndTransformQuery(VendorGetReservationParams,vendorReservationQueryConfig.retrieve),assertReservationOwnership,],- policies: [- {- resource: PolicyResource.reservation_item,- operation: PolicyOperation.read,- },- ],},{method: ["POST"],matcher: "/vendor/reservations",middlewares: [+ requirePermission("reservations", "edit"),validateAndTransformBody(VendorCreateReservation),assertCreateReservationOwnership,validateAndTransformQuery(@@ -231,17 +221,12 @@ export const vendorReservationsMiddlewares: MiddlewareRoute[] = [vendorReservationQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.reservation_item,- operation: PolicyOperation.create,- },- ],},{method: ["POST"],matcher: "/vendor/reservations/:id",middlewares: [+ requirePermission("reservations", "edit"),validateAndTransformBody(VendorUpdateReservation),assertReservationOwnership,validateAndTransformQuery(@@ -249,22 +234,12 @@ export const vendorReservationsMiddlewares: MiddlewareRoute[] = [vendorReservationQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.reservation_item,- operation: PolicyOperation.update,- },- ],},{method: ["DELETE"],matcher: "/vendor/reservations/:id",- middlewares: [assertReservationOwnership],- policies: [- {- resource: PolicyResource.reservation_item,- operation: PolicyOperation.delete,- },- ],+ middlewares: [+ requirePermission("reservations", "manage"),+ assertReservationOwnership],},]diff --git a/packages/core/src/api/vendor/return-reasons/middlewares.ts b/packages/core/src/api/vendor/return-reasons/middlewares.tsindex debf031c9..55bbb80a3 100644--- a/packages/core/src/api/vendor/return-reasons/middlewares.ts+++ b/packages/core/src/api/vendor/return-reasons/middlewares.ts@@ -1,5 +1,4 @@-import { PolicyResource } from "../../utils/policy-resources"-import { PolicyOperation } from "@medusajs/framework/utils"+import { requirePermission } from "../../utils"import { MiddlewareRoute } from "@medusajs/framework/http"import { validateAndTransformQuery } from "@medusajs/framework"@@ -14,32 +13,22 @@ export const vendorReturnReasonsMiddlewares: MiddlewareRoute[] = [method: ["GET"],matcher: "/vendor/return-reasons",middlewares: [+ requirePermission("return_reasons", "view"),validateAndTransformQuery(VendorGetReturnReasonsParams,vendorReturnReasonQueryConfig.list),],- policies: [- {- resource: PolicyResource.return_reason,- operation: PolicyOperation.read,- },- ],},{method: ["GET"],matcher: "/vendor/return-reasons/:id",middlewares: [+ requirePermission("return_reasons", "view"),validateAndTransformQuery(VendorGetReturnReasonParams,vendorReturnReasonQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.return_reason,- operation: PolicyOperation.read,- },- ],},]diff --git a/packages/core/src/api/vendor/returns/middlewares.ts b/packages/core/src/api/vendor/returns/middlewares.tsindex 06da6bdc6..b23a336a7 100644--- a/packages/core/src/api/vendor/returns/middlewares.ts+++ b/packages/core/src/api/vendor/returns/middlewares.ts@@ -1,5 +1,4 @@-import { PolicyResource } from "../../utils/policy-resources"-import { PolicyOperation } from "@medusajs/framework/utils"+import { requirePermission } from "../../utils"import {AuthenticatedMedusaRequest,maybeApplyLinkFilter,@@ -59,357 +58,249 @@ export const vendorReturnsMiddlewares: MiddlewareRoute[] = [method: ["GET"],matcher: "/vendor/returns",middlewares: [+ requirePermission("orders.returns", "view"),validateAndTransformQuery(VendorGetReturnsParams,vendorReturnQueryConfig.list),applySellerOrderLinkFilter,],- policies: [- {- resource: PolicyResource.return,- operation: PolicyOperation.read,- },- ],},{method: ["GET"],matcher: "/vendor/returns/:id",middlewares: [+ requirePermission("orders.returns", "view"),validateAndTransformQuery(VendorGetReturnParams,vendorReturnQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.return,- operation: PolicyOperation.read,- },- ],},{method: ["POST"],matcher: "/vendor/returns/:id",middlewares: [+ requirePermission("orders.returns", "edit"),validateAndTransformBody(VendorPostReturnsReturnReq),validateAndTransformQuery(VendorGetReturnsOrderParams,vendorReturnQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.return,- operation: PolicyOperation.update,- },- ],},{method: ["POST"],matcher: "/vendor/returns",middlewares: [+ requirePermission("orders.returns", "edit"),validateAndTransformBody(VendorPostReturnsReq),validateAndTransformQuery(VendorGetReturnsOrderParams,vendorReturnQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.return,- operation: PolicyOperation.create,- },- ],},{method: ["POST"],matcher: "/vendor/returns/:id/request-items",middlewares: [+ requirePermission("orders.returns", "edit"),validateAndTransformBody(VendorPostReturnsRequestItemsReq),validateAndTransformQuery(VendorGetReturnsOrderParams,vendorReturnQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.return,- operation: PolicyOperation.update,- },- ],},{method: ["POST"],matcher: "/vendor/returns/:id/request-items/:action_id",middlewares: [+ requirePermission("orders.returns", "edit"),validateAndTransformBody(VendorPostReturnsRequestItemsActionReq),validateAndTransformQuery(VendorGetReturnsOrderParams,vendorReturnQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.return,- operation: PolicyOperation.update,- },- ],},{method: ["DELETE"],matcher: "/vendor/returns/:id/request-items/:action_id",middlewares: [+ requirePermission("orders.returns", "manage"),validateAndTransformQuery(VendorGetReturnsOrderParams,vendorReturnQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.return,- operation: PolicyOperation.delete,- },- ],},{method: ["POST"],matcher: "/vendor/returns/:id/shipping-method",middlewares: [+ requirePermission("orders.returns", "edit"),validateAndTransformBody(VendorPostReturnsShippingReq),validateAndTransformQuery(VendorGetReturnsOrderParams,vendorReturnQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.return,- operation: PolicyOperation.update,- },- ],},{method: ["POST"],matcher: "/vendor/returns/:id/shipping-method/:action_id",middlewares: [+ requirePermission("orders.returns", "edit"),validateAndTransformBody(VendorPostReturnsShippingActionReq),validateAndTransformQuery(VendorGetReturnsOrderParams,vendorReturnQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.return,- operation: PolicyOperation.update,- },- ],},{method: ["DELETE"],matcher: "/vendor/returns/:id/shipping-method/:action_id",middlewares: [+ requirePermission("orders.returns", "manage"),validateAndTransformQuery(VendorGetReturnsOrderParams,vendorReturnQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.return,- operation: PolicyOperation.delete,- },- ],},{method: ["POST"],matcher: "/vendor/returns/:id/request",middlewares: [+ requirePermission("orders.returns", "edit"),validateAndTransformBody(VendorPostReturnsConfirmRequestReq),validateAndTransformQuery(VendorGetReturnsOrderParams,vendorReturnQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.return,- operation: PolicyOperation.update,- },- ],},{method: ["POST"],matcher: "/vendor/returns/:id/cancel",middlewares: [+ requirePermission("orders.returns", "edit"),validateAndTransformBody(VendorPostCancelReturnReq),validateAndTransformQuery(VendorGetReturnsOrderParams,vendorReturnQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.return,- operation: PolicyOperation.update,- },- ],},{method: ["DELETE"],matcher: "/vendor/returns/:id/request",- middlewares: [],- policies: [- {- resource: PolicyResource.return,- operation: PolicyOperation.delete,- },+ middlewares: [+ requirePermission("orders.returns", "manage"),],},{method: ["POST"],matcher: "/vendor/returns/:id/receive",middlewares: [+ requirePermission("orders.returns", "edit"),validateAndTransformBody(VendorPostReceiveReturnsReq),validateAndTransformQuery(VendorGetReturnsOrderParams,vendorReturnQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.return,- operation: PolicyOperation.update,- },- ],},{method: ["DELETE"],matcher: "/vendor/returns/:id/receive",- middlewares: [],- policies: [- {- resource: PolicyResource.return,- operation: PolicyOperation.delete,- },+ middlewares: [+ requirePermission("orders.returns", "manage"),],},{method: ["POST"],matcher: "/vendor/returns/:id/receive/confirm",middlewares: [+ requirePermission("orders.returns", "edit"),validateAndTransformBody(VendorPostReturnsConfirmRequestReq),validateAndTransformQuery(VendorGetReturnsOrderParams,vendorReturnQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.return,- operation: PolicyOperation.update,- },- ],},{method: ["POST"],matcher: "/vendor/returns/:id/receive-items",middlewares: [+ requirePermission("orders.returns", "edit"),validateAndTransformBody(VendorPostReturnsReceiveItemsReq),validateAndTransformQuery(VendorGetReturnsOrderParams,vendorReturnQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.return,- operation: PolicyOperation.update,- },- ],},{method: ["POST"],matcher: "/vendor/returns/:id/receive-items/:action_id",middlewares: [+ requirePermission("orders.returns", "edit"),validateAndTransformBody(VendorPostReturnsRequestItemsActionReq),validateAndTransformQuery(VendorGetReturnsOrderParams,vendorReturnQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.return,- operation: PolicyOperation.update,- },- ],},{method: ["DELETE"],matcher: "/vendor/returns/:id/receive-items/:action_id",middlewares: [+ requirePermission("orders.returns", "manage"),validateAndTransformQuery(VendorGetReturnsOrderParams,vendorReturnQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.return,- operation: PolicyOperation.delete,- },- ],},{method: ["POST"],matcher: "/vendor/returns/:id/dismiss-items",middlewares: [+ requirePermission("orders.returns", "edit"),validateAndTransformBody(VendorPostReturnsReceiveItemsReq),validateAndTransformQuery(VendorGetReturnsOrderParams,vendorReturnQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.return,- operation: PolicyOperation.update,- },- ],},{method: ["POST"],matcher: "/vendor/returns/:id/dismiss-items/:action_id",middlewares: [+ requirePermission("orders.returns", "edit"),validateAndTransformBody(VendorPostReturnsRequestItemsActionReq),validateAndTransformQuery(VendorGetReturnsOrderParams,vendorReturnQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.return,- operation: PolicyOperation.update,- },- ],},{method: ["DELETE"],matcher: "/vendor/returns/:id/dismiss-items/:action_id",middlewares: [+ requirePermission("orders.returns", "manage"),validateAndTransformQuery(VendorGetReturnsOrderParams,vendorReturnQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.return,- operation: PolicyOperation.delete,- },- ],},]diff --git a/packages/core/src/api/vendor/reviews/middlewares.ts b/packages/core/src/api/vendor/reviews/middlewares.tsindex 68c65bc28..2e3462d31 100644--- a/packages/core/src/api/vendor/reviews/middlewares.ts+++ b/packages/core/src/api/vendor/reviews/middlewares.ts@@ -1,5 +1,4 @@-import { PolicyResource } from "../../utils/policy-resources"-import { PolicyOperation } from "@medusajs/framework/utils"+import { requirePermission } from "../../utils"import {AuthenticatedMedusaRequest,maybeApplyLinkFilter,@@ -35,50 +34,35 @@ export const vendorReviewsMiddlewares: MiddlewareRoute[] = [method: ["GET"],matcher: "/vendor/reviews",middlewares: [+ requirePermission("reviews", "view"),validateAndTransformQuery(VendorGetReviewsParams,vendorReviewQueryConfig.list),applySellerReviewLinkFilter,],- policies: [- {- resource: PolicyResource.review,- operation: PolicyOperation.read,- },- ],},{method: ["GET"],matcher: "/vendor/reviews/:id",middlewares: [+ requirePermission("reviews", "view"),validateAndTransformQuery(VendorGetReviewsParams,vendorReviewQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.review,- operation: PolicyOperation.read,- },- ],},{method: ["POST"],matcher: "/vendor/reviews/:id",middlewares: [+ requirePermission("reviews", "edit"),validateAndTransformQuery(VendorGetReviewsParams,vendorReviewQueryConfig.retrieve),validateAndTransformBody(VendorRespondReview),],- policies: [- {- resource: PolicyResource.review,- operation: PolicyOperation.update,- },- ],},]diff --git a/packages/core/src/api/vendor/sales-channels/middlewares.ts b/packages/core/src/api/vendor/sales-channels/middlewares.tsindex 9d3dab419..2abd36bc2 100644--- a/packages/core/src/api/vendor/sales-channels/middlewares.ts+++ b/packages/core/src/api/vendor/sales-channels/middlewares.ts@@ -1,5 +1,4 @@-import { PolicyResource } from "../../utils/policy-resources"-import { PolicyOperation } from "@medusajs/framework/utils"+import { requirePermission } from "../../utils"import { MiddlewareRoute } from "@medusajs/framework/http"import {validateAndTransformBody,@@ -21,49 +20,34 @@ export const vendorSalesChannelsMiddlewares: MiddlewareRoute[] = [method: ["GET"],matcher: "/vendor/sales-channels",middlewares: [+ requirePermission("sales_channels", "view"),validateAndTransformQuery(VendorGetSalesChannelsParams,listTransformQueryConfig),],- policies: [- {- resource: PolicyResource.sales_channel,- operation: PolicyOperation.read,- },- ],},{method: ["GET"],matcher: "/vendor/sales-channels/:id",middlewares: [+ requirePermission("sales_channels", "view"),validateAndTransformQuery(VendorGetSalesChannelParams,retrieveTransformQueryConfig),],- policies: [- {- resource: PolicyResource.sales_channel,- operation: PolicyOperation.read,- },- ],},{method: ["POST"],matcher: "/vendor/sales-channels/:id/products",middlewares: [+ requirePermission("sales_channels", "edit"),validateAndTransformBody(createLinkBody()),validateAndTransformQuery(VendorGetSalesChannelParams,retrieveTransformQueryConfig),],- policies: [- {- resource: PolicyResource.sales_channel,- operation: PolicyOperation.update,- },- ],},]diff --git a/packages/core/src/api/vendor/sellers/me/route.ts b/packages/core/src/api/vendor/sellers/me/route.tsindex 31a7e48ae..4ec8a605a 100644--- a/packages/core/src/api/vendor/sellers/me/route.ts+++ b/packages/core/src/api/vendor/sellers/me/route.ts@@ -13,7 +13,7 @@ export const GET = async (res: MedusaResponse<HttpTypes.VendorSellerResponse>) => {const query = req.scope.resolve(ContainerRegistrationKeys.QUERY)- const sellerId = req.seller_context!.seller_id+ const sellerId = req.seller_context!.seller_idconst {data: [seller],diff --git a/packages/core/src/api/vendor/sellers/middlewares.ts b/packages/core/src/api/vendor/sellers/middlewares.tsindex 322366623..764f5aab2 100644--- a/packages/core/src/api/vendor/sellers/middlewares.ts+++ b/packages/core/src/api/vendor/sellers/middlewares.ts@@ -1,4 +1,4 @@-import { PolicyResource } from "../../utils/policy-resources"+import { requirePermission } from "../../utils"import {ensureSellerIdParamMiddleware,ensureSellerMemberParamMiddleware,@@ -7,11 +7,9 @@ import {validateAndTransformBody,validateAndTransformQuery,} from "@medusajs/framework"-import { PolicyOperation } from "@medusajs/framework/utils"import { MiddlewareRoute } from "@medusajs/medusa"import * as QueryConfig from "./query-config"-import { Entities } from "./query-config"import {VendorCreateSellerAccount,VendorGetSellerParams,@@ -42,29 +40,18 @@ export const vendorSellersMiddlewares: MiddlewareRoute[] = [QueryConfig.retrieveVendorSellerQueryConfig),],- policies: [- {- resource: PolicyResource.seller,- operation: PolicyOperation.read,- },- ],},{method: ["POST"],matcher: "/vendor/sellers/me",middlewares: [+ requirePermission("store", "edit"),validateAndTransformBody(VendorUpdateSeller),validateAndTransformQuery(VendorGetSellerParams,QueryConfig.retrieveVendorSellerQueryConfig),],- policies: [- {- resource: PolicyResource.seller,- operation: PolicyOperation.update,- },- ],},{method: ["POST"],@@ -87,23 +74,19 @@ export const vendorSellersMiddlewares: MiddlewareRoute[] = [method: ["GET"],matcher: "/vendor/sellers/:id",middlewares: [+ requirePermission("store", "view"),ensureSellerIdParamMiddleware,validateAndTransformQuery(VendorGetSellerParams,QueryConfig.retrieveVendorSellerQueryConfig),],- policies: [- {- resource: Entities.seller,- operation: PolicyOperation.read,- },- ],},{method: ["POST"],matcher: "/vendor/sellers/:id",middlewares: [+ requirePermission("store", "edit"),ensureSellerIdParamMiddleware,validateAndTransformBody(VendorUpdateSeller),validateAndTransformQuery(@@ -111,17 +94,12 @@ export const vendorSellersMiddlewares: MiddlewareRoute[] = [QueryConfig.retrieveVendorSellerQueryConfig),],- policies: [- {- resource: Entities.seller,- operation: PolicyOperation.update,- },- ],},{method: ["POST"],matcher: "/vendor/sellers/:id/address",middlewares: [+ requirePermission("store", "edit"),ensureSellerIdParamMiddleware,validateAndTransformBody(VendorUpsertSellerAddress),validateAndTransformQuery(@@ -129,17 +107,12 @@ export const vendorSellersMiddlewares: MiddlewareRoute[] = [QueryConfig.retrieveVendorSellerQueryConfig),],- policies: [- {- resource: Entities.seller,- operation: PolicyOperation.update,- },- ],},{method: ["POST"],matcher: "/vendor/sellers/:id/payment-details",middlewares: [+ requirePermission("store", "edit"),ensureSellerIdParamMiddleware,validateAndTransformBody(VendorUpsertSellerPaymentDetails),validateAndTransformQuery(@@ -147,17 +120,12 @@ export const vendorSellersMiddlewares: MiddlewareRoute[] = [QueryConfig.retrieveVendorSellerQueryConfig),],- policies: [- {- resource: Entities.seller,- operation: PolicyOperation.update,- },- ],},{method: ["POST"],matcher: "/vendor/sellers/:id/professional-details",middlewares: [+ requirePermission("store", "edit"),ensureSellerIdParamMiddleware,validateAndTransformBody(VendorUpsertSellerProfessionalDetails),validateAndTransformQuery(@@ -165,126 +133,82 @@ export const vendorSellersMiddlewares: MiddlewareRoute[] = [QueryConfig.retrieveVendorSellerQueryConfig),],- policies: [- {- resource: Entities.seller,- operation: PolicyOperation.update,- },- ],},{method: ["DELETE"],matcher: "/vendor/sellers/:id/professional-details",middlewares: [+ requirePermission("store", "edit"),ensureSellerIdParamMiddleware,validateAndTransformQuery(VendorGetSellerParams,QueryConfig.retrieveVendorSellerQueryConfig),],- policies: [- {- resource: Entities.seller,- operation: PolicyOperation.update,- },- ],},{method: ["GET"],matcher: "/vendor/sellers/:id/members/me",middlewares: [+ requirePermission("store", "view"),ensureSellerIdParamMiddleware,validateAndTransformQuery(VendorGetSellerParams,QueryConfig.retrieveVendorMemberQueryConfig),],- policies: [- {- resource: Entities.seller,- operation: PolicyOperation.read,- },- ],},{method: ["GET"],matcher: "/vendor/sellers/:id/members/invites",middlewares: [+ requirePermission("members", "view"),ensureSellerIdParamMiddleware,validateAndTransformQuery(VendorGetSellersParams,QueryConfig.listVendorMemberInvitesQueryConfig),],- policies: [- {- resource: Entities.seller_member,- operation: PolicyOperation.read,- },- ],},{method: ["GET"],matcher: "/vendor/sellers/:id/members",middlewares: [+ requirePermission("store", "view"),+ requirePermission("members", "view"),ensureSellerIdParamMiddleware,validateAndTransformQuery(VendorGetSellersParams,QueryConfig.listVendorMembersQueryConfig),],- policies: [- {- resource: Entities.seller,- operation: PolicyOperation.read,- },- {- resource: Entities.seller_member,- operation: PolicyOperation.read,- },- ],},{method: ["POST"],matcher: "/vendor/sellers/:id/members",middlewares: [+ requirePermission("members", "edit"),ensureSellerIdParamMiddleware,validateAndTransformBody(VendorInviteMember),],- policies: [- {- resource: Entities.seller_member,- operation: PolicyOperation.create,- },- ],},{method: ["POST"],matcher: "/vendor/sellers/:id/members/:member_id",middlewares: [+ requirePermission("members", "edit"),ensureSellerIdParamMiddleware,ensureSellerMemberParamMiddleware,validateAndTransformBody(VendorUpdateMemberRole),],- policies: [- {- resource: Entities.seller_member,- operation: PolicyOperation.update,- },- ],},{method: ["DELETE"],matcher: "/vendor/sellers/:id/members/:member_id",middlewares: [+ requirePermission("members", "manage"),ensureSellerIdParamMiddleware,ensureSellerMemberParamMiddleware,],- policies: [- {- resource: Entities.seller_member,- operation: PolicyOperation.delete,- },- ],},]diff --git a/packages/core/src/api/vendor/sellers/query-config.ts b/packages/core/src/api/vendor/sellers/query-config.tsindex fd16e1e7c..1a0aacb66 100644--- a/packages/core/src/api/vendor/sellers/query-config.ts+++ b/packages/core/src/api/vendor/sellers/query-config.ts@@ -1,13 +1,7 @@-import { withRbacRoleFields } from "../../utils/rbac-role-fields"--export enum Entities {- seller = "seller",- seller_member = "seller_member",-}export const listVendorSellersQueryConfig = {get defaults() {- return withRbacRoleFields([+ return (["id","seller.*",])@@ -46,7 +40,7 @@ export const retrieveVendorSellerQueryConfig = {export const listVendorMembersQueryConfig = {get defaults() {- return withRbacRoleFields([+ return (["id","is_owner","member.*",@@ -59,7 +53,7 @@ export const listVendorMembersQueryConfig = {export const retrieveVendorMemberQueryConfig = {get defaults() {- return withRbacRoleFields([+ return (["id","is_owner","member.*",diff --git a/packages/core/src/api/vendor/shipping-option-types/middlewares.ts b/packages/core/src/api/vendor/shipping-option-types/middlewares.tsindex c51578295..5a96a41bd 100644--- a/packages/core/src/api/vendor/shipping-option-types/middlewares.ts+++ b/packages/core/src/api/vendor/shipping-option-types/middlewares.ts@@ -1,5 +1,4 @@-import { PolicyResource } from "../../utils/policy-resources"-import { PolicyOperation } from "@medusajs/framework/utils"+import { requirePermission } from "../../utils"import { MiddlewareRoute } from "@medusajs/framework/http"import { validateAndTransformQuery } from "@medusajs/framework"@@ -14,32 +13,22 @@ export const vendorShippingOptionTypesMiddlewares: MiddlewareRoute[] = [method: ["GET"],matcher: "/vendor/shipping-option-types",middlewares: [+ requirePermission("shipping_options", "view"),validateAndTransformQuery(VendorGetShippingOptionTypesParams,vendorShippingOptionTypeQueryConfig.list),],- policies: [- {- resource: PolicyResource.shipping_option_type,- operation: PolicyOperation.read,- },- ],},{method: ["GET"],matcher: "/vendor/shipping-option-types/:id",middlewares: [+ requirePermission("shipping_options", "view"),validateAndTransformQuery(VendorGetShippingOptionTypeParams,vendorShippingOptionTypeQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.shipping_option_type,- operation: PolicyOperation.read,- },- ],},]diff --git a/packages/core/src/api/vendor/shipping-options/middlewares.ts b/packages/core/src/api/vendor/shipping-options/middlewares.tsindex 55e404b29..61fce2899 100644--- a/packages/core/src/api/vendor/shipping-options/middlewares.ts+++ b/packages/core/src/api/vendor/shipping-options/middlewares.ts@@ -1,5 +1,4 @@-import { PolicyResource } from "../../utils/policy-resources"-import { PolicyOperation } from "@medusajs/framework/utils"+import { requirePermission } from "../../utils"import {AuthenticatedMedusaRequest,maybeApplyLinkFilter,@@ -46,6 +45,7 @@ export const vendorShippingOptionsMiddlewares: MiddlewareRoute[] = [method: ["GET"],matcher: "/vendor/shipping-options",middlewares: [+ requirePermission("shipping_options", "view"),validateAndTransformQuery(VendorGetShippingOptionsParams,vendorShippingOptionQueryConfig.list@@ -64,78 +64,54 @@ export const vendorShippingOptionsMiddlewares: MiddlewareRoute[] = [}),applySellerShippingOptionLinkFilter,],- policies: [- {- resource: PolicyResource.shipping_option,- operation: PolicyOperation.read,- },- ],},{method: ["POST"],matcher: "/vendor/shipping-options",middlewares: [+ requirePermission("shipping_options", "edit"),validateAndTransformBody(VendorCreateShippingOption),validateAndTransformQuery(VendorGetShippingOptionParams,vendorShippingOptionQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.shipping_option,- operation: PolicyOperation.create,- },- ],},{method: ["GET"],matcher: "/vendor/shipping-options/:id",middlewares: [+ requirePermission("shipping_options", "view"),validateAndTransformQuery(VendorGetShippingOptionParams,vendorShippingOptionQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.shipping_option,- operation: PolicyOperation.read,- },- ],},{method: ["POST"],matcher: "/vendor/shipping-options/:id",middlewares: [+ requirePermission("shipping_options", "edit"),validateAndTransformBody(VendorUpdateShippingOption),validateAndTransformQuery(VendorGetShippingOptionParams,vendorShippingOptionQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.shipping_option,- operation: PolicyOperation.update,- },- ],},{method: ["DELETE"],matcher: "/vendor/shipping-options/:id",- middlewares: [],- policies: [- {- resource: PolicyResource.shipping_option,- operation: PolicyOperation.delete,- },+ middlewares: [+ requirePermission("shipping_options", "manage"),],},{method: ["POST"],matcher: "/vendor/shipping-options/:id/rules/batch",middlewares: [+ requirePermission("shipping_options", "edit"),validateAndTransformBody(createBatchBody(VendorCreateShippingOptionRule,@@ -147,11 +123,5 @@ export const vendorShippingOptionsMiddlewares: MiddlewareRoute[] = [vendorShippingOptionRuleQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.shipping_option,- operation: PolicyOperation.update,- },- ],},]diff --git a/packages/core/src/api/vendor/shipping-profiles/middlewares.ts b/packages/core/src/api/vendor/shipping-profiles/middlewares.tsindex 00ec99b58..c1e479eaf 100644--- a/packages/core/src/api/vendor/shipping-profiles/middlewares.ts+++ b/packages/core/src/api/vendor/shipping-profiles/middlewares.ts@@ -1,5 +1,4 @@-import { PolicyResource } from "../../utils/policy-resources"-import { PolicyOperation } from "@medusajs/framework/utils"+import { requirePermission } from "../../utils"import { MiddlewareRoute } from "@medusajs/framework/http"import { validateAndTransformQuery } from "@medusajs/framework"@@ -14,32 +13,22 @@ export const vendorShippingProfilesMiddlewares: MiddlewareRoute[] = [method: ["GET"],matcher: "/vendor/shipping-profiles",middlewares: [+ requirePermission("shipping_profiles", "view"),validateAndTransformQuery(VendorGetShippingProfilesParams,vendorShippingProfileQueryConfig.list),],- policies: [- {- resource: PolicyResource.shipping_profile,- operation: PolicyOperation.read,- },- ],},{method: ["GET"],matcher: "/vendor/shipping-profiles/:id",middlewares: [+ requirePermission("shipping_profiles", "view"),validateAndTransformQuery(VendorGetShippingProfileParams,vendorShippingProfileQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.shipping_profile,- operation: PolicyOperation.read,- },- ],},]diff --git a/packages/core/src/api/vendor/stock-locations/middlewares.ts b/packages/core/src/api/vendor/stock-locations/middlewares.tsindex 2c75313d1..1924560ae 100644--- a/packages/core/src/api/vendor/stock-locations/middlewares.ts+++ b/packages/core/src/api/vendor/stock-locations/middlewares.ts@@ -1,5 +1,4 @@-import { PolicyResource } from "../../utils/policy-resources"-import { PolicyOperation } from "@medusajs/framework/utils"+import { requirePermission } from "../../utils"import {AuthenticatedMedusaRequest,maybeApplyLinkFilter,@@ -41,129 +40,90 @@ export const vendorStockLocationsMiddlewares: MiddlewareRoute[] = [method: ["GET"],matcher: "/vendor/stock-locations",middlewares: [+ requirePermission("stock_locations", "view"),validateAndTransformQuery(VendorGetStockLocationsParams,vendorStockLocationQueryConfig.list),applySellerStockLocationLinkFilter,],- policies: [- {- resource: PolicyResource.stock_location,- operation: PolicyOperation.read,- },- ],},{method: ["POST"],matcher: "/vendor/stock-locations",middlewares: [+ requirePermission("stock_locations", "edit"),validateAndTransformBody(VendorCreateStockLocation),validateAndTransformQuery(VendorGetStockLocationParams,vendorStockLocationQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.stock_location,- operation: PolicyOperation.create,- },- ],},{method: ["GET"],matcher: "/vendor/stock-locations/:id",middlewares: [+ requirePermission("stock_locations", "view"),validateAndTransformQuery(VendorGetStockLocationParams,vendorStockLocationQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.stock_location,- operation: PolicyOperation.read,- },- ],},{method: ["POST"],matcher: "/vendor/stock-locations/:id",middlewares: [+ requirePermission("stock_locations", "edit"),validateAndTransformBody(VendorUpdateStockLocation),validateAndTransformQuery(VendorGetStockLocationParams,vendorStockLocationQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.stock_location,- operation: PolicyOperation.update,- },- ],},{method: ["DELETE"],matcher: "/vendor/stock-locations/:id",- middlewares: [],- policies: [- {- resource: PolicyResource.stock_location,- operation: PolicyOperation.delete,- },+ middlewares: [+ requirePermission("stock_locations", "manage"),],},{method: ["POST"],matcher: "/vendor/stock-locations/:id/sales-channels",middlewares: [+ requirePermission("stock_locations", "edit"),validateAndTransformBody(createLinkBody()),validateAndTransformQuery(VendorGetStockLocationParams,vendorStockLocationQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.stock_location,- operation: PolicyOperation.update,- },- ],},{method: ["POST"],matcher: "/vendor/stock-locations/:id/fulfillment-sets",middlewares: [+ requirePermission("stock_locations", "edit"),validateAndTransformBody(VendorCreateStockLocationFulfillmentSet),validateAndTransformQuery(VendorGetStockLocationParams,vendorStockLocationQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.stock_location,- operation: PolicyOperation.update,- },- ],},{method: ["POST"],matcher: "/vendor/stock-locations/:id/fulfillment-providers",middlewares: [+ requirePermission("stock_locations", "edit"),validateAndTransformBody(createLinkBody()),validateAndTransformQuery(VendorGetStockLocationParams,vendorStockLocationQueryConfig.retrieve),],- policies: [- {- resource: PolicyResource.stock_location,- operation: PolicyOperation.update,- },- ],},]diff --git a/packages/core/src/api/vendor/uploads/middlewares.ts b/packages/core/src/api/vendor/uploads/middlewares.tsindex 29f3f59ff..d53003386 100644--- a/packages/core/src/api/vendor/uploads/middlewares.ts+++ b/packages/core/src/api/vendor/uploads/middlewares.ts@@ -1,5 +1,4 @@-import { PolicyResource } from "../../utils/policy-resources"-import { PolicyOperation } from "@medusajs/framework/utils"+import { requirePermission } from "../../utils"import multer from "multer"import { MiddlewareRoute } from "@medusajs/framework/http"@@ -10,12 +9,8 @@ export const vendorUploadsMiddlewares: MiddlewareRoute[] = [{method: ["POST"],matcher: "/vendor/uploads",- middlewares: [upload.array("files")],- policies: [- {- resource: PolicyResource.file,- operation: PolicyOperation.create,- },- ],+ middlewares: [+ requirePermission("products", "edit"),+ upload.array("files")],},]diff --git a/packages/core/src/links/seller-member-rbac-role.ts b/packages/core/src/links/seller-member-rbac-role.tsdeleted file mode 100644index 93e2c2148..000000000--- a/packages/core/src/links/seller-member-rbac-role.ts+++ /dev/null@@ -1,47 +0,0 @@-import {- defineFileConfig,- defineLink,- FeatureFlag,- Modules,-} from "@medusajs/framework/utils"-import { configManager } from "@medusajs/framework/config"-import SellerModule from "../modules/seller"--// `medusaIntegrationTestRunner` registers feature flags without the project-// config and loads link files before Medusa's own flag loader runs, so the-// global router still reports rbac as off at that point. The loaded config is-// the reliable source.-const isRbacEnabled = () => {- if (FeatureFlag.isFeatureEnabled("rbac")) {- return true- }-- try {- return !!configManager.config.featureFlags?.rbac- } catch {- return false- }-}--// Must run before defineLink, which checks whether the file is disabled.-defineFileConfig({- isDisabled: () => !isRbacEnabled(),-})--// Described inline instead of importing `@medusajs/medusa/rbac`: link files are-// evaluated at boot, and that import would load the RBAC module even with the-// flag off.-export default defineLink(- {- linkable: SellerModule.linkable.sellerMember,- field: "role_id",- },- {- linkable: "rbac_role_id",- primaryKey: "id",- serviceName: Modules.RBAC,- field: "rbacRole",- entity: "RbacRole",- },- { readOnly: true }-)diff --git a/packages/core/src/modules/seller/utils/ensure-seller-default-roles.ts b/packages/core/src/modules/seller/utils/ensure-seller-default-roles.tsdeleted file mode 100644index 71f59c253..000000000--- a/packages/core/src/modules/seller/utils/ensure-seller-default-roles.ts+++ /dev/null@@ -1,226 +0,0 @@-import { IRbacModuleService, RbacRoleDTO } from "@medusajs/types"-import { SellerRole } from "@mercurjs/types"--type SellerRoleDefinition = {- id: SellerRole- name: string- description: string- policyKeys: "*" | string[]-}--const CRUD_OPERATIONS = ["read", "create", "update", "delete"] as const--const crud = (resource: string): string[] =>- CRUD_OPERATIONS.map((operation) => `${resource}:${operation}`)--const readOnly = (...resources: string[]): string[] =>- resources.map((resource) => `${resource}:read`)--export const SELLER_ROLES: SellerRoleDefinition[] = [- {- id: SellerRole.SELLER_ADMINISTRATION,- name: "Seller Administration",- description:- "Full access to all seller account features and settings",- policyKeys: "*",- },- {- id: SellerRole.INVENTORY_MANAGEMENT,- name: "Inventory Management",- description: "Manage offers and catalog",- policyKeys: [- ...crud("product"),- ...crud("product_variant"),- ...crud("product_option"),- ...crud("product_tag"),- ...crud("product_type"),- ...crud("product_category"),- ...crud("product_collection"),- ...crud("product_attribute"),- ...crud("product_attribute_value"),- ...crud("product_change"),- ...crud("offer"),- ...crud("inventory_item"),- ...crud("reservation_item"),- ...crud("stock_location"),- ...crud("price_list"),- ...crud("price_preference"),- ...crud("shipping_option"),- ...crud("fulfillment_set"),- ...readOnly(- "seller_member",- "seller",- "shipping_profile",- "currency",- "region",- "sales_channel",- "shipping_option_type",- "fulfillment_provider",- "file"- ),- "file:create",- ],- },- {- id: SellerRole.ORDER_MANAGEMENT,- name: "Order Management",- description: "View and process orders",- policyKeys: [- ...crud("order"),- ...crud("order_change"),- ...crud("order_claim"),- ...crud("order_exchange"),- ...crud("return"),- ...crud("return_reason"),- ...crud("refund_reason"),- ...crud("fulfillment"),- ...readOnly(- "seller_member",- "order_group",- "customer",- "customer_group",- "product",- "product_variant",- "offer",- "inventory_item",- "stock_location",- "shipping_option",- "shipping_profile",- "payment",- "seller",- "region",- "currency",- "product_category",- "product_collection",- "product_tag",- "product_type"- ),- "file:create",- ],- },- {- id: SellerRole.ACCOUNTING,- name: "Accounting",- description: "View billing and manage payment information",- policyKeys: [- ...crud("payout_account"),- ...readOnly(- "seller_member",- "payout",- "commission_line",- "commission_rate",- "commission_rule",- "payment",- "order",- "order_group",- "return",- "seller",- "currency",- "region"- ),- ],- },- {- id: SellerRole.SUPPORT,- name: "Support",- description: "Handle customer messages and view orders",- policyKeys: [- ...crud("review"),- ...readOnly(- "seller_member",- "order",- "order_group",- "order_claim",- "order_exchange",- "return",- "return_reason",- "customer",- "customer_group",- "product",- "product_variant",- "offer",- "seller",- "shipping_option",- "payment",- "region",- "currency"- ),- ],- },-]--export async function ensureSellerDefaultRoles(- rbacService: IRbacModuleService-): Promise<RbacRoleDTO[]> {- const roleIds = SELLER_ROLES.map((role) => role.id)-- const existingRoles = await rbacService.listRbacRoles({ id: roleIds })- const roleById = new Map(existingRoles.map((role) => [role.id, role]))-- const missingRoles = SELLER_ROLES.filter((role) => !roleById.has(role.id))-- if (missingRoles.length) {- const createdRoles = await rbacService.createRbacRoles(- missingRoles.map((role) => ({- id: role.id,- name: role.name,- description: role.description,- }))- )-- createdRoles.forEach((role) => {- roleById.set(role.id, role)- })- }-- const policies = await rbacService.listRbacPolicies({})- const existingRolePolicies = await rbacService.listRbacRolePolicies({- role_id: roleIds,- })-- const policyByKey = new Map(policies.map((policy) => [policy.key, policy]))- const existingBindings = new Set(- existingRolePolicies.map(- (rolePolicy) => `${rolePolicy.role_id}:${rolePolicy.policy_id}`- )- )-- const rolePoliciesToCreate: { role_id: string; policy_id: string }[] = []-- for (const roleDefinition of SELLER_ROLES) {- const role = roleById.get(roleDefinition.id)-- if (!role) {- continue- }-- const targetPolicies =- roleDefinition.policyKeys === "*"- ? policies- : roleDefinition.policyKeys- .map((key) => policyByKey.get(key))- .filter((policy): policy is NonNullable<typeof policy> => !!policy)-- for (const policy of targetPolicies) {- const bindingKey = `${role.id}:${policy.id}`-- if (existingBindings.has(bindingKey)) {- continue- }-- existingBindings.add(bindingKey)- rolePoliciesToCreate.push({- role_id: role.id,- policy_id: policy.id,- })- }- }-- if (rolePoliciesToCreate.length) {- await rbacService.createRbacRolePolicies(rolePoliciesToCreate)- }-- return SELLER_ROLES.map((role) => roleById.get(role.id)).filter(- (role): role is RbacRoleDTO => !!role- )-}diff --git a/packages/core/src/permissions/__tests__/registry.unit.spec.ts b/packages/core/src/permissions/__tests__/registry.unit.spec.tsnew file mode 100644index 000000000..0f2ad8ded--- /dev/null+++ b/packages/core/src/permissions/__tests__/registry.unit.spec.ts@@ -0,0 +1,71 @@+import { PermissionDefinition } from "@mercurjs/types"++import {+ getPermissionCatalog,+ grantAll,+ satisfiesRight,+ validatePermissionCatalog,+} from ".."++const define = (+ key: string,+ extra: Partial<PermissionDefinition> = {}+): PermissionDefinition => ({+ key,+ group: "test",+ surface: ["admin"],+ rights: ["view", "edit"],+ ...extra,+})++describe("permission catalog", () => {+ it("registers the core catalog and it is valid", () => {+ const catalog = getPermissionCatalog()++ expect(catalog.map((p) => p.key)).toEqual(+ expect.arrayContaining(["orders", "orders.refunds", "payouts", "sellers"])+ )+ expect(() => validatePermissionCatalog(catalog)).not.toThrow()+ })++ it("rejects a requirement on an unknown permission", () => {+ expect(() =>+ validatePermissionCatalog([+ define("a", { requires: [{ key: "missing", right: "view" }] }),+ ])+ ).toThrow(/unknown permission "missing"/)+ })++ it("rejects a requirement on a right the target does not have", () => {+ expect(() =>+ validatePermissionCatalog([+ define("a", { requires: [{ key: "b", right: "manage" }] }),+ define("b"),+ ])+ ).toThrow(/not a right of "b"/)+ })++ it("rejects dependency cycles", () => {+ expect(() =>+ validatePermissionCatalog([+ define("a", { requires: [{ key: "b", right: "view" }] }),+ define("b", { requires: [{ key: "a", right: "view" }] }),+ ])+ ).toThrow(/cycle/)+ })+})++describe("rights", () => {+ it("nests manage > edit > view", () => {+ expect(satisfiesRight("manage", "view")).toBe(true)+ expect(satisfiesRight("edit", "view")).toBe(true)+ expect(satisfiesRight("view", "edit")).toBe(false)+ expect(satisfiesRight(undefined, "view")).toBe(false)+ })++ it("grantAll gives each permission its highest right", () => {+ expect(+ grantAll([define("a"), define("b", { rights: ["view", "edit", "manage"] })])+ ).toEqual({ a: "edit", b: "manage" })+ })+})diff --git a/packages/core/src/permissions/definitions/api-keys.ts b/packages/core/src/permissions/definitions/api-keys.tsnew file mode 100644index 000000000..9d9a203c3--- /dev/null+++ b/packages/core/src/permissions/definitions/api-keys.ts@@ -0,0 +1,5 @@+import { defineMercurPermissions } from "../registry"++export const apiKeysPermissions = defineMercurPermissions([+ { key: "api_keys", group: "api-keys", surface: ["admin"], rights: ["view", "edit", "manage"] },+])diff --git a/packages/core/src/permissions/definitions/commissions.ts b/packages/core/src/permissions/definitions/commissions.tsnew file mode 100644index 000000000..173c5e49a--- /dev/null+++ b/packages/core/src/permissions/definitions/commissions.ts@@ -0,0 +1,6 @@+import { defineMercurPermissions } from "../registry"++export const commissionsPermissions = defineMercurPermissions([+ { key: "commission_rates", group: "commissions", surface: ["admin", "vendor"], rights: ["view", "edit", "manage"] },+ { key: "commission_lines", group: "commissions", surface: ["admin", "vendor"], rights: ["view"] },+])diff --git a/packages/core/src/permissions/definitions/customers.ts b/packages/core/src/permissions/definitions/customers.tsnew file mode 100644index 000000000..395290732--- /dev/null+++ b/packages/core/src/permissions/definitions/customers.ts@@ -0,0 +1,6 @@+import { defineMercurPermissions } from "../registry"++export const customersPermissions = defineMercurPermissions([+ { key: "customers", group: "customers", surface: ["admin", "vendor"], rights: ["view", "edit", "manage"] },+ { key: "customer_groups", group: "customers", surface: ["admin", "vendor"], rights: ["view", "edit", "manage"], requires: [{ key: "customers", right: "view" }] },+])diff --git a/packages/core/src/permissions/definitions/fulfillment.ts b/packages/core/src/permissions/definitions/fulfillment.tsnew file mode 100644index 000000000..b4b7da187--- /dev/null+++ b/packages/core/src/permissions/definitions/fulfillment.ts@@ -0,0 +1,7 @@+import { defineMercurPermissions } from "../registry"++export const fulfillmentPermissions = defineMercurPermissions([+ { key: "shipping_profiles", group: "fulfillment", surface: ["admin", "vendor"], rights: ["view", "edit", "manage"] },+ { key: "shipping_options", group: "fulfillment", surface: ["admin", "vendor"], rights: ["view", "edit", "manage"] },+ { key: "fulfillment_sets", group: "fulfillment", surface: ["admin", "vendor"], rights: ["view", "edit", "manage"] },+])diff --git a/packages/core/src/permissions/definitions/inventory.ts b/packages/core/src/permissions/definitions/inventory.tsnew file mode 100644index 000000000..489834705--- /dev/null+++ b/packages/core/src/permissions/definitions/inventory.ts@@ -0,0 +1,7 @@+import { defineMercurPermissions } from "../registry"++export const inventoryPermissions = defineMercurPermissions([+ { key: "inventory_items", group: "inventory", surface: ["admin", "vendor"], rights: ["view", "edit", "manage"] },+ { key: "reservations", group: "inventory", surface: ["admin", "vendor"], rights: ["view", "edit", "manage"] },+ { key: "stock_locations", group: "inventory", surface: ["admin", "vendor"], rights: ["view", "edit", "manage"] },+])diff --git a/packages/core/src/permissions/definitions/members.ts b/packages/core/src/permissions/definitions/members.tsnew file mode 100644index 000000000..7dd023644--- /dev/null+++ b/packages/core/src/permissions/definitions/members.ts@@ -0,0 +1,6 @@+import { defineMercurPermissions } from "../registry"++export const membersPermissions = defineMercurPermissions([+ { key: "members", group: "members", surface: ["admin", "vendor"], rights: ["view", "edit", "manage"] },+ { key: "members.invites", group: "members", surface: ["admin", "vendor"], rights: ["view", "edit", "manage"], requires: [{ key: "members", right: "view" }] },+])diff --git a/packages/core/src/permissions/definitions/notifications.ts b/packages/core/src/permissions/definitions/notifications.tsnew file mode 100644index 000000000..8441a8ce4--- /dev/null+++ b/packages/core/src/permissions/definitions/notifications.ts@@ -0,0 +1,5 @@+import { defineMercurPermissions } from "../registry"++export const notificationsPermissions = defineMercurPermissions([+ { key: "notifications", group: "notifications", surface: ["admin"], rights: ["view", "edit"] },+])diff --git a/packages/core/src/permissions/definitions/offers.ts b/packages/core/src/permissions/definitions/offers.tsnew file mode 100644index 000000000..56dd1d132--- /dev/null+++ b/packages/core/src/permissions/definitions/offers.ts@@ -0,0 +1,5 @@+import { defineMercurPermissions } from "../registry"++export const offersPermissions = defineMercurPermissions([+ { key: "offers", group: "offers", surface: ["admin", "vendor"], rights: ["view", "edit", "manage"] },+])diff --git a/packages/core/src/permissions/definitions/orders.ts b/packages/core/src/permissions/definitions/orders.tsnew file mode 100644index 000000000..a5c62c20c--- /dev/null+++ b/packages/core/src/permissions/definitions/orders.ts@@ -0,0 +1,9 @@+import { defineMercurPermissions } from "../registry"++export const ordersPermissions = defineMercurPermissions([+ { key: "orders", group: "orders", surface: ["admin", "vendor"], rights: ["view", "edit", "manage"] },+ { key: "orders.refunds", group: "orders", surface: ["admin", "vendor"], rights: ["view", "edit"], requires: [{ key: "orders", right: "view" }] },+ { key: "orders.returns", group: "orders", surface: ["admin", "vendor"], rights: ["view", "edit", "manage"], requires: [{ key: "orders", right: "view" }] },+ { key: "orders.edits", group: "orders", surface: ["admin", "vendor"], rights: ["view", "edit", "manage"], requires: [{ key: "orders", right: "view" }] },+ { key: "order_groups", group: "orders", surface: ["admin"], rights: ["view"] },+])diff --git a/packages/core/src/permissions/definitions/payments.ts b/packages/core/src/permissions/definitions/payments.tsnew file mode 100644index 000000000..8d9a7d7dc--- /dev/null+++ b/packages/core/src/permissions/definitions/payments.ts@@ -0,0 +1,5 @@+import { defineMercurPermissions } from "../registry"++export const paymentsPermissions = defineMercurPermissions([+ { key: "payments", group: "payments", surface: ["admin", "vendor"], rights: ["view", "edit"], requires: [{ key: "orders", right: "view" }] },+])diff --git a/packages/core/src/permissions/definitions/payouts.ts b/packages/core/src/permissions/definitions/payouts.tsnew file mode 100644index 000000000..d015012bf--- /dev/null+++ b/packages/core/src/permissions/definitions/payouts.ts@@ -0,0 +1,6 @@+import { defineMercurPermissions } from "../registry"++export const payoutsPermissions = defineMercurPermissions([+ { key: "payouts", group: "payouts", surface: ["admin", "vendor"], rights: ["view", "edit"] },+ { key: "payout_accounts", group: "payouts", surface: ["vendor"], rights: ["view", "edit"], requires: [{ key: "payouts", right: "view" }] },+])diff --git a/packages/core/src/permissions/definitions/price-lists.ts b/packages/core/src/permissions/definitions/price-lists.tsnew file mode 100644index 000000000..ef75c9a4b--- /dev/null+++ b/packages/core/src/permissions/definitions/price-lists.ts@@ -0,0 +1,6 @@+import { defineMercurPermissions } from "../registry"++export const priceListsPermissions = defineMercurPermissions([+ { key: "price_lists", group: "price-lists", surface: ["admin", "vendor"], rights: ["view", "edit", "manage"] },+ { key: "price_preferences", group: "price-lists", surface: ["admin", "vendor"], rights: ["view", "edit"] },+])diff --git a/packages/core/src/permissions/definitions/product-attributes.ts b/packages/core/src/permissions/definitions/product-attributes.tsnew file mode 100644index 000000000..52f0c7ef7--- /dev/null+++ b/packages/core/src/permissions/definitions/product-attributes.ts@@ -0,0 +1,5 @@+import { defineMercurPermissions } from "../registry"++export const productAttributesPermissions = defineMercurPermissions([+ { key: "product_attributes", group: "product-attributes", surface: ["admin", "vendor"], rights: ["view", "edit", "manage"] },+])diff --git a/packages/core/src/permissions/definitions/products.ts b/packages/core/src/permissions/definitions/products.tsnew file mode 100644index 000000000..0c6bea5ba--- /dev/null+++ b/packages/core/src/permissions/definitions/products.ts@@ -0,0 +1,11 @@+import { defineMercurPermissions } from "../registry"++export const productsPermissions = defineMercurPermissions([+ { key: "products", group: "products", surface: ["admin", "vendor"], rights: ["view", "edit", "manage"] },+ { key: "products.review", group: "products", surface: ["admin"], rights: ["edit"], requires: [{ key: "products", right: "view" }] },+ { key: "product_changes", group: "products", surface: ["admin", "vendor"], rights: ["view", "edit"], requires: [{ key: "products", right: "view" }] },+ { key: "product_categories", group: "products", surface: ["admin", "vendor"], rights: ["view", "edit", "manage"] },+ { key: "product_collections", group: "products", surface: ["admin", "vendor"], rights: ["view", "edit", "manage"] },+ { key: "product_types", group: "products", surface: ["admin", "vendor"], rights: ["view", "edit", "manage"] },+ { key: "product_tags", group: "products", surface: ["admin", "vendor"], rights: ["view", "edit", "manage"] },+])diff --git a/packages/core/src/permissions/definitions/promotions.ts b/packages/core/src/permissions/definitions/promotions.tsnew file mode 100644index 000000000..fbee93e2b--- /dev/null+++ b/packages/core/src/permissions/definitions/promotions.ts@@ -0,0 +1,6 @@+import { defineMercurPermissions } from "../registry"++export const promotionsPermissions = defineMercurPermissions([+ { key: "promotions", group: "promotions", surface: ["admin", "vendor"], rights: ["view", "edit", "manage"] },+ { key: "campaigns", group: "promotions", surface: ["admin", "vendor"], rights: ["view", "edit", "manage"] },+])diff --git a/packages/core/src/permissions/definitions/refund-reasons.ts b/packages/core/src/permissions/definitions/refund-reasons.tsnew file mode 100644index 000000000..de0fbaae3--- /dev/null+++ b/packages/core/src/permissions/definitions/refund-reasons.ts@@ -0,0 +1,5 @@+import { defineMercurPermissions } from "../registry"++export const refundReasonsPermissions = defineMercurPermissions([+ { key: "refund_reasons", group: "refund-reasons", surface: ["admin", "vendor"], rights: ["view", "edit", "manage"] },+])diff --git a/packages/core/src/permissions/definitions/regions.ts b/packages/core/src/permissions/definitions/regions.tsnew file mode 100644index 000000000..eba08121b--- /dev/null+++ b/packages/core/src/permissions/definitions/regions.ts@@ -0,0 +1,6 @@+import { defineMercurPermissions } from "../registry"++export const regionsPermissions = defineMercurPermissions([+ { key: "regions", group: "regions", surface: ["admin", "vendor"], rights: ["view", "edit", "manage"] },+ { key: "tax_regions", group: "regions", surface: ["admin", "vendor"], rights: ["view", "edit", "manage"] },+])diff --git a/packages/core/src/permissions/definitions/return-reasons.ts b/packages/core/src/permissions/definitions/return-reasons.tsnew file mode 100644index 000000000..2f809a205--- /dev/null+++ b/packages/core/src/permissions/definitions/return-reasons.ts@@ -0,0 +1,5 @@+import { defineMercurPermissions } from "../registry"++export const returnReasonsPermissions = defineMercurPermissions([+ { key: "return_reasons", group: "return-reasons", surface: ["admin", "vendor"], rights: ["view", "edit", "manage"] },+])diff --git a/packages/core/src/permissions/definitions/reviews.ts b/packages/core/src/permissions/definitions/reviews.tsnew file mode 100644index 000000000..98b1bf039--- /dev/null+++ b/packages/core/src/permissions/definitions/reviews.ts@@ -0,0 +1,5 @@+import { defineMercurPermissions } from "../registry"++export const reviewsPermissions = defineMercurPermissions([+ { key: "reviews", group: "reviews", surface: ["admin", "vendor"], rights: ["view", "edit", "manage"] },+])diff --git a/packages/core/src/permissions/definitions/roles.ts b/packages/core/src/permissions/definitions/roles.tsnew file mode 100644index 000000000..3e5a37762--- /dev/null+++ b/packages/core/src/permissions/definitions/roles.ts@@ -0,0 +1,6 @@+import { defineMercurPermissions } from "../registry"++export const rolesPermissions = defineMercurPermissions([+ { key: "roles", group: "roles", surface: ["admin", "vendor"], rights: ["view", "edit", "manage"] },+ { key: "roles.owner", group: "roles", surface: ["admin", "vendor"], rights: ["edit"], requires: [{ key: "roles", right: "view" }] },+])diff --git a/packages/core/src/permissions/definitions/sales-channels.ts b/packages/core/src/permissions/definitions/sales-channels.tsnew file mode 100644index 000000000..7fe9f161c--- /dev/null+++ b/packages/core/src/permissions/definitions/sales-channels.ts@@ -0,0 +1,5 @@+import { defineMercurPermissions } from "../registry"++export const salesChannelsPermissions = defineMercurPermissions([+ { key: "sales_channels", group: "sales-channels", surface: ["admin", "vendor"], rights: ["view", "edit", "manage"] },+])diff --git a/packages/core/src/permissions/definitions/sellers.ts b/packages/core/src/permissions/definitions/sellers.tsnew file mode 100644index 000000000..f7e814cfd--- /dev/null+++ b/packages/core/src/permissions/definitions/sellers.ts@@ -0,0 +1,7 @@+import { defineMercurPermissions } from "../registry"++export const sellersPermissions = defineMercurPermissions([+ { key: "sellers", group: "sellers", surface: ["admin"], rights: ["view", "edit", "manage"] },+ { key: "sellers.approval", group: "sellers", surface: ["admin"], rights: ["edit"], requires: [{ key: "sellers", right: "view" }] },+ { key: "sellers.premium", group: "sellers", surface: ["admin"], rights: ["edit"], requires: [{ key: "sellers", right: "view" }] },+])diff --git a/packages/core/src/permissions/definitions/store.ts b/packages/core/src/permissions/definitions/store.tsnew file mode 100644index 000000000..040efdd90--- /dev/null+++ b/packages/core/src/permissions/definitions/store.ts@@ -0,0 +1,5 @@+import { defineMercurPermissions } from "../registry"++export const storePermissions = defineMercurPermissions([+ { key: "store", group: "store", surface: ["admin", "vendor"], rights: ["view", "edit"] },+])diff --git a/packages/core/src/permissions/definitions/translations.ts b/packages/core/src/permissions/definitions/translations.tsnew file mode 100644index 000000000..8e6a6633d--- /dev/null+++ b/packages/core/src/permissions/definitions/translations.ts@@ -0,0 +1,5 @@+import { defineMercurPermissions } from "../registry"++export const translationsPermissions = defineMercurPermissions([+ { key: "translations", group: "translations", surface: ["admin"], rights: ["view", "edit"] },+])diff --git a/packages/core/src/permissions/definitions/users.ts b/packages/core/src/permissions/definitions/users.tsnew file mode 100644index 000000000..28a368c94--- /dev/null+++ b/packages/core/src/permissions/definitions/users.ts@@ -0,0 +1,5 @@+import { defineMercurPermissions } from "../registry"++export const usersPermissions = defineMercurPermissions([+ { key: "users", group: "users", surface: ["admin"], rights: ["view", "edit", "manage"] },+])diff --git a/packages/core/src/permissions/definitions/workflow-executions.ts b/packages/core/src/permissions/definitions/workflow-executions.tsnew file mode 100644index 000000000..2014243b5--- /dev/null+++ b/packages/core/src/permissions/definitions/workflow-executions.ts@@ -0,0 +1,5 @@+import { defineMercurPermissions } from "../registry"++export const workflowExecutionsPermissions = defineMercurPermissions([+ { key: "workflow_executions", group: "workflow-executions", surface: ["admin"], rights: ["view"] },+])diff --git a/packages/core/src/permissions/index.ts b/packages/core/src/permissions/index.tsnew file mode 100644index 000000000..a5259988f--- /dev/null+++ b/packages/core/src/permissions/index.ts@@ -0,0 +1,28 @@+import "./definitions/sellers"+import "./definitions/members"+import "./definitions/roles"+import "./definitions/orders"+import "./definitions/payments"+import "./definitions/customers"+import "./definitions/products"+import "./definitions/product-attributes"+import "./definitions/offers"+import "./definitions/inventory"+import "./definitions/price-lists"+import "./definitions/promotions"+import "./definitions/commissions"+import "./definitions/payouts"+import "./definitions/fulfillment"+import "./definitions/regions"+import "./definitions/store"+import "./definitions/sales-channels"+import "./definitions/return-reasons"+import "./definitions/refund-reasons"+import "./definitions/users"+import "./definitions/api-keys"+import "./definitions/translations"+import "./definitions/notifications"+import "./definitions/workflow-executions"+import "./definitions/reviews"++export * from "./registry"diff --git a/packages/core/src/permissions/registry.ts b/packages/core/src/permissions/registry.tsnew file mode 100644index 000000000..ed4cadc0a--- /dev/null+++ b/packages/core/src/permissions/registry.ts@@ -0,0 +1,121 @@+import {+ PERMISSION_RIGHT_RANK,+ PermissionDefinition,+ PermissionMap,+ PermissionRight,+} from "@mercurjs/types"++type PermissionRegistry = Map<string, PermissionDefinition>++declare global {+ var __mercurPermissions: PermissionRegistry | undefined+}++// Kept on globalThis so plugins that bundle their own copy of core still+// register into the same catalog.+const registry: PermissionRegistry = (globalThis.__mercurPermissions ??=+ new Map())++export function defineMercurPermissions(+ definitions: PermissionDefinition | PermissionDefinition[]+): PermissionDefinition[] {+ const list = Array.isArray(definitions) ? definitions : [definitions]++ for (const definition of list) {+ if (!definition.key || !definition.group || !definition.rights?.length) {+ throw new Error(+ `Permission definition must include key, group and at least one right. Received: ${JSON.stringify(definition)}`+ )+ }++ // Last definition wins: module reloads in `medusa develop` re-run these+ // files, and projects may intentionally redefine a core permission.+ registry.set(definition.key, definition)+ }++ return list+}++export function getPermissionCatalog(): PermissionDefinition[] {+ return [...registry.values()]+}++export function getPermission(key: string): PermissionDefinition | undefined {+ return registry.get(key)+}++export function highestRight(definition: PermissionDefinition): PermissionRight {+ return definition.rights.reduce((highest, right) =>+ PERMISSION_RIGHT_RANK[right] > PERMISSION_RIGHT_RANK[highest]+ ? right+ : highest+ )+}++export function satisfiesRight(+ granted: PermissionRight | undefined,+ required: PermissionRight+): boolean {+ return (+ !!granted && PERMISSION_RIGHT_RANK[granted] >= PERMISSION_RIGHT_RANK[required]+ )+}++export function grantAll(catalog: PermissionDefinition[]): PermissionMap {+ const map: PermissionMap = {}+ for (const definition of catalog) {+ map[definition.key] = highestRight(definition)+ }+ return map+}++/**+ * Throws on requirements pointing at unknown keys or rights, and on dependency+ * cycles. Run once at boot so a broken catalog fails loudly instead of+ * silently denying access.+ */+export function validatePermissionCatalog(+ catalog: PermissionDefinition[] = getPermissionCatalog()+): void {+ const byKey = new Map(catalog.map((definition) => [definition.key, definition]))++ for (const definition of catalog) {+ for (const requirement of definition.requires ?? []) {+ const target = byKey.get(requirement.key)+ if (!target) {+ throw new Error(+ `Permission "${definition.key}" requires unknown permission "${requirement.key}"`+ )+ }+ if (!target.rights.includes(requirement.right)) {+ throw new Error(+ `Permission "${definition.key}" requires "${requirement.key}:${requirement.right}", which is not a right of "${requirement.key}"`+ )+ }+ }+ }++ const visiting = new Set<string>()+ const done = new Set<string>()++ const visit = (key: string, path: string[]) => {+ if (done.has(key)) {+ return+ }+ if (visiting.has(key)) {+ throw new Error(+ `Permission dependency cycle: ${[...path, key].join(" -> ")}`+ )+ }+ visiting.add(key)+ for (const requirement of byKey.get(key)?.requires ?? []) {+ visit(requirement.key, [...path, key])+ }+ visiting.delete(key)+ done.add(key)+ }++ for (const definition of catalog) {+ visit(definition.key, [])+ }+}diff --git a/packages/core/src/policies/commission.ts b/packages/core/src/policies/commission.tsdeleted file mode 100644index 92b1eacf6..000000000--- a/packages/core/src/policies/commission.ts+++ /dev/null@@ -1,13 +0,0 @@-import { definePolicies } from "@medusajs/framework/utils"--import { generateResourcePolicies } from "../utils/generate-resource-policies"--const commissionResources = [- "commission_rule",- "commission_rate",- "commission_line",-]--export const commissionPolicies = definePolicies(- generateResourcePolicies(commissionResources)-)diff --git a/packages/core/src/policies/offer.ts b/packages/core/src/policies/offer.tsdeleted file mode 100644index d92016c12..000000000--- a/packages/core/src/policies/offer.ts+++ /dev/null@@ -1,7 +0,0 @@-import { definePolicies } from "@medusajs/framework/utils"--import { generateResourcePolicies } from "../utils/generate-resource-policies"--export const offerPolicies = definePolicies(- generateResourcePolicies(["offer"])-)diff --git a/packages/core/src/policies/payout.ts b/packages/core/src/policies/payout.tsdeleted file mode 100644index 411173842..000000000--- a/packages/core/src/policies/payout.ts+++ /dev/null@@ -1,7 +0,0 @@-import { definePolicies } from "@medusajs/framework/utils"--import { generateResourcePolicies } from "../utils/generate-resource-policies"--export const payoutPolicies = definePolicies(- generateResourcePolicies(["payout", "payout_account"])-)diff --git a/packages/core/src/policies/product-attribute.ts b/packages/core/src/policies/product-attribute.tsdeleted file mode 100644index 5dcf4dc7e..000000000--- a/packages/core/src/policies/product-attribute.ts+++ /dev/null@@ -1,7 +0,0 @@-import { definePolicies } from "@medusajs/framework/utils"--import { generateResourcePolicies } from "../utils/generate-resource-policies"--export const productAttributePolicies = definePolicies(- generateResourcePolicies(["product_attribute", "product_attribute_value"])-)diff --git a/packages/core/src/policies/product-edit.ts b/packages/core/src/policies/product-edit.tsdeleted file mode 100644index 857c15bfb..000000000--- a/packages/core/src/policies/product-edit.ts+++ /dev/null@@ -1,7 +0,0 @@-import { definePolicies } from "@medusajs/framework/utils"--import { generateResourcePolicies } from "../utils/generate-resource-policies"--export const productEditPolicies = definePolicies(- generateResourcePolicies(["product_change"])-)diff --git a/packages/core/src/policies/review.ts b/packages/core/src/policies/review.tsdeleted file mode 100644index 34fea9fee..000000000--- a/packages/core/src/policies/review.ts+++ /dev/null@@ -1,7 +0,0 @@-import { definePolicies } from "@medusajs/framework/utils"--import { generateResourcePolicies } from "../utils/generate-resource-policies"--export const reviewPolicies = definePolicies(- generateResourcePolicies(["review"])-)diff --git a/packages/core/src/policies/seller.ts b/packages/core/src/policies/seller.tsdeleted file mode 100644index 3df8cfd23..000000000--- a/packages/core/src/policies/seller.ts+++ /dev/null@@ -1,14 +0,0 @@-import { definePolicies } from "@medusajs/framework/utils"--import { generateResourcePolicies } from "../utils/generate-resource-policies"--const sellerResources = [- "seller",- "seller_member",- "member_invite",- "order_group",-]--export const sellerPolicies = definePolicies(- generateResourcePolicies(sellerResources)-)diff --git a/packages/core/src/utils/generate-resource-policies.ts b/packages/core/src/utils/generate-resource-policies.tsdeleted file mode 100644index 7b6803bd2..000000000--- a/packages/core/src/utils/generate-resource-policies.ts+++ /dev/null@@ -1,32 +0,0 @@-import { PolicyDefinition, toPascalCase } from "@medusajs/framework/utils"--export const DEFAULT_POLICY_OPERATIONS = [- "read",- "create",- "update",- "delete",-] as const--/**- * Expands resources into one policy per operation, matching the naming Medusa- * uses for its own catalog (`ReadProduct`, `product:read`).- */-export function generateResourcePolicies(- resources: string[],- operations: readonly string[] = DEFAULT_POLICY_OPERATIONS-): PolicyDefinition[] {- const policies: PolicyDefinition[] = []-- for (const resource of resources) {- for (const operation of operations) {- policies.push({- name: toPascalCase(operation) + toPascalCase(resource),- resource,- operation,- description: `${toPascalCase(operation)} ${resource.replace(/_/g, " ")}`,- })- }- }-- return policies-}diff --git a/packages/core/src/with-mercur.ts b/packages/core/src/with-mercur.tsindex dd5a76092..35918aab5 100644--- a/packages/core/src/with-mercur.ts+++ b/packages/core/src/with-mercur.ts@@ -42,25 +42,9 @@ export function withMercur(config: MercurInputConfig = {}): InputConfigWithArrayconst featureFlags = {...config.featureFlags,- // Off unless explicitly enabled. Route policy checks are fail-closed, so- // enforcement is opt-in: with the flag off Medusa never wraps a handler in- // a permission check, the declared route policies cost nothing, and the- // middlewares that resolve an actor's roles return early.- rbac: config.featureFlags?.rbac ?? false,}- const modules = [- ...(config.modules ?? []),- ...(!featureFlags.rbac ||- (config.modules ?? []).some(- (m) =>- typeof m === "object" &&- "resolve" in m &&- m.resolve === "@medusajs/medusa/rbac"- )- ? []- : [{ resolve: "@medusajs/medusa/rbac" as const }]),- ]+ const modules = [...(config.modules ?? [])]const plugins = [...(config.plugins ?? []),diff --git a/packages/core/src/workflows/seller/steps/create-seller-default-roles.ts b/packages/core/src/workflows/seller/steps/create-seller-default-roles.tsdeleted file mode 100644index 4b5238470..000000000--- a/packages/core/src/workflows/seller/steps/create-seller-default-roles.ts+++ /dev/null@@ -1,20 +0,0 @@-import { FeatureFlag, Modules } from "@medusajs/framework/utils"-import { createStep, StepResponse } from "@medusajs/framework/workflows-sdk"-import { IRbacModuleService } from "@medusajs/types"-import { ensureSellerDefaultRoles } from "../../../modules/seller/utils/ensure-seller-default-roles"--export const createSellerDefaultRolesStepId = "create-seller-default-roles"--export const createSellerDefaultRolesStep = createStep(- createSellerDefaultRolesStepId,- async (_: void, { container }) => {- if (!FeatureFlag.isFeatureEnabled("rbac")) {- return new StepResponse([])- }-- const rbacService: IRbacModuleService = container.resolve(Modules.RBAC)- const roles = await ensureSellerDefaultRoles(rbacService)-- return new StepResponse(roles)- },-)diff --git a/packages/core/src/workflows/seller/steps/index.ts b/packages/core/src/workflows/seller/steps/index.tsindex c6843601e..2b18ce6f8 100644--- a/packages/core/src/workflows/seller/steps/index.ts+++ b/packages/core/src/workflows/seller/steps/index.ts@@ -22,4 +22,3 @@ export * from "./update-seller-address"export * from "./update-seller-professional-details"export * from "./delete-seller-professional-details"export * from "./update-payment-details"-export * from "./create-seller-default-roles"diff --git a/packages/core/src/workflows/seller/workflows/accept-member-invite.ts b/packages/core/src/workflows/seller/workflows/accept-member-invite.tsindex 0a5501625..642c7e9b0 100644--- a/packages/core/src/workflows/seller/workflows/accept-member-invite.ts+++ b/packages/core/src/workflows/seller/workflows/accept-member-invite.ts@@ -14,7 +14,6 @@ import {upsertMembersStep,createSellerMembersStep,deleteMemberInviteStep,- createSellerDefaultRolesStep,checkSellerHasOwnerStep,} from "../steps"import { MemberInviteWorkflowEvents } from "../../events"@@ -32,8 +31,6 @@ type AcceptMemberInviteWorkflowInput = {export const acceptMemberInviteWorkflow = createWorkflow(acceptMemberInviteWorkflowId,function (input: AcceptMemberInviteWorkflowInput) {- createSellerDefaultRolesStep()-const invite = validateMemberInviteTokenStep(input.invite_token)const members = upsertMembersStep(diff --git a/packages/core/src/workflows/seller/workflows/create-seller-account.ts b/packages/core/src/workflows/seller/workflows/create-seller-account.tsindex 661875293..0d40f1fee 100644--- a/packages/core/src/workflows/seller/workflows/create-seller-account.ts+++ b/packages/core/src/workflows/seller/workflows/create-seller-account.ts@@ -23,7 +23,6 @@ import {createSellersStep,upsertMembersStep,createSellerMembersStep,- createSellerDefaultRolesStep,} from "../steps"import { SellerWorkflowEvents } from "../../events"import { updateSellerAddressWorkflow } from "./update-seller-address"@@ -47,8 +46,6 @@ type CreateSellerAccountWorkflowInput = {export const createSellerAccountWorkflow = createWorkflow(createSellerAccountWorkflowId,function (input: CreateSellerAccountWorkflowInput) {- createSellerDefaultRolesStep()-const sellerData = transform(input, ({ seller }) => [{ ...seller, status: SellerStatus.PENDING_APPROVAL },])diff --git a/packages/core/src/workflows/seller/workflows/create-seller-defaults.ts b/packages/core/src/workflows/seller/workflows/create-seller-defaults.tsdeleted file mode 100644index 814a9e91a..000000000--- a/packages/core/src/workflows/seller/workflows/create-seller-defaults.ts+++ /dev/null@@ -1,17 +0,0 @@-import {- createWorkflow,- WorkflowResponse,-} from "@medusajs/framework/workflows-sdk"--import { createSellerDefaultRolesStep } from "../steps/create-seller-default-roles"--export const createSellerDefaultsWorkflowId = "create-seller-defaults"--export const createSellerDefaultsWorkflow = createWorkflow(- createSellerDefaultsWorkflowId,- () => {- createSellerDefaultRolesStep()-- return new WorkflowResponse(void 0)- }-)diff --git a/packages/core/src/workflows/seller/workflows/index.ts b/packages/core/src/workflows/seller/workflows/index.tsindex b192e627c..0277c07e4 100644--- a/packages/core/src/workflows/seller/workflows/index.ts+++ b/packages/core/src/workflows/seller/workflows/index.ts@@ -20,4 +20,3 @@ export * from "./update-seller-address"export * from "./update-seller-professional-details"export * from "./delete-seller-professional-details"export * from "./create-seller-account"-export * from "./create-seller-defaults"diff --git a/packages/dashboard-sdk/src/permissions.ts b/packages/dashboard-sdk/src/permissions.tsindex 741b08bf5..c07c15e65 100644--- a/packages/dashboard-sdk/src/permissions.ts+++ b/packages/dashboard-sdk/src/permissions.ts@@ -1,161 +1,123 @@/**- * Permission strings follow the pattern `{resource}:{operation}`, e.g.- * `customer:read`, `product:create`, `order:*`.+ * Permission strings follow `{key}:{right}`, e.g. `orders:view`,+ * `products:edit`, `sellers.approval:edit`.*- * The resource list mirrors the policies registered server-side — Medusa's own- * catalog plus Mercur's (`packages/core/src/policies`). A name that is not- * registered there is not a type error, it simply never matches a granted- * policy, so the two are kept in sync by a test in `packages/admin`.+ * Keys mirror the catalog declared server-side with `defineMercurPermissions`+ * (`packages/core/src/permissions/definitions`). Rights nest:+ * `manage` implies `edit`, `edit` implies `view`.*/-export type PermissionResource =- | "api_key"- | "campaign"- | "commission_line"- | "commission_rate"- | "commission_rule"- | "currency"- | "customer"- | "customer_address"- | "customer_group"- | "file"- | "fulfillment"- | "fulfillment_provider"- | "fulfillment_set"- | "inventory_item"- | "inventory_level"- | "invite"- | "member_invite"- | "notification"- | "offer"- | "order"- | "order_change"- | "order_claim"- | "order_claim_item"- | "order_exchange"- | "order_group"- | "order_item"- | "payment"- | "payment_collection"- | "payment_method"- | "payment_session"- | "payout"- | "payout_account"- | "price"- | "price_list"- | "price_preference"- | "product"- | "product_attribute"- | "product_attribute_value"- | "product_category"- | "product_change"- | "product_collection"- | "product_option"- | "product_option_value"- | "product_tag"- | "product_type"- | "product_variant"- | "promotion"- | "rbac_policy"- | "rbac_role"- | "refund_reason"- | "region"- | "reservation_item"- | "return"- | "return_reason"- | "review"- | "sales_channel"- | "seller"- | "seller_member"- | "service_zone"- | "shipping_option"- | "shipping_option_type"- | "shipping_profile"- | "stock_location"+export type PermissionKey =+ | "sellers"+ | "sellers.approval"+ | "sellers.premium"+ | "members"+ | "members.invites"+ | "roles"+ | "roles.owner"+ | "orders"+ | "orders.refunds"+ | "orders.returns"+ | "orders.edits"+ | "order_groups"+ | "payments"+ | "customers"+ | "customer_groups"+ | "products"+ | "products.review"+ | "product_changes"+ | "product_categories"+ | "product_collections"+ | "product_types"+ | "product_tags"+ | "product_attributes"+ | "offers"+ | "inventory_items"+ | "reservations"+ | "stock_locations"+ | "price_lists"+ | "price_preferences"+ | "promotions"+ | "campaigns"+ | "commission_rates"+ | "commission_lines"+ | "payouts"+ | "payout_accounts"+ | "shipping_profiles"+ | "shipping_options"+ | "fulfillment_sets"+ | "regions"+ | "tax_regions"| "store"- | "store_locale"- | "tax_provider"- | "tax_rate"- | "tax_region"- | "translation"- | "translation_setting"- | "user"- | "workflow_execution"+ | "sales_channels"+ | "return_reasons"+ | "refund_reasons"+ | "users"+ | "api_keys"+ | "translations"+ | "notifications"+ | "workflow_executions"+ | "reviews"-export type PermissionOperation = "read" | "create" | "update" | "delete" | "*"+export type PermissionRight = "view" | "edit" | "manage"-export type Permission = `${PermissionResource}:${PermissionOperation}`+export type Permission = `${PermissionKey}:${PermissionRight}`-export interface UserPolicy {- permissions: Permission[]-}+/** Effective rights of the acting user, as returned by `fields=+permissions`. */+export type PermissionMap = Partial<Record<string, PermissionRight>>-export interface PermissionRequirement {- permissions: Permission[]- /** If true, ALL permissions are required. Defaults to ANY. */- requireAll?: boolean- /** Optional label describing where the requirement came from. */- source?: string+export const PERMISSION_RIGHT_RANK: Record<PermissionRight, number> = {+ view: 1,+ edit: 2,+ manage: 3,}export interface PermissionsContextValue {- policy: UserPolicy | null+ /** `null` while no access-control module is enforcing permissions. */+ permissions: PermissionMap | nullisLoading: boolean- /** Whether RBAC is active. When `false`, every check resolves to `true`. */- isRbacEnabled: boolean+ /** When `false`, every check resolves to `true`. */+ isEnforced: booleanhasPermission: (permission: Permission) => booleanhasAnyPermission: (permissions: Permission[]) => booleanhasAllPermissions: (permissions: Permission[]) => boolean- can: (- resource: PermissionResource,- operation: PermissionOperation- ) => boolean-}--export interface PermissionsRequirementsContextValue {- requiredPermissions: PermissionRequirement[]- registerRequiredPermissions: (- id: string,- requirement: PermissionRequirement- ) => void- unregisterRequiredPermissions: (id: string) => void+ can: (key: PermissionKey, right?: PermissionRight) => boolean}-/**- * Operations implied by a granted operation. Only the wildcard fans out.- * Note that `update` does not imply `read` — grants must be explicit.- */-export const OPERATION_IMPLICATIONS: Record<- PermissionOperation,- PermissionOperation[]-> = {- read: ["read"],- create: ["create"],- update: ["update"],- delete: ["delete"],- "*": ["read", "create", "update", "delete", "*"],-}--export function parsePermission(permission: string): {- resource: PermissionResource- operation: PermissionOperation-} | null {- const parts = permission.split(":")- if (parts.length !== 2) {+export function parsePermission(+ permission: string+): { key: PermissionKey; right: PermissionRight } | null {+ const index = permission.lastIndexOf(":")+ if (index <= 0) {return null}- const [resource, operation] = parts+ const right = permission.slice(index + 1)+ if (!(right in PERMISSION_RIGHT_RANK)) {+ return null+ }return {- resource: resource as PermissionResource,- operation: operation as PermissionOperation,+ key: permission.slice(0, index) as PermissionKey,+ right: right as PermissionRight,}}export function buildPermission(- resource: PermissionResource,- operation: PermissionOperation+ key: PermissionKey,+ right: PermissionRight): Permission {- return `${resource}:${operation}` as Permission+ return `${key}:${right}`+}++export function satisfiesPermission(+ permissions: PermissionMap,+ key: string,+ right: PermissionRight+): boolean {+ const granted = permissions[key]+ return (+ !!granted &&+ PERMISSION_RIGHT_RANK[granted] >= PERMISSION_RIGHT_RANK[right]+ )}diff --git a/packages/dashboard-shared/src/permissions/index.ts b/packages/dashboard-shared/src/permissions/index.tsindex a3246729d..ba9aa5c7a 100644--- a/packages/dashboard-shared/src/permissions/index.ts+++ b/packages/dashboard-shared/src/permissions/index.ts@@ -3,26 +3,10 @@ export {PermissionsProvider,type PermissionsProviderProps,} from "./permissions-provider"-export { PermissionsRequirementsContext } from "./permissions-requirements-context"-export { PermissionsRequirementsProvider } from "./permissions-requirements-provider"-export {- PermissionsRequirement,- type PermissionsRequirementProps,-} from "./permissions-requirement"export {PermissionGuard,type PermissionGuardProps,} from "./permission-guard"export { RoutePermissionGuard } from "./route-permission-guard"-export { RequiredPermissionsSection } from "./required-permissions-section"export { usePermissions } from "./use-permissions"-export {- useRegisterPermissions,- type UseRegisterPermissionsOptions,-} from "./use-register-permissions"-export { useRequiredPermissions } from "./use-required-permissions"export { useResourcePermissions } from "./use-resource-permissions"-export {- resolvePermissionProps,- type PermissionProps,-} from "./resolve-permission-props"diff --git a/packages/dashboard-shared/src/permissions/permission-guard.tsx b/packages/dashboard-shared/src/permissions/permission-guard.tsxindex 940369cad..62de6fac0 100644--- a/packages/dashboard-shared/src/permissions/permission-guard.tsx+++ b/packages/dashboard-shared/src/permissions/permission-guard.tsx@@ -1,59 +1,32 @@import type { PropsWithChildren, ReactNode } from "react"-import {- resolvePermissionProps,- type PermissionProps,-} from "./resolve-permission-props"+import type { Permission } from "@mercurjs/dashboard-sdk"import { usePermissions } from "./use-permissions"-import { useRegisterPermissions } from "./use-register-permissions"-export type PermissionGuardProps = PropsWithChildren<- PermissionProps & {- /** Rendered when access is denied. Nothing renders when omitted. */- fallback?: ReactNode- showLoading?: boolean- loadingComponent?: ReactNode- }->+export type PermissionGuardProps = PropsWithChildren<{+ permission: Permission | Permission[]+ /** When several permissions are given, require all of them. Defaults to any. */+ requireAll?: boolean+ /** Rendered when access is denied. Nothing renders when omitted. */+ fallback?: ReactNode+}>/**- * Hides its children unless the actor holds the declared permission, and- * registers the requirement so the page can surface what is missing.- ** @example* ```tsx- * <PermissionGuard resource="product" operation="create">+ * <PermissionGuard permission="products:edit">* <Button>Create</Button>* </PermissionGuard>* ```*/export const PermissionGuard = ({children,+ permission,+ requireAll = false,fallback = null,- showLoading = false,- loadingComponent = null,- source,- enabled = true,- ...props}: PermissionGuardProps) => {- const { permissions, requireAll } = resolvePermissionProps(- props as PermissionProps- )+ const { hasAnyPermission, hasAllPermissions } = usePermissions()+ const list = Array.isArray(permission) ? permission : [permission]+ const allowed = requireAll ? hasAllPermissions(list) : hasAnyPermission(list)- useRegisterPermissions(permissions, { requireAll, source, enabled })-- const { hasAnyPermission, hasAllPermissions, isLoading } = usePermissions()-- if (isLoading && showLoading) {- return <>{loadingComponent}</>- }-- const hasAccess = requireAll- ? hasAllPermissions(permissions ?? [])- : hasAnyPermission(permissions ?? [])-- if (!hasAccess) {- return <>{fallback}</>- }-- return <>{children}</>+ return <>{allowed ? children : fallback}</>}diff --git a/packages/dashboard-shared/src/permissions/permissions-provider.tsx b/packages/dashboard-shared/src/permissions/permissions-provider.tsxindex 8faa74f23..17aea1325 100644--- a/packages/dashboard-shared/src/permissions/permissions-provider.tsx+++ b/packages/dashboard-shared/src/permissions/permissions-provider.tsx@@ -1,119 +1,70 @@import { PropsWithChildren, useCallback, useMemo } from "react"import {- buildPermission,- OPERATION_IMPLICATIONS,parsePermission,+ satisfiesPermission,type Permission,- type PermissionOperation,- type PermissionResource,+ type PermissionKey,+ type PermissionMap,+ type PermissionRight,type PermissionsContextValue,- type UserPolicy,} from "@mercurjs/dashboard-sdk"import { PermissionsContext } from "./permissions-context"export interface PermissionsProviderProps extends PropsWithChildren {- policy: UserPolicy | null- isLoading?: boolean/**- * Whether the RBAC feature flag is enabled. When `false`, every permission- * check resolves to `true`.+ * The actor's effective rights, read from `fields=+permissions`. Leave it+ * `null`/`undefined` when the API returned no `permissions` field: nothing is+ * being enforced, so every check passes.*/- isRbacEnabled?: boolean+ permissions?: PermissionMap | null+ isLoading?: boolean}export const PermissionsProvider = ({- policy,+ permissions = null,isLoading = false,- isRbacEnabled = true,children,}: PermissionsProviderProps) => {- const permissionsMap = useMemo(() => {- const index: Record<Permission, true> = Object.create(null)-- for (const granted of policy?.permissions ?? []) {- const parsed = parsePermission(granted)- if (!parsed) {- continue- }+ const isEnforced = !!permissions- const { resource, operation } = parsed- const impliedOperations = OPERATION_IMPLICATIONS[operation] || [operation]-- for (const impliedOperation of impliedOperations) {- index[buildPermission(resource, impliedOperation)] = true- }- }-- return index- }, [policy])+ const can = useCallback(+ (key: PermissionKey, right: PermissionRight = "view") =>+ !permissions || satisfiesPermission(permissions, key, right),+ [permissions]+ )const hasPermission = useCallback(- (permission: Permission): boolean => {- if (!isRbacEnabled) {+ (permission: Permission) => {+ if (!permissions) {return true}- return !!permissionsMap[permission]+ const parsed = parsePermission(permission)+ return !!parsed && satisfiesPermission(permissions, parsed.key, parsed.right)},- [isRbacEnabled, permissionsMap]+ [permissions])const hasAnyPermission = useCallback(- (permissions: Permission[]): boolean => {- if (!isRbacEnabled) {- return true- }- if (!permissions?.length) {- return false- }-- return permissions.some(hasPermission)- },- [isRbacEnabled, hasPermission]+ (list: Permission[]) => !permissions || list.some(hasPermission),+ [permissions, hasPermission])const hasAllPermissions = useCallback(- (permissions: Permission[]): boolean => {- if (!isRbacEnabled) {- return true- }- if (!permissions?.length) {- return false- }-- return permissions.every(hasPermission)- },- [isRbacEnabled, hasPermission]- )-- const can = useCallback(- (resource: PermissionResource, operation: PermissionOperation): boolean => {- if (!isRbacEnabled) {- return true- }- return !!permissionsMap[buildPermission(resource, operation)]- },- [isRbacEnabled, permissionsMap]+ (list: Permission[]) => !permissions || list.every(hasPermission),+ [permissions, hasPermission])const value: PermissionsContextValue = useMemo(() => ({- policy,+ permissions,isLoading,- isRbacEnabled,+ isEnforced,hasPermission,hasAnyPermission,hasAllPermissions,can,}),- [- policy,- isLoading,- isRbacEnabled,- hasPermission,- hasAnyPermission,- hasAllPermissions,- can,- ]+ [permissions, isLoading, isEnforced, hasPermission, hasAnyPermission, hasAllPermissions, can])return (diff --git a/packages/dashboard-shared/src/permissions/permissions-requirement.tsx b/packages/dashboard-shared/src/permissions/permissions-requirement.tsxdeleted file mode 100644index a596fa5bb..000000000--- a/packages/dashboard-shared/src/permissions/permissions-requirement.tsx+++ /dev/null@@ -1,27 +0,0 @@-import type { PropsWithChildren } from "react"-import {- resolvePermissionProps,- type PermissionProps,-} from "./resolve-permission-props"-import { useRegisterPermissions } from "./use-register-permissions"--export type PermissionsRequirementProps = PropsWithChildren<PermissionProps>--/**- * Declares a permission requirement for the surrounding subtree without- * gating it. Use `PermissionGuard` when the children should be hidden.- */-export const PermissionsRequirement = ({- children,- source,- enabled = true,- ...props-}: PermissionsRequirementProps) => {- const { permissions, requireAll } = resolvePermissionProps(- props as PermissionProps- )-- useRegisterPermissions(permissions, { requireAll, source, enabled })-- return <>{children}</>-}diff --git a/packages/dashboard-shared/src/permissions/permissions-requirements-context.tsx b/packages/dashboard-shared/src/permissions/permissions-requirements-context.tsxdeleted file mode 100644index 3a35ac627..000000000--- a/packages/dashboard-shared/src/permissions/permissions-requirements-context.tsx+++ /dev/null@@ -1,5 +0,0 @@-import { createContext } from "react"-import type { PermissionsRequirementsContextValue } from "@mercurjs/dashboard-sdk"--export const PermissionsRequirementsContext =- createContext<PermissionsRequirementsContextValue | null>(null)diff --git a/packages/dashboard-shared/src/permissions/permissions-requirements-provider.tsx b/packages/dashboard-shared/src/permissions/permissions-requirements-provider.tsxdeleted file mode 100644index e9a7d9867..000000000--- a/packages/dashboard-shared/src/permissions/permissions-requirements-provider.tsx+++ /dev/null@@ -1,79 +0,0 @@-import { PropsWithChildren, useCallback, useMemo, useState } from "react"-import type {- PermissionRequirement,- PermissionsRequirementsContextValue,-} from "@mercurjs/dashboard-sdk"-import { PermissionsRequirementsContext } from "./permissions-requirements-context"--/**- * Collects the permission requirements declared by descendant guards so a- * page can surface them (see `RequiredPermissionsSection`). Mount it around a- * page body; guards work fine without it.- */-export const PermissionsRequirementsProvider = ({- children,-}: PropsWithChildren) => {- const [requirements, setRequirements] = useState<- Record<string, PermissionRequirement>- >({})-- const registerRequiredPermissions = useCallback(- (id: string, requirement: PermissionRequirement) => {- setRequirements((prevState) => ({ ...prevState, [id]: requirement }))- },- []- )-- const unregisterRequiredPermissions = useCallback((id: string) => {- setRequirements((prevState) => {- const newState = { ...prevState }- delete newState[id]- return newState- })- }, [])-- const requiredPermissions = useMemo(() => {- const deduped: PermissionRequirement[] = []- const seen = new Set<string>()-- for (const requirement of Object.values(requirements)) {- if (!requirement.permissions.length) {- continue- }-- const key = [- requirement.requireAll ? "all" : "any",- [...requirement.permissions].sort().join("|"),- requirement.source || "",- ].join("::")-- if (seen.has(key)) {- continue- }-- seen.add(key)- deduped.push(requirement)- }-- return deduped- }, [requirements])-- const value: PermissionsRequirementsContextValue = useMemo(- () => ({- requiredPermissions,- registerRequiredPermissions,- unregisterRequiredPermissions,- }),- [- requiredPermissions,- registerRequiredPermissions,- unregisterRequiredPermissions,- ]- )-- return (- <PermissionsRequirementsContext.Provider value={value}>- {children}- </PermissionsRequirementsContext.Provider>- )-}diff --git a/packages/dashboard-shared/src/permissions/required-permissions-section.tsx b/packages/dashboard-shared/src/permissions/required-permissions-section.tsxdeleted file mode 100644index fb8363341..000000000--- a/packages/dashboard-shared/src/permissions/required-permissions-section.tsx+++ /dev/null@@ -1,77 +0,0 @@-import { Badge, Container, Heading, Text } from "@medusajs/ui"-import { useTranslation } from "react-i18next"-import { usePermissions } from "./use-permissions"-import { useRequiredPermissions } from "./use-required-permissions"--/**- * Renders the requirements that descendant guards registered with the nearest- * `PermissionsRequirementsProvider`. Renders nothing when RBAC is off.- */-export const RequiredPermissionsSection = () => {- const { t } = useTranslation()- const { isRbacEnabled } = usePermissions()- const requirements = useRequiredPermissions()-- if (!isRbacEnabled) {- return null- }-- if (!requirements.length) {- return (- <Container className="flex flex-col gap-y-2 px-6 py-4">- <Heading level="h2">- {t("permissions.requiredPermissions.title")}- </Heading>- <Text size="small" className="text-ui-fg-subtle">- {t("permissions.requiredPermissions.none")}- </Text>- </Container>- )- }-- return (- <Container className="flex flex-col gap-y-3 px-6 py-4">- <div className="flex items-center justify-between">- <Heading level="h2">- {t("permissions.requiredPermissions.title")}- </Heading>- <Badge size="2xsmall" rounded="full">- {requirements.length}- </Badge>- </div>- <div className="flex flex-col gap-y-3">- {requirements.map((requirement) => {- const key = [- requirement.requireAll ? "all" : "any",- requirement.permissions.join("|"),- requirement.source || "",- ].join("::")-- return (- <div key={key} className="flex flex-col gap-y-2">- <Text size="small" className="text-ui-fg-subtle">- {requirement.requireAll- ? t("permissions.requiredPermissions.allOf")- : t("permissions.requiredPermissions.anyOf")}- </Text>- <div className="flex flex-wrap gap-1.5">- {requirement.permissions.map((permission) => (- <Badge key={permission} size="2xsmall">- {permission}- </Badge>- ))}- </div>- {requirement.source && (- <Text size="xsmall" className="text-ui-fg-muted">- {t("permissions.requiredPermissions.source", {- source: requirement.source,- })}- </Text>- )}- </div>- )- })}- </div>- </Container>- )-}diff --git a/packages/dashboard-shared/src/permissions/resolve-permission-props.ts b/packages/dashboard-shared/src/permissions/resolve-permission-props.tsdeleted file mode 100644index 23cd70bb3..000000000--- a/packages/dashboard-shared/src/permissions/resolve-permission-props.ts+++ /dev/null@@ -1,62 +0,0 @@-import {- buildPermission,- type Permission,- type PermissionOperation,- type PermissionResource,-} from "@mercurjs/dashboard-sdk"--interface BasePermissionProps {- source?: string- enabled?: boolean-}--export interface WithPermission extends BasePermissionProps {- permission: Permission- permissions?: never- resource?: never- operation?: never- requireAll?: never-}--export interface WithPermissions extends BasePermissionProps {- permissions: Permission[]- /** If true, ALL permissions are required. Defaults to ANY. */- requireAll?: boolean- permission?: never- resource?: never- operation?: never-}--export interface WithResourceOperation extends BasePermissionProps {- resource: PermissionResource- operation: PermissionOperation- permission?: never- permissions?: never- requireAll?: never-}--export type PermissionProps =- | WithPermission- | WithPermissions- | WithResourceOperation--export const resolvePermissionProps = (- props: PermissionProps-): { permissions: Permission[] | null; requireAll: boolean } => {- if (props.permission) {- return { permissions: [props.permission], requireAll: false }- }-- if (props.permissions) {- return { permissions: props.permissions, requireAll: !!props.requireAll }- }-- if (props.resource && props.operation) {- return {- permissions: [buildPermission(props.resource, props.operation)],- requireAll: false,- }- }-- return { permissions: null, requireAll: false }-}diff --git a/packages/dashboard-shared/src/permissions/route-permission-guard.tsx b/packages/dashboard-shared/src/permissions/route-permission-guard.tsxindex efd7b40e3..89c5e113f 100644--- a/packages/dashboard-shared/src/permissions/route-permission-guard.tsx+++ b/packages/dashboard-shared/src/permissions/route-permission-guard.tsx@@ -5,7 +5,6 @@ import { useTranslation } from "react-i18next"import { Navigate, Outlet, useMatches } from "react-router-dom"import type { Permission, RouteHandle } from "@mercurjs/dashboard-sdk"import { usePermissions } from "./use-permissions"-import { useRegisterPermissions } from "./use-register-permissions"type ResolvedRequirement = {permissions: Permission[]@@ -59,7 +58,7 @@ const readRequirementFromHandle = (* {* path: "roles",* element: <RoutePermissionGuard />,- * handle: { permissions: "rbac_role:read" },+ * handle: { permissions: "roles:view" },* children: [...],* }* ```@@ -79,11 +78,6 @@ export const RoutePermissionGuard = () => {return undefined}, [matches])- useRegisterPermissions(requirement?.permissions ?? null, {- requireAll: requirement?.requireAll ?? true,- source: "route",- })-if (isLoading || !requirement) {return <Outlet />}diff --git a/packages/dashboard-shared/src/permissions/use-permissions.tsx b/packages/dashboard-shared/src/permissions/use-permissions.tsxindex 69dc5f588..c020f8cda 100644--- a/packages/dashboard-shared/src/permissions/use-permissions.tsx+++ b/packages/dashboard-shared/src/permissions/use-permissions.tsx@@ -6,8 +6,8 @@ import { PermissionsContext } from "./permissions-context"* ```tsx* const { can, hasPermission } = usePermissions()*- * if (can("customer", "create")) { ... }- * if (hasPermission("customer:read")) { ... }+ * if (can("customers", "edit")) { ... }+ * if (hasPermission("customers:view")) { ... }* ```*/export const usePermissions = () => {diff --git a/packages/dashboard-shared/src/permissions/use-register-permissions.tsx b/packages/dashboard-shared/src/permissions/use-register-permissions.tsxdeleted file mode 100644index 9d9a0cfdb..000000000--- a/packages/dashboard-shared/src/permissions/use-register-permissions.tsx+++ /dev/null@@ -1,64 +0,0 @@-import { useContext, useEffect, useId } from "react"-import type { Permission } from "@mercurjs/dashboard-sdk"-import { PermissionsRequirementsContext } from "./permissions-requirements-context"--export interface UseRegisterPermissionsOptions {- /** If true, ALL permissions are required. Defaults to ANY. */- requireAll?: boolean- source?: string- enabled?: boolean-}--const normalizePermissions = (permissions: Permission[]): Permission[] =>- Array.from(new Set(permissions)).sort()--// Stable identity so the effect below doesn't re-run every render when there-// is no requirements context to register with.-const noop = () => {}--/**- * Declares what the calling subtree needs. No-ops when there is no- * `PermissionsRequirementsProvider` above it.- */-export const useRegisterPermissions = (- permissions: Permission[] | null | undefined,- options: UseRegisterPermissionsOptions = {}-) => {- const context = useContext(PermissionsRequirementsContext)- const registerRequiredPermissions = context?.registerRequiredPermissions ?? noop- const unregisterRequiredPermissions =- context?.unregisterRequiredPermissions ?? noop- const id = useId()-- const enabled = options.enabled ?? true- const requireAll = options.requireAll ?? false- const source = options.source-- const permissionsKey = permissions?.length- ? normalizePermissions(permissions).join("|")- : ""-- useEffect(() => {- if (!enabled || !permissionsKey) {- return- }-- registerRequiredPermissions(id, {- permissions: permissionsKey.split("|") as Permission[],- requireAll,- source,- })-- return () => {- unregisterRequiredPermissions(id)- }- }, [- enabled,- id,- permissionsKey,- registerRequiredPermissions,- requireAll,- source,- unregisterRequiredPermissions,- ])-}diff --git a/packages/dashboard-shared/src/permissions/use-required-permissions.tsx b/packages/dashboard-shared/src/permissions/use-required-permissions.tsxdeleted file mode 100644index 22cf66ef0..000000000--- a/packages/dashboard-shared/src/permissions/use-required-permissions.tsx+++ /dev/null@@ -1,8 +0,0 @@-import { useContext } from "react"-import { PermissionsRequirementsContext } from "./permissions-requirements-context"--export const useRequiredPermissions = () => {- const context = useContext(PermissionsRequirementsContext)-- return context?.requiredPermissions ?? []-}diff --git a/packages/dashboard-shared/src/permissions/use-resource-permissions.tsx b/packages/dashboard-shared/src/permissions/use-resource-permissions.tsxindex b5dc2d778..83a44cbee 100644--- a/packages/dashboard-shared/src/permissions/use-resource-permissions.tsx+++ b/packages/dashboard-shared/src/permissions/use-resource-permissions.tsx@@ -1,28 +1,24 @@import { useMemo } from "react"-import type { PermissionResource } from "@mercurjs/dashboard-sdk"+import type { PermissionKey } from "@mercurjs/dashboard-sdk"import { usePermissions } from "./use-permissions"/*** @example* ```tsx- * const { canCreate } = useResourcePermissions("product")- * {canCreate && <Button>Create</Button>}+ * const { canEdit } = useResourcePermissions("products")* ```*/-export const useResourcePermissions = (resource: PermissionResource) => {+export const useResourcePermissions = (key: PermissionKey) => {const { can, isLoading } = usePermissions()return useMemo(() => ({- canRead: can(resource, "read"),- canCreate: can(resource, "create"),- canUpdate: can(resource, "update"),- canDelete: can(resource, "delete"),- can: (operation: "read" | "create" | "update" | "delete") =>- can(resource, operation),- resource,+ canView: can(key, "view"),+ canEdit: can(key, "edit"),+ canManage: can(key, "manage"),+ key,isLoading,}),- [can, resource, isLoading]+ [can, key, isLoading])}diff --git a/packages/types/src/http/index.ts b/packages/types/src/http/index.tsindex 802bed258..d017b82c8 100644--- a/packages/types/src/http/index.ts+++ b/packages/types/src/http/index.ts@@ -46,3 +46,4 @@ export {} from "./product-category"export { StoreCompleteCartResponse } from "./order-group"+export * from "./user"diff --git a/packages/types/src/http/seller.ts b/packages/types/src/http/seller.tsindex 14c504b91..7cd16e1c0 100644--- a/packages/types/src/http/seller.ts+++ b/packages/types/src/http/seller.ts@@ -1,5 +1,6 @@import { DeleteResponse, PaginatedResponse } from "@medusajs/types"import { MemberInviteDTO, SellerDTO, SellerMemberDTO } from "../seller"+import { PermissionMap } from "../permissions"export interface VendorSellerResponse {/**@@ -19,7 +20,7 @@ export interface VendorSellerMemberResponse {/*** The seller member's details.*/- seller_member: SellerMemberDTO+ seller_member: SellerMemberDTO & { permissions?: PermissionMap }}export type VendorSellerMemberListResponse = PaginatedResponse<{diff --git a/packages/types/src/http/user.ts b/packages/types/src/http/user.tsnew file mode 100644index 000000000..cc7e6745c--- /dev/null+++ b/packages/types/src/http/user.ts@@ -0,0 +1,6 @@+import { HttpTypes } from "@medusajs/types"+import { PermissionMap } from "../permissions"++export interface AdminUserWithPermissionsResponse {+ user: HttpTypes.AdminUser & { permissions?: PermissionMap }+}diff --git a/packages/types/src/index.ts b/packages/types/src/index.tsindex b610257f5..1b42cb4be 100644--- a/packages/types/src/index.ts+++ b/packages/types/src/index.ts@@ -73,4 +73,6 @@ export * from "./custom-fields"export * from "./dashboard"// Feature flags-export * from "./feature-flags"\ No newline at end of file+export * from "./feature-flags"+// Access control+export * from "./permissions"diff --git a/packages/types/src/permissions/index.ts b/packages/types/src/permissions/index.tsnew file mode 100644index 000000000..a776dda43--- /dev/null+++ b/packages/types/src/permissions/index.ts@@ -0,0 +1,56 @@+export type PermissionRight = "view" | "edit" | "manage"++export const PERMISSION_RIGHTS: readonly PermissionRight[] = [+ "view",+ "edit",+ "manage",+]++export const PERMISSION_RIGHT_RANK: Record<PermissionRight, number> = {+ view: 1,+ edit: 2,+ manage: 3,+}++export type PermissionSurface = "admin" | "vendor"++export interface PermissionRequirement {+ key: string+ right: PermissionRight+}++export interface PermissionDefinition {+ key: string+ group: string+ surface: PermissionSurface[]+ rights: PermissionRight[]+ requires?: PermissionRequirement[]+ label?: string+ description?: string+}++export type PermissionMap = Record<string, PermissionRight>++export interface PermissionActor {+ actor_type: string+ actor_id: string+ surface: PermissionSurface+ seller_id?: string+ seller_member_id?: string+}++/**+ * Implemented by the service of the module registered under+ * `PERMISSIONS_MODULE` in the Medusa config. Without that module, core grants+ * everything.+ */+export interface IPermissionResolver {+ resolvePermissions(+ actor: PermissionActor,+ catalog: PermissionDefinition[]+ ): Promise<PermissionMap>+}++export const PERMISSIONS_MODULE = "rbac"++export const MISSING_PERMISSION_CODE = "MISSING_PERMISSION"diff --git a/packages/vendor/src/components/authentication/protected-route/protected-route.tsx b/packages/vendor/src/components/authentication/protected-route/protected-route.tsxindex 81946cc81..83867c599 100644--- a/packages/vendor/src/components/authentication/protected-route/protected-route.tsx+++ b/packages/vendor/src/components/authentication/protected-route/protected-route.tsx@@ -1,11 +1,7 @@import { Spinner } from "@medusajs/icons";import { PermissionsProvider } from "@mercurjs/dashboard-shared";-import type { Permission, UserPolicy } from "@mercurjs/dashboard-sdk";-import { useMemo } from "react";import { Navigate, Outlet, useLocation } from "react-router-dom";-import { useFeatureFlags } from "../../../hooks/api/feature-flags";import { useMe } from "../../../hooks/api/members";-import { useMePermissions } from "../../../hooks/api/rbac";import { SearchProvider } from "../../../providers/search-provider";import { SidebarProvider } from "../../../providers/sidebar-provider";@@ -13,26 +9,6 @@ export const ProtectedRoute = () => {const { seller_member, isLoading } = useMe();const location = useLocation();- const { feature_flags } = useFeatureFlags();- const isRbacEnabled = !!feature_flags?.rbac;-- const { data: permissionsResponse, isLoading: isLoadingPermissions } =- useMePermissions({- // Don't fetch until a seller is resolved — the endpoint reads the role- // from the membership the `x-seller-id` header selects.- enabled: !!seller_member && isRbacEnabled,- });-- const policy: UserPolicy | null = useMemo(() => {- if (!permissionsResponse) {- return null;- }-- return {- permissions: permissionsResponse.permissions as Permission[],- };- }, [permissionsResponse]);-if (isLoading) {return (<div className="flex min-h-screen items-center justify-center">@@ -47,9 +23,7 @@ export const ProtectedRoute = () => {return (<PermissionsProvider- policy={policy}- isLoading={isLoadingPermissions}- isRbacEnabled={isRbacEnabled}+ permissions={seller_member.permissions ?? null}><SidebarProvider><SearchProvider>diff --git a/packages/vendor/src/components/common/action-menu/__tests__/filter-action-groups.spec.ts b/packages/vendor/src/components/common/action-menu/__tests__/filter-action-groups.spec.tsindex 117444bf9..2b4c76482 100644--- a/packages/vendor/src/components/common/action-menu/__tests__/filter-action-groups.spec.ts+++ b/packages/vendor/src/components/common/action-menu/__tests__/filter-action-groups.spec.ts@@ -27,8 +27,8 @@ describe("filterActionGroups", () => {test("drops an action the actor lacks", () => {const result = filterActionGroups(- groups({ icon, label: "Delete", onClick: () => {}, permission: "product:delete" }),- check(["product:read"])+ groups({ icon, label: "Delete", onClick: () => {}, permission: "products:manage" }),+ check(["products:view"]))expect(result).toEqual([])@@ -36,8 +36,8 @@ describe("filterActionGroups", () => {test("keeps an action the actor holds", () => {const result = filterActionGroups(- groups({ icon, label: "Edit", to: "edit", permission: "product:update" }),- check(["product:update"])+ groups({ icon, label: "Edit", to: "edit", permission: "products:edit" }),+ check(["products:edit"]))expect(result[0].actions).toHaveLength(1)@@ -48,15 +48,15 @@ describe("filterActionGroups", () => {icon,label: "Move",to: "move",- permission: ["product:update", "stock_location:update"],+ permission: ["products:edit", "stock_locations:edit"],requireAll: true,}- expect(filterActionGroups(groups(action), check(["product:update"]))).toEqual([])+ expect(filterActionGroups(groups(action), check(["products:edit"]))).toEqual([])expect(filterActionGroups(groups(action),- check(["product:update", "stock_location:update"])+ check(["products:edit", "stock_locations:edit"]))[0].actions).toHaveLength(1)})@@ -67,9 +67,9 @@ describe("filterActionGroups", () => {icon,label: "Move",to: "move",- permission: ["product:update", "stock_location:update"],+ permission: ["products:edit", "stock_locations:edit"],}),- check(["stock_location:update"])+ check(["stock_locations:edit"]))expect(result[0].actions).toHaveLength(1)@@ -78,7 +78,7 @@ describe("filterActionGroups", () => {test("drops a group once all of its actions are filtered out", () => {const result = filterActionGroups([- { actions: [{ icon, label: "Edit", to: "edit", permission: "product:update" }] },+ { actions: [{ icon, label: "Edit", to: "edit", permission: "products:edit" }] },{ actions: [{ icon, label: "View", to: "view" }] },] as ActionGroup[],check([])@@ -91,7 +91,7 @@ describe("filterActionGroups", () => {// Public routes mount no PermissionsProvider; the menu must still render.test("filters nothing when there is no permissions context", () => {const result = filterActionGroups(- groups({ icon, label: "Delete", onClick: () => {}, permission: "product:delete" }),+ groups({ icon, label: "Delete", onClick: () => {}, permission: "products:manage" }),null)diff --git a/packages/vendor/src/get-route-map.tsx b/packages/vendor/src/get-route-map.tsxindex 00604208c..c4fccacd0 100644--- a/packages/vendor/src/get-route-map.tsx+++ b/packages/vendor/src/get-route-map.tsx@@ -75,7 +75,7 @@ export function getRouteMap({{path: "/products",errorElement: <ErrorBoundary />,- handle: { breadcrumb: () => t("products.domain"), permissions: "product:read" },+ handle: { breadcrumb: () => t("products.domain"), permissions: "products:view" },children: [{path: "",@@ -231,7 +231,7 @@ export function getRouteMap({{path: "/orders",errorElement: <ErrorBoundary />,- handle: { breadcrumb: () => t("orders.domain"), permissions: "order:read" },+ handle: { breadcrumb: () => t("orders.domain"), permissions: "orders:view" },children: [{path: "",@@ -318,7 +318,7 @@ export function getRouteMap({{path: "/payouts",errorElement: <ErrorBoundary />,- handle: { breadcrumb: () => "Payouts", permissions: "payout:read" },+ handle: { breadcrumb: () => "Payouts", permissions: "payouts:view" },children: [{path: "",@@ -360,7 +360,7 @@ export function getRouteMap({{path: "/categories",errorElement: <ErrorBoundary />,- handle: { breadcrumb: () => t("categories.domain"), permissions: "product_category:read" },+ handle: { breadcrumb: () => t("categories.domain"), permissions: "product_categories:view" },children: [{path: "",@@ -432,7 +432,7 @@ export function getRouteMap({{path: "/collections",errorElement: <ErrorBoundary />,- handle: { breadcrumb: () => t("collections.domain"), permissions: "product_collection:read" },+ handle: { breadcrumb: () => t("collections.domain"), permissions: "product_collections:view" },children: [{path: "",@@ -493,7 +493,7 @@ export function getRouteMap({{path: "/customers",errorElement: <ErrorBoundary />,- handle: { breadcrumb: () => t("customers.domain"), permissions: "customer:read" },+ handle: { breadcrumb: () => t("customers.domain"), permissions: "customers:view" },children: [{path: "",@@ -548,7 +548,7 @@ export function getRouteMap({{path: "/customer-groups",errorElement: <ErrorBoundary />,- handle: { breadcrumb: () => t("customerGroups.domain"), permissions: "customer_group:read" },+ handle: { breadcrumb: () => t("customerGroups.domain"), permissions: "customer_groups:view" },children: [{path: "",@@ -616,7 +616,7 @@ export function getRouteMap({{path: "/offers",errorElement: <ErrorBoundary />,- handle: { breadcrumb: () => t("offers.domain"), permissions: "offer:read" },+ handle: { breadcrumb: () => t("offers.domain"), permissions: "offers:view" },children: [{path: "",@@ -734,7 +734,7 @@ export function getRouteMap({{path: "/inventory",errorElement: <ErrorBoundary />,- handle: { breadcrumb: () => t("inventory.domain"), permissions: "inventory_item:read" },+ handle: { breadcrumb: () => t("inventory.domain"), permissions: "inventory_items:view" },children: [{path: "",@@ -819,7 +819,7 @@ export function getRouteMap({{path: "/promotions",errorElement: <ErrorBoundary />,- handle: { breadcrumb: () => t("promotions.domain"), permissions: "promotion:read" },+ handle: { breadcrumb: () => t("promotions.domain"), permissions: "promotions:view" },children: [{path: "",@@ -890,7 +890,7 @@ export function getRouteMap({{path: "/campaigns",errorElement: <ErrorBoundary />,- handle: { breadcrumb: () => t("campaigns.domain"), permissions: "campaign:read" },+ handle: { breadcrumb: () => t("campaigns.domain"), permissions: "campaigns:view" },children: [{path: "",@@ -970,7 +970,7 @@ export function getRouteMap({{path: "/price-lists",errorElement: <ErrorBoundary />,- handle: { breadcrumb: () => t("priceLists.domain"), permissions: "price_list:read" },+ handle: { breadcrumb: () => t("priceLists.domain"), permissions: "price_lists:view" },children: [{path: "",@@ -1054,7 +1054,7 @@ export function getRouteMap({{path: "/reviews",errorElement: <ErrorBoundary />,- handle: { breadcrumb: () => t("reviews.domain"), permissions: "review:read" },+ handle: { breadcrumb: () => t("reviews.domain"), permissions: "reviews:view" },children: [{path: "",@@ -1109,7 +1109,7 @@ export function getRouteMap({{path: "/reservations",errorElement: <ErrorBoundary />,- handle: { breadcrumb: () => t("reservations.domain"), permissions: "reservation_item:read" },+ handle: { breadcrumb: () => t("reservations.domain"), permissions: "reservations:view" },children: [{path: "",@@ -1222,7 +1222,7 @@ export function getRouteMap({errorElement: <ErrorBoundary />,handle: {breadcrumb: () => t("app.menus.store.label"),- permissions: "seller:read",+ permissions: "store:view",},children: [{@@ -1266,7 +1266,7 @@ export function getRouteMap({path: "locations",errorElement: <ErrorBoundary />,element: <Outlet />,- handle: { breadcrumb: () => t("locations.domain"), permissions: "stock_location:read" },+ handle: { breadcrumb: () => t("locations.domain"), permissions: "stock_locations:view" },children: [{path: "",@@ -1287,7 +1287,7 @@ export function getRouteMap({element: <Outlet />,handle: {breadcrumb: () => t("shippingProfile.domain"),- permissions: "shipping_profile:read",+ permissions: "shipping_profiles:view",},children: [{@@ -1370,7 +1370,7 @@ export function getRouteMap({},{path: "fulfillment-providers",- handle: { permissions: "fulfillment_provider:read" },+ handle: { permissions: "fulfillment_sets:view" },lazy: () =>import("./pages/settings/locations/[location_id]/fulfillment-providers"),},@@ -1416,7 +1416,7 @@ export function getRouteMap({path: "tax-regions",errorElement: <ErrorBoundary />,element: <Outlet />,- handle: { breadcrumb: () => t("taxRegions.domain"), permissions: "tax_region:read" },+ handle: { breadcrumb: () => t("taxRegions.domain"), permissions: "tax_regions:view" },children: [{path: "",@@ -1518,7 +1518,7 @@ export function getRouteMap({path: "product-tags",errorElement: <ErrorBoundary />,element: <Outlet />,- handle: { breadcrumb: () => t("productTags.domain"), permissions: "product_tag:read" },+ handle: { breadcrumb: () => t("productTags.domain"), permissions: "product_tags:view" },children: [{path: "",@@ -1571,7 +1571,7 @@ export function getRouteMap({path: "users",errorElement: <ErrorBoundary />,element: <Outlet />,- handle: { breadcrumb: () => t("users.domain"), permissions: "seller_member:read" },+ handle: { breadcrumb: () => t("users.domain"), permissions: "members:view" },children: [{path: "",@@ -1600,7 +1600,7 @@ export function getRouteMap({path: "product-types",errorElement: <ErrorBoundary />,element: <Outlet />,- handle: { breadcrumb: () => t("productTypes.domain"), permissions: "product_type:read" },+ handle: { breadcrumb: () => t("productTypes.domain"), permissions: "product_types:view" },children: [{path: "",@@ -1661,7 +1661,7 @@ export function getRouteMap({path: "return-reasons",errorElement: <ErrorBoundary />,element: <Outlet />,- handle: { breadcrumb: () => t("returnReasons.domain"), permissions: "return_reason:read" },+ handle: { breadcrumb: () => t("returnReasons.domain"), permissions: "return_reasons:view" },children: [{path: "",diff --git a/packages/vendor/src/hooks/api/members.tsx b/packages/vendor/src/hooks/api/members.tsxindex dccb3763f..9e771c548 100644--- a/packages/vendor/src/hooks/api/members.tsx+++ b/packages/vendor/src/hooks/api/members.tsx@@ -19,6 +19,13 @@ export const membersQueryKeys = {me: () => [MEMBERS_QUERY_KEY, "me"],};+// Rides along on every `me` fetch so the panel gets the actor's rights in the+// same request instead of a follow-up one.+const withPermissionsField = (fields: unknown) =>+ [typeof fields === "string" ? fields : undefined, "+permissions"]+ .filter(Boolean)+ .join(",");+export const useMe = (query?: Record<string, unknown>,options?: UseQueryOptions<@@ -29,9 +36,10 @@ export const useMe = () => {const { data, ...rest } = useQuery({queryFn: () =>- sdk.vendor.members.me.query(- query as Parameters<typeof sdk.vendor.members.me.query>[0],- ),+ sdk.vendor.members.me.query({+ ...query,+ fields: withPermissionsField(query?.fields),+ } as Parameters<typeof sdk.vendor.members.me.query>[0]),queryKey: query ? [...membersQueryKeys.me(), query] : membersQueryKeys.me(),...options,});diff --git a/packages/vendor/src/hooks/api/rbac.tsx b/packages/vendor/src/hooks/api/rbac.tsxdeleted file mode 100644index a5f386578..000000000--- a/packages/vendor/src/hooks/api/rbac.tsx+++ /dev/null@@ -1,37 +0,0 @@-import { ClientError, InferClientOutput } from "@mercurjs/client";-import { QueryKey, UseQueryOptions, useQuery } from "@tanstack/react-query";--import { sdk } from "../../lib/client";--type VendorMePermissionsResponse = InferClientOutput<- typeof sdk.vendor.rbac.me.permissions.query->;--const ME_PERMISSIONS_QUERY_KEY = ["vendor_rbac_me_permissions"] as const;--export const mePermissionsQueryKey = ME_PERMISSIONS_QUERY_KEY;--/**- * The acting member's permissions for the seller currently being acted on.- *- * Scoped per seller, so it has to be refetched when the store switcher changes- * stores — the `x-seller-id` header decides which membership the API resolves.- */-export const useMePermissions = (- options?: Omit<- UseQueryOptions<- VendorMePermissionsResponse,- ClientError,- VendorMePermissionsResponse,- QueryKey- >,- "queryKey" | "queryFn"- >-) => {- return useQuery({- queryFn: () => sdk.vendor.rbac.me.permissions.query(),- queryKey: mePermissionsQueryKey,- staleTime: 5 * 60 * 1000,- ...options,- });-};diff --git a/packages/vendor/src/lib/permissions/route-permissions.ts b/packages/vendor/src/lib/permissions/route-permissions.tsindex 4e85b6f62..d955a446d 100644--- a/packages/vendor/src/lib/permissions/route-permissions.ts+++ b/packages/vendor/src/lib/permissions/route-permissions.ts@@ -11,30 +11,30 @@ import type { Permission } from "@mercurjs/dashboard-sdk"* scoped to the acting member rather than to the store (their own profile).*/export const ROUTE_PERMISSIONS: Record<string, Permission> = {- "/orders": "order:read",- "/products": "product:read",- "/offers": "offer:read",- "/collections": "product_collection:read",- "/categories": "product_category:read",- "/inventory": "inventory_item:read",- "/reservations": "reservation_item:read",- "/customers": "customer:read",- "/customer-groups": "customer_group:read",- "/promotions": "promotion:read",- "/campaigns": "campaign:read",- "/price-lists": "price_list:read",- "/reviews": "review:read",- "/payouts": "payout:read",+ "/orders": "orders:view",+ "/products": "products:view",+ "/offers": "offers:view",+ "/collections": "product_collections:view",+ "/categories": "product_categories:view",+ "/inventory": "inventory_items:view",+ "/reservations": "reservations:view",+ "/customers": "customers:view",+ "/customer-groups": "customer_groups:view",+ "/promotions": "promotions:view",+ "/campaigns": "campaigns:view",+ "/price-lists": "price_lists:view",+ "/reviews": "reviews:view",+ "/payouts": "payouts:view",- "/settings/store": "seller:read",- "/settings/users": "seller_member:read",- "/settings/locations": "stock_location:read",- "/settings/product-tags": "product_tag:read",- "/settings/product-types": "product_type:read",- "/settings/return-reasons": "return_reason:read",- "/settings/shipping-profiles": "shipping_profile:read",- "/settings/tax-regions": "tax_region:read",- "/settings/fulfillment-providers": "fulfillment_provider:read",+ "/settings/store": "store:view",+ "/settings/users": "members:view",+ "/settings/locations": "stock_locations:view",+ "/settings/product-tags": "product_tags:view",+ "/settings/product-types": "product_types:view",+ "/settings/return-reasons": "return_reasons:view",+ "/settings/shipping-profiles": "shipping_profiles:view",+ "/settings/tax-regions": "tax_regions:view",+ "/settings/fulfillment-providers": "fulfillment_sets:view",}export const getRoutePermission = (path: string): Permission | undefined =>diff --git a/packages/vendor/src/pages/campaigns/[id]/_components/campaign-budget/campaign-budget.tsx b/packages/vendor/src/pages/campaigns/[id]/_components/campaign-budget/campaign-budget.tsxindex 5271d4b2e..dc6301222 100644--- a/packages/vendor/src/pages/campaigns/[id]/_components/campaign-budget/campaign-budget.tsx+++ b/packages/vendor/src/pages/campaigns/[id]/_components/campaign-budget/campaign-budget.tsx@@ -101,7 +101,7 @@ export const CampaignBudget = ({ campaign }: CampaignBudgetProps) => {actions: [{icon: <PencilSquare />,- permission: "campaign:update",+ permission: "campaigns:edit",label: t("actions.edit"),to: "edit-budget",},diff --git a/packages/vendor/src/pages/campaigns/[id]/_components/campaign-configuration-section/campaign-configuration-section.tsx b/packages/vendor/src/pages/campaigns/[id]/_components/campaign-configuration-section/campaign-configuration-section.tsxindex 701312bdf..3c66426ca 100644--- a/packages/vendor/src/pages/campaigns/[id]/_components/campaign-configuration-section/campaign-configuration-section.tsx+++ b/packages/vendor/src/pages/campaigns/[id]/_components/campaign-configuration-section/campaign-configuration-section.tsx@@ -25,7 +25,7 @@ export const CampaignConfigurationSection = ({{actions: [{- permission: "campaign:update",+ permission: "campaigns:edit",label: t("actions.edit"),icon: <PencilSquare />,to: "configuration",diff --git a/packages/vendor/src/pages/campaigns/[id]/_components/campaign-general-section/campaign-general-section.tsx b/packages/vendor/src/pages/campaigns/[id]/_components/campaign-general-section/campaign-general-section.tsxindex d1ee4e1ad..cacc365cb 100644--- a/packages/vendor/src/pages/campaigns/[id]/_components/campaign-general-section/campaign-general-section.tsx+++ b/packages/vendor/src/pages/campaigns/[id]/_components/campaign-general-section/campaign-general-section.tsx@@ -87,7 +87,7 @@ export const CampaignGeneralSection = ({actions: [{icon: <PencilSquare />,- permission: "campaign:update",+ permission: "campaigns:edit",label: t("actions.edit"),to: `/campaigns/${campaign.id}/edit`,},@@ -97,7 +97,7 @@ export const CampaignGeneralSection = ({actions: [{icon: <Trash />,- permission: "campaign:delete",+ permission: "campaigns:manage",label: t("actions.delete"),onClick: handleDelete,},diff --git a/packages/vendor/src/pages/campaigns/[id]/_components/campaign-promotion-section/campaign-promotion-section.tsx b/packages/vendor/src/pages/campaigns/[id]/_components/campaign-promotion-section/campaign-promotion-section.tsxindex 50e7b6c30..911b5eca8 100644--- a/packages/vendor/src/pages/campaigns/[id]/_components/campaign-promotion-section/campaign-promotion-section.tsx+++ b/packages/vendor/src/pages/campaigns/[id]/_components/campaign-promotion-section/campaign-promotion-section.tsx@@ -205,7 +205,7 @@ const PromotionActions = ({ promotion }: { promotion: AdminPromotion }) => {actions: [{icon: <PencilSquare />,- permission: "campaign:update",+ permission: "campaigns:edit",label: t("actions.edit"),to: `/promotions/${promotion.id}/edit`,},diff --git a/packages/vendor/src/pages/campaigns/_components/campaign-list-table/campaign-list-data-table.tsx b/packages/vendor/src/pages/campaigns/_components/campaign-list-table/campaign-list-data-table.tsxindex bd25b5588..b815cdb20 100644--- a/packages/vendor/src/pages/campaigns/_components/campaign-list-table/campaign-list-data-table.tsx+++ b/packages/vendor/src/pages/campaigns/_components/campaign-list-table/campaign-list-data-table.tsx@@ -113,7 +113,7 @@ const CampaignActions = ({ campaign }: { campaign: AdminCampaign }) => {actions: [{icon: <PencilSquare />,- permission: "campaign:update",+ permission: "campaigns:edit",label: t("actions.edit"),to: `/campaigns/${campaign.id}/edit`,},@@ -123,7 +123,7 @@ const CampaignActions = ({ campaign }: { campaign: AdminCampaign }) => {actions: [{icon: <Trash />,- permission: "campaign:delete",+ permission: "campaigns:manage",label: t("actions.delete"),onClick: handleDelete,},diff --git a/packages/vendor/src/pages/campaigns/_components/campaign-list-table/campaign-list-header.tsx b/packages/vendor/src/pages/campaigns/_components/campaign-list-table/campaign-list-header.tsxindex 1506209ed..2595e6cdf 100644--- a/packages/vendor/src/pages/campaigns/_components/campaign-list-table/campaign-list-header.tsx+++ b/packages/vendor/src/pages/campaigns/_components/campaign-list-table/campaign-list-header.tsx@@ -12,7 +12,7 @@ export const CampaignListTitle = () => {export const CampaignListCreateButton = () => {const { t } = useTranslation();return (- <PermissionGuard resource="campaign" operation="create">+ <PermissionGuard permission="campaigns:edit"><Link to="/campaigns/create"><Button size="small" variant="secondary">{t("actions.create")}diff --git a/packages/vendor/src/pages/collections/[id]/_components/collection-product-section/collection-product-section.tsx b/packages/vendor/src/pages/collections/[id]/_components/collection-product-section/collection-product-section.tsxindex 95e4d238c..ff7d2c42b 100644--- a/packages/vendor/src/pages/collections/[id]/_components/collection-product-section/collection-product-section.tsx+++ b/packages/vendor/src/pages/collections/[id]/_components/collection-product-section/collection-product-section.tsx@@ -204,7 +204,7 @@ const ProductActions = ({actions: [{icon: <PencilSquare />,- permission: "product_collection:update",+ permission: "product_collections:edit",label: t("actions.edit"),to: `/products/${product.id}/edit`,},diff --git a/packages/vendor/src/pages/collections/_components/collection-list-table/collection-row-actions.tsx b/packages/vendor/src/pages/collections/_components/collection-list-table/collection-row-actions.tsxindex 2154de6bd..45ff6fb20 100644--- a/packages/vendor/src/pages/collections/_components/collection-list-table/collection-row-actions.tsx+++ b/packages/vendor/src/pages/collections/_components/collection-list-table/collection-row-actions.tsx@@ -41,7 +41,7 @@ export const CollectionRowActions = ({{actions: [{- permission: "product_collection:delete",+ permission: "product_collections:manage",label: t("actions.delete"),onClick: handleDeleteCollection,icon: <Trash />,diff --git a/packages/vendor/src/pages/customer-groups/customer-group-detail/components/customer-group-general-section/customer-group-general-section.tsx b/packages/vendor/src/pages/customer-groups/customer-group-detail/components/customer-group-general-section/customer-group-general-section.tsxindex 1f922d0c9..75f7a54fc 100644--- a/packages/vendor/src/pages/customer-groups/customer-group-detail/components/customer-group-general-section/customer-group-general-section.tsx+++ b/packages/vendor/src/pages/customer-groups/customer-group-detail/components/customer-group-general-section/customer-group-general-section.tsx@@ -72,7 +72,7 @@ export const CustomerGroupGeneralSection = ({actions: [{icon: <PencilSquare />,- permission: "customer_group:update",+ permission: "customer_groups:edit",label: t("actions.edit"),to: `/customer-groups/${group.id}/edit`,},@@ -82,7 +82,7 @@ export const CustomerGroupGeneralSection = ({actions: [{icon: <Trash />,- permission: "customer_group:delete",+ permission: "customer_groups:manage",label: t("actions.delete"),onClick: handleDelete,},diff --git a/packages/vendor/src/pages/customer-groups/customer-group-list/components/customer-group-list-table/customer-group-list-table.tsx b/packages/vendor/src/pages/customer-groups/customer-group-list/components/customer-group-list-table/customer-group-list-table.tsxindex f1c8df8bd..5a8904c84 100644--- a/packages/vendor/src/pages/customer-groups/customer-group-list/components/customer-group-list-table/customer-group-list-table.tsx+++ b/packages/vendor/src/pages/customer-groups/customer-group-list/components/customer-group-list-table/customer-group-list-table.tsx@@ -34,7 +34,7 @@ export const CustomerGroupListTitle = () => {export const CustomerGroupListCreateButton = () => {const { t } = useTranslation();return (- <PermissionGuard resource="customer_group" operation="create">+ <PermissionGuard permission="customer_groups:edit"><Link to="/customer-groups/create" data-testid="customer-group-list-create-link"><Button size="small" variant="secondary" data-testid="customer-group-list-create-button">{t("actions.create")}@@ -226,7 +226,7 @@ const CustomerGroupActions = ({actions: [{icon: <PencilSquare />,- permission: "customer_group:update",+ permission: "customer_groups:edit",label: t("actions.edit"),to: `/customer-groups/${group.id}/edit`,},@@ -236,7 +236,7 @@ const CustomerGroupActions = ({actions: [{icon: <Trash />,- permission: "customer_group:delete",+ permission: "customer_groups:manage",label: t("actions.delete"),onClick: handleDelete,},diff --git a/packages/vendor/src/pages/customers/[id]/_components/customer-group-section/customer-group-section.tsx b/packages/vendor/src/pages/customers/[id]/_components/customer-group-section/customer-group-section.tsxindex 447a8e30a..6411f2012 100644--- a/packages/vendor/src/pages/customers/[id]/_components/customer-group-section/customer-group-section.tsx+++ b/packages/vendor/src/pages/customers/[id]/_components/customer-group-section/customer-group-section.tsx@@ -241,7 +241,7 @@ const CustomerGroupRowActions = ({{actions: [{- permission: "customer:update",+ permission: "customers:edit",label: t("actions.edit"),icon: <PencilSquare />,to: `/customer-groups/${group.id}/edit`,diff --git a/packages/vendor/src/pages/inventory/[id]/_components/inventory-item-attributes/attributes-section.tsx b/packages/vendor/src/pages/inventory/[id]/_components/inventory-item-attributes/attributes-section.tsxindex 0d0bb08a3..4438b5850 100644--- a/packages/vendor/src/pages/inventory/[id]/_components/inventory-item-attributes/attributes-section.tsx+++ b/packages/vendor/src/pages/inventory/[id]/_components/inventory-item-attributes/attributes-section.tsx@@ -27,7 +27,7 @@ export const InventoryItemAttributeSection = ({{actions: [{- permission: "inventory_item:update",+ permission: "inventory_items:edit",label: t("actions.edit"),to: "attributes",icon: <PencilSquare />,diff --git a/packages/vendor/src/pages/inventory/[id]/_components/inventory-item-general-section.tsx b/packages/vendor/src/pages/inventory/[id]/_components/inventory-item-general-section.tsxindex 406e78d91..705d0b6a9 100644--- a/packages/vendor/src/pages/inventory/[id]/_components/inventory-item-general-section.tsx+++ b/packages/vendor/src/pages/inventory/[id]/_components/inventory-item-general-section.tsx@@ -66,7 +66,7 @@ export const InventoryItemGeneralSection = ({actions: [{icon: <PencilSquare />,- permission: "inventory_item:update",+ permission: "inventory_items:edit",label: t("actions.edit"),to: "edit",},diff --git a/packages/vendor/src/pages/inventory/[id]/_components/location-levels-table/location-actions.tsx b/packages/vendor/src/pages/inventory/[id]/_components/location-levels-table/location-actions.tsxindex d7cea4c68..4d5c17bee 100644--- a/packages/vendor/src/pages/inventory/[id]/_components/location-levels-table/location-actions.tsx+++ b/packages/vendor/src/pages/inventory/[id]/_components/location-levels-table/location-actions.tsx@@ -48,7 +48,7 @@ export const LocationActions = ({ level }: { level: LocationActionsLevel }) => {actions: [{icon: <PencilSquare />,- permission: "inventory_item:update",+ permission: "inventory_items:edit",label: t("actions.edit"),to: `locations/${level.location_id}`,},@@ -58,7 +58,7 @@ export const LocationActions = ({ level }: { level: LocationActionsLevel }) => {actions: [{icon: <Trash />,- permission: "inventory_item:delete",+ permission: "inventory_items:manage",label: t("actions.delete"),onClick: handleDelete,disabled:diff --git a/packages/vendor/src/pages/inventory/[id]/_components/reservations-table/reservation-actions.tsx b/packages/vendor/src/pages/inventory/[id]/_components/reservations-table/reservation-actions.tsxindex cba5cb216..a6ee17ae0 100644--- a/packages/vendor/src/pages/inventory/[id]/_components/reservations-table/reservation-actions.tsx+++ b/packages/vendor/src/pages/inventory/[id]/_components/reservations-table/reservation-actions.tsx@@ -55,7 +55,7 @@ export const ReservationActions = ({actions: [{icon: <PencilSquare />,- permission: "inventory_item:update",+ permission: "inventory_items:edit",label: t("actions.edit"),to: `/reservations/${reservation.id}/edit`,},@@ -65,7 +65,7 @@ export const ReservationActions = ({actions: [{icon: <Trash />,- permission: "inventory_item:delete",+ permission: "inventory_items:manage",label: t("actions.delete"),onClick: handleDelete,},diff --git a/packages/vendor/src/pages/inventory/_components/inventory-actions.tsx b/packages/vendor/src/pages/inventory/_components/inventory-actions.tsxindex 51cfcf2c1..8ad0a0602 100644--- a/packages/vendor/src/pages/inventory/_components/inventory-actions.tsx+++ b/packages/vendor/src/pages/inventory/_components/inventory-actions.tsx@@ -36,7 +36,7 @@ export const InventoryActions = ({ item }: { item: InventoryItemDTO }) => {actions: [{icon: <PencilSquare />,- permission: "inventory_item:update",+ permission: "inventory_items:edit",label: t("actions.edit"),to: `${item.id}/edit`,},@@ -46,7 +46,7 @@ export const InventoryActions = ({ item }: { item: InventoryItemDTO }) => {actions: [{icon: <Trash />,- permission: "inventory_item:delete",+ permission: "inventory_items:manage",label: t("actions.delete"),onClick: handleDelete,},diff --git a/packages/vendor/src/pages/inventory/_components/inventory-list-header.tsx b/packages/vendor/src/pages/inventory/_components/inventory-list-header.tsxindex e5cd57436..86f7466e6 100644--- a/packages/vendor/src/pages/inventory/_components/inventory-list-header.tsx+++ b/packages/vendor/src/pages/inventory/_components/inventory-list-header.tsx@@ -23,7 +23,7 @@ export const InventoryListCreateButton = () => {const { t } = useTranslation();return (- <PermissionGuard resource="inventory_item" operation="create">+ <PermissionGuard permission="inventory_items:edit"><Button size="small" variant="secondary" asChild><Link to="create">{t("actions.create")}</Link></Button>diff --git a/packages/vendor/src/pages/offers/[id]/_components/offer-detail-general-section.tsx b/packages/vendor/src/pages/offers/[id]/_components/offer-detail-general-section.tsxindex b76b89ca7..db691883c 100644--- a/packages/vendor/src/pages/offers/[id]/_components/offer-detail-general-section.tsx+++ b/packages/vendor/src/pages/offers/[id]/_components/offer-detail-general-section.tsx@@ -103,7 +103,7 @@ export const OfferDetailGeneralSection = ({{actions: [{- permission: "offer:delete",+ permission: "offers:manage",label: t("actions.delete"),onClick: handleDelete,icon: <Trash />,diff --git a/packages/vendor/src/pages/offers/[id]/_components/offer-general-section.tsx b/packages/vendor/src/pages/offers/[id]/_components/offer-general-section.tsxindex 4336312f4..a99b30f6d 100644--- a/packages/vendor/src/pages/offers/[id]/_components/offer-general-section.tsx+++ b/packages/vendor/src/pages/offers/[id]/_components/offer-general-section.tsx@@ -51,7 +51,7 @@ export const OfferGeneralSection = ({ offer }: Props) => {actions: [{icon: <PencilSquare />,- permission: "offer:update",+ permission: "offers:edit",label: t("actions.edit"),to: "edit",},@@ -61,7 +61,7 @@ export const OfferGeneralSection = ({ offer }: Props) => {actions: [{icon: <Trash />,- permission: "offer:delete",+ permission: "offers:manage",label: t("actions.delete"),onClick: handleDelete,},diff --git a/packages/vendor/src/pages/offers/[id]/_components/offer-pricing-section.tsx b/packages/vendor/src/pages/offers/[id]/_components/offer-pricing-section.tsxindex 6004bc906..50c87135e 100644--- a/packages/vendor/src/pages/offers/[id]/_components/offer-pricing-section.tsx+++ b/packages/vendor/src/pages/offers/[id]/_components/offer-pricing-section.tsx@@ -44,7 +44,7 @@ export const OfferPricingSection = ({ offer }: Props) => {{actions: [{- permission: "offer:update",+ permission: "offers:edit",label: t("actions.edit"),icon: <CurrencyDollar />,to: "pricing",diff --git a/packages/vendor/src/pages/offers/[id]/_components/offer-variants-section.tsx b/packages/vendor/src/pages/offers/[id]/_components/offer-variants-section.tsxindex dfa1d3237..a27fda590 100644--- a/packages/vendor/src/pages/offers/[id]/_components/offer-variants-section.tsx+++ b/packages/vendor/src/pages/offers/[id]/_components/offer-variants-section.tsx@@ -198,7 +198,7 @@ const useColumns = ({actions: [{icon: <PencilSquare />,- permission: "offer:update",+ permission: "offers:edit",label: t("actions.edit"),onClick: () => onEdit(row.original.id),},@@ -221,7 +221,7 @@ const useColumns = ({actions: [{icon: <Trash />,- permission: "offer:delete",+ permission: "offers:manage",label: t("actions.delete"),onClick: () =>onDelete(row.original.id, skuOf(row.original)),diff --git a/packages/vendor/src/pages/offers/[id]/variants/[offer_id]/_components/offer-variant-general-section.tsx b/packages/vendor/src/pages/offers/[id]/variants/[offer_id]/_components/offer-variant-general-section.tsxindex 62a66abb9..622c1d590 100644--- a/packages/vendor/src/pages/offers/[id]/variants/[offer_id]/_components/offer-variant-general-section.tsx+++ b/packages/vendor/src/pages/offers/[id]/variants/[offer_id]/_components/offer-variant-general-section.tsx@@ -51,7 +51,7 @@ export const OfferVariantGeneralSection = ({{actions: [{- permission: "offer:update",+ permission: "offers:edit",label: t("actions.edit"),to: "edit",icon: <PencilSquare />,diff --git a/packages/vendor/src/pages/offers/[id]/variants/[offer_id]/_components/offer-variant-shipping-section.tsx b/packages/vendor/src/pages/offers/[id]/variants/[offer_id]/_components/offer-variant-shipping-section.tsxindex d327a350e..d1fc84a6a 100644--- a/packages/vendor/src/pages/offers/[id]/variants/[offer_id]/_components/offer-variant-shipping-section.tsx+++ b/packages/vendor/src/pages/offers/[id]/variants/[offer_id]/_components/offer-variant-shipping-section.tsx@@ -33,7 +33,7 @@ export const OfferVariantShippingSection = ({{actions: [{- permission: "offer:update",+ permission: "offers:edit",label: t("actions.edit"),to: "shipping",icon: <PencilSquare />,diff --git a/packages/vendor/src/pages/offers/_components/offer-actions.tsx b/packages/vendor/src/pages/offers/_components/offer-actions.tsxindex 2c47dca8b..f7b39b613 100644--- a/packages/vendor/src/pages/offers/_components/offer-actions.tsx+++ b/packages/vendor/src/pages/offers/_components/offer-actions.tsx@@ -79,7 +79,7 @@ export const OfferActions = ({ product }: { product: OfferProductActions }) => {actions: [{icon: <Trash />,- permission: "offer:delete",+ permission: "offers:manage",label: t("actions.delete"),onClick: handleDelete,disabled: product.offerIds.length === 0,diff --git a/packages/vendor/src/pages/offers/_components/offer-list-header.tsx b/packages/vendor/src/pages/offers/_components/offer-list-header.tsxindex 99b64e1eb..8a6b353d4 100644--- a/packages/vendor/src/pages/offers/_components/offer-list-header.tsx+++ b/packages/vendor/src/pages/offers/_components/offer-list-header.tsx@@ -13,7 +13,7 @@ export const OfferListActions = () => {const { t } = useTranslation()return (- <PermissionGuard resource="offer" operation="create">+ <PermissionGuard permission="offers:edit"><Button size="small" variant="secondary" asChild><Link to="create" data-testid="offer-list-create-button">{t("offers.actions.create")}diff --git a/packages/vendor/src/pages/price-lists/[id]/_components/price-list-configuration-section/price-list-configuration-section.tsx b/packages/vendor/src/pages/price-lists/[id]/_components/price-list-configuration-section/price-list-configuration-section.tsxindex 0a945dffd..9bc413816 100644--- a/packages/vendor/src/pages/price-lists/[id]/_components/price-list-configuration-section/price-list-configuration-section.tsx+++ b/packages/vendor/src/pages/price-lists/[id]/_components/price-list-configuration-section/price-list-configuration-section.tsx@@ -26,7 +26,7 @@ export const PriceListConfigurationSection = ({{actions: [{- permission: "price_list:update",+ permission: "price_lists:edit",label: t("actions.edit"),to: "configuration",icon: <PencilSquare />,diff --git a/packages/vendor/src/pages/price-lists/[id]/_components/price-list-customer-availability-section/price-list-customer-availability-section.tsx b/packages/vendor/src/pages/price-lists/[id]/_components/price-list-customer-availability-section/price-list-customer-availability-section.tsxindex 477daff6d..7fbd46dc0 100644--- a/packages/vendor/src/pages/price-lists/[id]/_components/price-list-customer-availability-section/price-list-customer-availability-section.tsx+++ b/packages/vendor/src/pages/price-lists/[id]/_components/price-list-customer-availability-section/price-list-customer-availability-section.tsx@@ -40,7 +40,7 @@ export const PriceListCustomerAvailabilitySection = ({{actions: [{- permission: "price_list:update",+ permission: "price_lists:edit",label: t("actions.edit"),to: "customer-availability",icon: <PencilSquare />,diff --git a/packages/vendor/src/pages/price-lists/[id]/_components/price-list-general-section/price-list-general-section.tsx b/packages/vendor/src/pages/price-lists/[id]/_components/price-list-general-section/price-list-general-section.tsxindex ca45ae03a..6ce5b9a74 100644--- a/packages/vendor/src/pages/price-lists/[id]/_components/price-list-general-section/price-list-general-section.tsx+++ b/packages/vendor/src/pages/price-lists/[id]/_components/price-list-general-section/price-list-general-section.tsx@@ -52,7 +52,7 @@ export const PriceListGeneralSection = ({{actions: [{- permission: "price_list:update",+ permission: "price_lists:edit",label: t("actions.edit"),to: "edit",icon: <PencilSquare />,@@ -62,7 +62,7 @@ export const PriceListGeneralSection = ({{actions: [{- permission: "price_list:delete",+ permission: "price_lists:manage",label: t("actions.delete"),onClick: handleDelete,icon: <Trash />,diff --git a/packages/vendor/src/pages/price-lists/_components/price-list-list-table/price-list-list-header.tsx b/packages/vendor/src/pages/price-lists/_components/price-list-list-table/price-list-list-header.tsxindex 43c793742..8eef4acf7 100644--- a/packages/vendor/src/pages/price-lists/_components/price-list-list-table/price-list-list-header.tsx+++ b/packages/vendor/src/pages/price-lists/_components/price-list-list-table/price-list-list-header.tsx@@ -16,7 +16,7 @@ export const PriceListListTitle = () => {export const PriceListListCreateButton = () => {const { t } = useTranslation();return (- <PermissionGuard resource="price_list" operation="create">+ <PermissionGuard permission="price_lists:edit"><Button size="small" variant="secondary" asChild><Link to="create">{t("actions.create")}</Link></Button>diff --git a/packages/vendor/src/pages/price-lists/_components/price-list-list-table/price-list-list-table-actions.tsx b/packages/vendor/src/pages/price-lists/_components/price-list-list-table/price-list-list-table-actions.tsxindex 326560a28..780418ed8 100644--- a/packages/vendor/src/pages/price-lists/_components/price-list-list-table/price-list-list-table-actions.tsx+++ b/packages/vendor/src/pages/price-lists/_components/price-list-list-table/price-list-list-table-actions.tsx@@ -24,7 +24,7 @@ export const PriceListListTableActions = ({{actions: [{- permission: "price_list:update",+ permission: "price_lists:edit",label: t("actions.edit"),to: `${priceList.id}/edit`,icon: <PencilSquare />,@@ -34,7 +34,7 @@ export const PriceListListTableActions = ({{actions: [{- permission: "price_list:delete",+ permission: "price_lists:manage",label: t("actions.delete"),onClick: handleDelete,icon: <Trash />,diff --git a/packages/vendor/src/pages/product-variants/product-variant-detail/components/variant-general-section/variant-general-section.tsx b/packages/vendor/src/pages/product-variants/product-variant-detail/components/variant-general-section/variant-general-section.tsxindex e87ddf979..013ca6dee 100644--- a/packages/vendor/src/pages/product-variants/product-variant-detail/components/variant-general-section/variant-general-section.tsx+++ b/packages/vendor/src/pages/product-variants/product-variant-detail/components/variant-general-section/variant-general-section.tsx@@ -65,7 +65,7 @@ export function VariantGeneralSection({{actions: [{- permission: "product_variant:update",+ permission: "products:edit",label: t("actions.edit"),to: "edit",icon: <PencilSquare />,@@ -75,7 +75,7 @@ export function VariantGeneralSection({{actions: [{- permission: "product_variant:delete",+ permission: "products:manage",label: t("actions.delete"),onClick: handleDelete,icon: <Trash />,diff --git a/packages/vendor/src/pages/product-variants/product-variant-detail/components/variant-media-section/variant-media-section.tsx b/packages/vendor/src/pages/product-variants/product-variant-detail/components/variant-media-section/variant-media-section.tsxindex 501b850a8..f62a91878 100644--- a/packages/vendor/src/pages/product-variants/product-variant-detail/components/variant-media-section/variant-media-section.tsx+++ b/packages/vendor/src/pages/product-variants/product-variant-detail/components/variant-media-section/variant-media-section.tsx@@ -123,7 +123,7 @@ export const VariantMediaSection = ({{actions: [{- permission: "product_variant:update",+ permission: "products:edit",label: t("actions.edit"),to: "media",icon: <PencilSquare />,diff --git a/packages/vendor/src/pages/products/[id]/_components/product-general-section/product-general-section.tsx b/packages/vendor/src/pages/products/[id]/_components/product-general-section/product-general-section.tsxindex df5d540ef..4aa8da9e1 100644--- a/packages/vendor/src/pages/products/[id]/_components/product-general-section/product-general-section.tsx+++ b/packages/vendor/src/pages/products/[id]/_components/product-general-section/product-general-section.tsx@@ -91,7 +91,7 @@ export const ProductGeneralSection = ({{actions: [{- permission: "product:update",+ permission: "products:edit",label: t("actions.edit"),to: "edit",icon: <PencilSquare />,@@ -101,7 +101,7 @@ export const ProductGeneralSection = ({{actions: [{- permission: "product:delete",+ permission: "products:manage",label: t("actions.delete"),onClick: handleDelete,icon: <Trash />,diff --git a/packages/vendor/src/pages/products/[id]/_components/product-organization-section/product-organization-section.tsx b/packages/vendor/src/pages/products/[id]/_components/product-organization-section/product-organization-section.tsxindex 90ae668a8..1fe1ff9ef 100644--- a/packages/vendor/src/pages/products/[id]/_components/product-organization-section/product-organization-section.tsx+++ b/packages/vendor/src/pages/products/[id]/_components/product-organization-section/product-organization-section.tsx@@ -33,7 +33,7 @@ export const ProductOrganizationSection = ({{actions: [{- permission: "product:update",+ permission: "products:edit",label: t("actions.edit"),to: "organization",icon: <PencilSquare />,diff --git a/packages/vendor/src/pages/products/[id]/_components/product-sales-channel-section/product-sales-channel-section.tsx b/packages/vendor/src/pages/products/[id]/_components/product-sales-channel-section/product-sales-channel-section.tsxindex 59595220e..193b5b10d 100644--- a/packages/vendor/src/pages/products/[id]/_components/product-sales-channel-section/product-sales-channel-section.tsx+++ b/packages/vendor/src/pages/products/[id]/_components/product-sales-channel-section/product-sales-channel-section.tsx@@ -31,7 +31,7 @@ export const ProductSalesChannelSection = ({{actions: [{- permission: "product:update",+ permission: "products:edit",label: t("actions.edit"),to: "sales-channels",icon: <PencilSquare />,diff --git a/packages/vendor/src/pages/products/[id]/_components/product-shipping-profile-section/product-shipping-profile-section.tsx b/packages/vendor/src/pages/products/[id]/_components/product-shipping-profile-section/product-shipping-profile-section.tsxindex f40b62ca8..10988122f 100644--- a/packages/vendor/src/pages/products/[id]/_components/product-shipping-profile-section/product-shipping-profile-section.tsx+++ b/packages/vendor/src/pages/products/[id]/_components/product-shipping-profile-section/product-shipping-profile-section.tsx@@ -25,7 +25,7 @@ export const ProductShippingProfileSection = ({{actions: [{- permission: "product:update",+ permission: "products:edit",label: t("actions.edit"),to: "shipping-profile",icon: <PencilSquare />,diff --git a/packages/vendor/src/pages/products/[id]/_components/product-variant-section/product-variant-section.tsx b/packages/vendor/src/pages/products/[id]/_components/product-variant-section/product-variant-section.tsxindex 3d9fef2ae..790900fdb 100644--- a/packages/vendor/src/pages/products/[id]/_components/product-variant-section/product-variant-section.tsx+++ b/packages/vendor/src/pages/products/[id]/_components/product-variant-section/product-variant-section.tsx@@ -249,7 +249,7 @@ const useColumns = (product: HttpTypes.AdminProduct) => {actions: [{icon: <PencilSquare />,- permission: "product:update",+ permission: "products:edit",label: t("actions.edit"),onClick: () =>navigate(@@ -267,7 +267,7 @@ const useColumns = (product: HttpTypes.AdminProduct) => {actions: [{icon: <Trash />,- permission: "product:delete",+ permission: "products:manage",label: t("actions.delete"),onClick: () =>handleDelete(row.original.id, row.original.title ?? ""),diff --git a/packages/vendor/src/pages/products/_components/product-list-table/product-list-data-table.tsx b/packages/vendor/src/pages/products/_components/product-list-table/product-list-data-table.tsxindex 230eece9e..8576a1e51 100644--- a/packages/vendor/src/pages/products/_components/product-list-table/product-list-data-table.tsx+++ b/packages/vendor/src/pages/products/_components/product-list-table/product-list-data-table.tsx@@ -139,7 +139,7 @@ const ProductActions = ({ product }: { product: ExtendedAdminProduct }) => {actions: [{icon: <PencilSquare />,- permission: "product:update",+ permission: "products:edit",label: t("actions.edit"),to: `/products/${product.id}/edit`,},@@ -149,7 +149,7 @@ const ProductActions = ({ product }: { product: ExtendedAdminProduct }) => {actions: [{icon: <Trash />,- permission: "product:delete",+ permission: "products:manage",label: t("actions.delete"),onClick: handleDelete,},diff --git a/packages/vendor/src/pages/products/_components/product-list-table/product-list-header.tsx b/packages/vendor/src/pages/products/_components/product-list-table/product-list-header.tsxindex 4c945d05f..116c7dc77 100644--- a/packages/vendor/src/pages/products/_components/product-list-table/product-list-header.tsx+++ b/packages/vendor/src/pages/products/_components/product-list-table/product-list-header.tsx@@ -12,7 +12,7 @@ export const ProductListTitle = () => {export const ProductListCreateButton = () => {const { t } = useTranslation();return (- <PermissionGuard resource="product" operation="create">+ <PermissionGuard permission="products:edit"><Button size="small" variant="secondary" asChild><Link to="create">{t("actions.create")}</Link></Button>diff --git a/packages/vendor/src/pages/products/create/components/product-create-details-form/components/product-create-details-media-section/product-create-details-media-section.tsx b/packages/vendor/src/pages/products/create/components/product-create-details-form/components/product-create-details-media-section/product-create-details-media-section.tsxindex c182ce503..09cb4b57b 100644--- a/packages/vendor/src/pages/products/create/components/product-create-details-form/components/product-create-details-media-section/product-create-details-media-section.tsx+++ b/packages/vendor/src/pages/products/create/components/product-create-details-form/components/product-create-details-media-section/product-create-details-media-section.tsx@@ -245,7 +245,7 @@ const MediaItem = ({ field, onDelete, onMakeThumbnail }: MediaItemProps) => {actions: [{icon: <Trash />,- permission: "product:delete",+ permission: "products:manage",label: t("actions.delete"),onClick: onDelete,},diff --git a/packages/vendor/src/pages/promotions/[id]/_components/campaign-section/campaign-section.tsx b/packages/vendor/src/pages/promotions/[id]/_components/campaign-section/campaign-section.tsxindex 770fcb2b8..9a2585111 100644--- a/packages/vendor/src/pages/promotions/[id]/_components/campaign-section/campaign-section.tsx+++ b/packages/vendor/src/pages/promotions/[id]/_components/campaign-section/campaign-section.tsx@@ -65,7 +65,7 @@ export const CampaignSection = ({const actions: Action[] = [{- permission: "promotion:update",+ permission: "promotions:edit",label: t("actions.edit"),to: "add-to-campaign",icon: <PencilSquare />,diff --git a/packages/vendor/src/pages/promotions/[id]/_components/promotion-conditions-section/promotion-conditions-section.tsx b/packages/vendor/src/pages/promotions/[id]/_components/promotion-conditions-section/promotion-conditions-section.tsxindex fc8d33535..827225ecc 100644--- a/packages/vendor/src/pages/promotions/[id]/_components/promotion-conditions-section/promotion-conditions-section.tsx+++ b/packages/vendor/src/pages/promotions/[id]/_components/promotion-conditions-section/promotion-conditions-section.tsx@@ -74,7 +74,7 @@ export const PromotionConditionsSection = ({actions: [{icon: <PencilSquare />,- permission: "promotion:update",+ permission: "promotions:edit",label: t("actions.edit"),to: `${ruleType}/edit`,},diff --git a/packages/vendor/src/pages/promotions/[id]/_components/promotion-general-section/promotion-general-section.tsx b/packages/vendor/src/pages/promotions/[id]/_components/promotion-general-section/promotion-general-section.tsxindex 299077168..04e46cbc3 100644--- a/packages/vendor/src/pages/promotions/[id]/_components/promotion-general-section/promotion-general-section.tsx+++ b/packages/vendor/src/pages/promotions/[id]/_components/promotion-general-section/promotion-general-section.tsx@@ -129,7 +129,7 @@ export const PromotionGeneralSection = ({actions: [{icon: <PencilSquare />,- permission: "promotion:update",+ permission: "promotions:edit",label: t("actions.edit"),to: `/promotions/${promotion.id}/edit`,},@@ -139,7 +139,7 @@ export const PromotionGeneralSection = ({actions: [{icon: <Trash />,- permission: "promotion:delete",+ permission: "promotions:manage",label: t("actions.delete"),onClick: handleDelete,},diff --git a/packages/vendor/src/pages/promotions/_components/promotion-list-table/promotion-list-data-table.tsx b/packages/vendor/src/pages/promotions/_components/promotion-list-table/promotion-list-data-table.tsxindex ec23147f5..d88aaee5d 100644--- a/packages/vendor/src/pages/promotions/_components/promotion-list-table/promotion-list-data-table.tsx+++ b/packages/vendor/src/pages/promotions/_components/promotion-list-table/promotion-list-data-table.tsx@@ -144,13 +144,13 @@ const PromotionActions = ({actions: [{icon: <PencilSquare />,- permission: "promotion:update",+ permission: "promotions:edit",label: t("actions.edit"),to: `/promotions/${promotion.id}/edit`,},{icon: <Trash />,- permission: "promotion:delete",+ permission: "promotions:manage",label: t("actions.delete"),onClick: handleDelete,},diff --git a/packages/vendor/src/pages/promotions/_components/promotion-list-table/promotion-list-header.tsx b/packages/vendor/src/pages/promotions/_components/promotion-list-table/promotion-list-header.tsxindex 174dea9e0..a5956bff3 100644--- a/packages/vendor/src/pages/promotions/_components/promotion-list-table/promotion-list-header.tsx+++ b/packages/vendor/src/pages/promotions/_components/promotion-list-table/promotion-list-header.tsx@@ -12,7 +12,7 @@ export const PromotionListTitle = () => {export const PromotionListCreateButton = () => {const { t } = useTranslation();return (- <PermissionGuard resource="promotion" operation="create">+ <PermissionGuard permission="promotions:edit"><Button size="small" variant="secondary" asChild><Link to="create">{t("actions.create")}</Link></Button>diff --git a/packages/vendor/src/pages/reservations/[id]/_components/reservation-general-section/reservation-general-section.tsx b/packages/vendor/src/pages/reservations/[id]/_components/reservation-general-section/reservation-general-section.tsxindex 3c14f4a4e..1dfbedbb2 100644--- a/packages/vendor/src/pages/reservations/[id]/_components/reservation-general-section/reservation-general-section.tsx+++ b/packages/vendor/src/pages/reservations/[id]/_components/reservation-general-section/reservation-general-section.tsx@@ -48,7 +48,7 @@ export const ReservationGeneralSection = ({actions: [{icon: <PencilSquare />,- permission: "reservation_item:update",+ permission: "reservations:edit",label: t("actions.edit"),to: `edit`,},diff --git a/packages/vendor/src/pages/reservations/_components/reservation-list-table/reservation-actions.tsx b/packages/vendor/src/pages/reservations/_components/reservation-list-table/reservation-actions.tsxindex ad55125ca..048aa9f34 100644--- a/packages/vendor/src/pages/reservations/_components/reservation-list-table/reservation-actions.tsx+++ b/packages/vendor/src/pages/reservations/_components/reservation-list-table/reservation-actions.tsx@@ -78,7 +78,7 @@ export const ReservationActions = ({{actions: [{- permission: "reservation_item:update",+ permission: "reservations:edit",label: t("actions.edit"),onClick: handleEdit,icon: <PencilSquare />,@@ -88,7 +88,7 @@ export const ReservationActions = ({{actions: [{- permission: "reservation_item:delete",+ permission: "reservations:manage",label: t("actions.delete"),onClick: handleDelete,icon: <Trash />,diff --git a/packages/vendor/src/pages/reservations/_components/reservation-list-table/reservation-list-table.tsx b/packages/vendor/src/pages/reservations/_components/reservation-list-table/reservation-list-table.tsxindex 5d31c5c83..ff5d87a86 100644--- a/packages/vendor/src/pages/reservations/_components/reservation-list-table/reservation-list-table.tsx+++ b/packages/vendor/src/pages/reservations/_components/reservation-list-table/reservation-list-table.tsx@@ -81,7 +81,7 @@ export const ReservationListTable = () => {{t("reservations.subtitle")}</Text></div>- <PermissionGuard resource="reservation_item" operation="create">+ <PermissionGuard permission="reservations:edit"><Button variant="secondary" size="small" asChild><Link to="create">{t("actions.create")}</Link></Button>diff --git a/packages/vendor/src/pages/settings/locations/[location_id]/_components/location-fulfillment-providers-section.tsx b/packages/vendor/src/pages/settings/locations/[location_id]/_components/location-fulfillment-providers-section.tsxindex 0bb1b547c..6a98ef072 100644--- a/packages/vendor/src/pages/settings/locations/[location_id]/_components/location-fulfillment-providers-section.tsx+++ b/packages/vendor/src/pages/settings/locations/[location_id]/_components/location-fulfillment-providers-section.tsx@@ -28,7 +28,7 @@ function LocationsFulfillmentProvidersSection({{actions: [{- permission: "stock_location:update",+ permission: "stock_locations:edit",label: t("actions.edit"),to: "fulfillment-providers",icon: <PencilSquare />,diff --git a/packages/vendor/src/pages/settings/locations/[location_id]/_components/location-general-section.tsx b/packages/vendor/src/pages/settings/locations/[location_id]/_components/location-general-section.tsxindex b03a006a0..a2b8193d2 100644--- a/packages/vendor/src/pages/settings/locations/[location_id]/_components/location-general-section.tsx+++ b/packages/vendor/src/pages/settings/locations/[location_id]/_components/location-general-section.tsx@@ -171,7 +171,7 @@ function ShippingOption({{actions: [{- permission: "stock_location:delete",+ permission: "stock_locations:manage",label: t("actions.delete"),icon: <Trash />,onClick: handleDelete,@@ -400,7 +400,7 @@ function ServiceZone({{actions: [{- permission: "stock_location:update",+ permission: "stock_locations:edit",label: t("actions.edit"),icon: <PencilSquare />,to: `/settings/locations/${locationId}/fulfillment-set/${fulfillmentSetId}/service-zone/${zone.id}/edit`,@@ -415,7 +415,7 @@ function ServiceZone({{actions: [{- permission: "stock_location:delete",+ permission: "stock_locations:manage",label: t("actions.delete"),icon: <Trash />,onClick: handleDelete,@@ -631,7 +631,7 @@ const Actions = ({ location }: { location: VendorExtendedAdminStockLocation }) =actions: [{icon: <PencilSquare />,- permission: "stock_location:update",+ permission: "stock_locations:edit",label: t("actions.edit"),to: `edit`,},@@ -646,7 +646,7 @@ const Actions = ({ location }: { location: VendorExtendedAdminStockLocation }) =actions: [{icon: <Trash />,- permission: "stock_location:delete",+ permission: "stock_locations:manage",label: t("actions.delete"),onClick: handleDelete,},diff --git a/packages/vendor/src/pages/settings/locations/[location_id]/_components/locations-sales-channels-section.tsx b/packages/vendor/src/pages/settings/locations/[location_id]/_components/locations-sales-channels-section.tsxindex b24aa6634..93cb110f5 100644--- a/packages/vendor/src/pages/settings/locations/[location_id]/_components/locations-sales-channels-section.tsx+++ b/packages/vendor/src/pages/settings/locations/[location_id]/_components/locations-sales-channels-section.tsx@@ -30,7 +30,7 @@ function LocationsSalesChannelsSection({{actions: [{- permission: "stock_location:update",+ permission: "stock_locations:edit",label: t("actions.edit"),to: "sales-channels",icon: <PencilSquare />,diff --git a/packages/vendor/src/pages/settings/locations/_components/location-list-header.tsx b/packages/vendor/src/pages/settings/locations/_components/location-list-header.tsxindex 444e2a422..60baa5462 100644--- a/packages/vendor/src/pages/settings/locations/_components/location-list-header.tsx+++ b/packages/vendor/src/pages/settings/locations/_components/location-list-header.tsx@@ -14,7 +14,7 @@ export const LocationListHeader = () => {{t("stockLocations.list.description")}</Text></div>- <PermissionGuard resource="stock_location" operation="create">+ <PermissionGuard permission="stock_locations:edit"><Button size="small" className="shrink-0" variant="secondary" asChild><Link to="create">{t("actions.create")}</Link></Button>diff --git a/packages/vendor/src/pages/settings/locations/_components/location-list-item.tsx b/packages/vendor/src/pages/settings/locations/_components/location-list-item.tsxindex 65f6be0c6..14462b74a 100644--- a/packages/vendor/src/pages/settings/locations/_components/location-list-item.tsx+++ b/packages/vendor/src/pages/settings/locations/_components/location-list-item.tsx@@ -150,7 +150,7 @@ function LocationListItem(props: LocationProps) {{actions: [{- permission: "stock_location:update",+ permission: "stock_locations:edit",label: t("actions.edit"),icon: <PencilSquare />,to: `/settings/locations/${location.id}/edit`,@@ -160,7 +160,7 @@ function LocationListItem(props: LocationProps) {{actions: [{- permission: "stock_location:delete",+ permission: "stock_locations:manage",label: t("actions.delete"),icon: <Trash />,onClick: handleDelete,diff --git a/packages/vendor/src/pages/settings/product-tags/[id]/_components/product-tag-general-section.tsx b/packages/vendor/src/pages/settings/product-tags/[id]/_components/product-tag-general-section.tsxindex ea1daeab4..91e771084 100644--- a/packages/vendor/src/pages/settings/product-tags/[id]/_components/product-tag-general-section.tsx+++ b/packages/vendor/src/pages/settings/product-tags/[id]/_components/product-tag-general-section.tsx@@ -27,7 +27,7 @@ export const ProductTagGeneralSection = ({actions: [{icon: <PencilSquare />,- permission: "product_tag:update",+ permission: "product_tags:edit",label: t("actions.edit"),to: "edit",},@@ -37,7 +37,7 @@ export const ProductTagGeneralSection = ({actions: [{icon: <Trash />,- permission: "product_tag:delete",+ permission: "product_tags:manage",label: t("actions.delete"),onClick: handleDelete,},diff --git a/packages/vendor/src/pages/settings/product-types/[id]/_components/product-type-general-section.tsx b/packages/vendor/src/pages/settings/product-types/[id]/_components/product-type-general-section.tsxindex f45975f73..4bb0476ba 100644--- a/packages/vendor/src/pages/settings/product-types/[id]/_components/product-type-general-section.tsx+++ b/packages/vendor/src/pages/settings/product-types/[id]/_components/product-type-general-section.tsx@@ -23,7 +23,7 @@ export const ProductTypeGeneralSection = ({{actions: [{- permission: "product_type:update",+ permission: "product_types:edit",label: t("actions.edit"),icon: <PencilSquare />,to: "edit",@@ -33,7 +33,7 @@ export const ProductTypeGeneralSection = ({{actions: [{- permission: "product_type:delete",+ permission: "product_types:manage",label: t("actions.delete"),icon: <Trash />,onClick: handleDelete,diff --git a/packages/vendor/src/pages/settings/regions/[id]/_components/region-general-section.tsx b/packages/vendor/src/pages/settings/regions/[id]/_components/region-general-section.tsxindex 94d67cd7e..77286d013 100644--- a/packages/vendor/src/pages/settings/regions/[id]/_components/region-general-section.tsx+++ b/packages/vendor/src/pages/settings/regions/[id]/_components/region-general-section.tsx@@ -118,7 +118,7 @@ const RegionActions = ({ region }: { region: HttpTypes.AdminRegion }) => {actions: [{icon: <PencilSquare />,- permission: "region:update",+ permission: "regions:edit",label: t("actions.edit"),to: `/settings/regions/${region.id}/edit`,},@@ -128,7 +128,7 @@ const RegionActions = ({ region }: { region: HttpTypes.AdminRegion }) => {actions: [{icon: <Trash />,- permission: "region:delete",+ permission: "regions:manage",label: t("actions.delete"),onClick: handleDelete,},diff --git a/packages/vendor/src/pages/settings/regions/_components/region-list-table.tsx b/packages/vendor/src/pages/settings/regions/_components/region-list-table.tsxindex a46faf23d..5eecac989 100644--- a/packages/vendor/src/pages/settings/regions/_components/region-list-table.tsx+++ b/packages/vendor/src/pages/settings/regions/_components/region-list-table.tsx@@ -138,7 +138,7 @@ const RegionActions = ({ region }: { region: HttpTypes.AdminRegion }) => {{actions: [{- permission: "region:update",+ permission: "regions:edit",label: t("actions.edit"),to: `/settings/regions/${region.id}/edit`,icon: <PencilSquare />,@@ -148,7 +148,7 @@ const RegionActions = ({ region }: { region: HttpTypes.AdminRegion }) => {{actions: [{- permission: "region:delete",+ permission: "regions:manage",label: t("actions.delete"),onClick: handleDelete,icon: <Trash />,diff --git a/packages/vendor/src/pages/settings/return-reasons/_components/return-reason-list-table.tsx b/packages/vendor/src/pages/settings/return-reasons/_components/return-reason-list-table.tsxindex db3bee100..252a04649 100644--- a/packages/vendor/src/pages/settings/return-reasons/_components/return-reason-list-table.tsx+++ b/packages/vendor/src/pages/settings/return-reasons/_components/return-reason-list-table.tsx@@ -54,7 +54,7 @@ export const ReturnReasonListTable = () => {{t("returnReasons.subtitle")}</Text></div>- <PermissionGuard resource="return_reason" operation="create">+ <PermissionGuard permission="return_reasons:edit"><Button variant="secondary" size="small" asChild><Link to="create">{t("actions.create")}</Link></Button>@@ -92,7 +92,7 @@ const ReturnReasonRowActions = ({actions: [{icon: <PencilSquare />,- permission: "return_reason:update",+ permission: "return_reasons:edit",label: t("actions.edit"),to: `${returnReason.id}/edit`,},@@ -102,7 +102,7 @@ const ReturnReasonRowActions = ({actions: [{icon: <Trash />,- permission: "return_reason:delete",+ permission: "return_reasons:manage",label: t("actions.delete"),onClick: handleDelete,},diff --git a/packages/vendor/src/pages/settings/store/_components/store-address-section.tsx b/packages/vendor/src/pages/settings/store/_components/store-address-section.tsxindex 258ed8d7b..545b46bec 100644--- a/packages/vendor/src/pages/settings/store/_components/store-address-section.tsx+++ b/packages/vendor/src/pages/settings/store/_components/store-address-section.tsx@@ -36,7 +36,7 @@ export const StoreAddressSection = ({ seller }: StoreAddressSectionProps) => {{actions: [{- permission: "seller:update",+ permission: "store:edit",label: t("actions.edit"),icon: <PencilSquare />,to: "address",diff --git a/packages/vendor/src/pages/settings/store/_components/store-configuration-section.tsx b/packages/vendor/src/pages/settings/store/_components/store-configuration-section.tsxindex cffecb28a..65836fb6d 100644--- a/packages/vendor/src/pages/settings/store/_components/store-configuration-section.tsx+++ b/packages/vendor/src/pages/settings/store/_components/store-configuration-section.tsx@@ -26,7 +26,7 @@ export const StoreConfigurationSection = ({{actions: [{- permission: "seller:update",+ permission: "store:edit",label: t("actions.edit"),icon: <PencilSquare />,to: "store-closure",diff --git a/packages/vendor/src/pages/settings/store/_components/store-detail-header.tsx b/packages/vendor/src/pages/settings/store/_components/store-detail-header.tsxindex d0698f9e8..feaf933c0 100644--- a/packages/vendor/src/pages/settings/store/_components/store-detail-header.tsx+++ b/packages/vendor/src/pages/settings/store/_components/store-detail-header.tsx@@ -75,7 +75,7 @@ export const StoreDetailEditButton = () => {actions: [{icon: <PencilSquare />,- permission: "seller:update",+ permission: "store:edit",label: t("actions.edit"),to: "edit",},diff --git a/packages/vendor/src/pages/settings/store/_components/store-payment-details-section.tsx b/packages/vendor/src/pages/settings/store/_components/store-payment-details-section.tsxindex 061a726ac..e5a354518 100644--- a/packages/vendor/src/pages/settings/store/_components/store-payment-details-section.tsx+++ b/packages/vendor/src/pages/settings/store/_components/store-payment-details-section.tsx@@ -36,7 +36,7 @@ export const StorePaymentDetailsSection = ({{actions: [{- permission: "seller:update",+ permission: "store:edit",label: t("actions.edit"),icon: <PencilSquare />,to: "payment-details",diff --git a/packages/vendor/src/pages/settings/store/_components/store-professional-details-section.tsx b/packages/vendor/src/pages/settings/store/_components/store-professional-details-section.tsxindex ae5936680..dd260e3ee 100644--- a/packages/vendor/src/pages/settings/store/_components/store-professional-details-section.tsx+++ b/packages/vendor/src/pages/settings/store/_components/store-professional-details-section.tsx@@ -29,7 +29,7 @@ export const StoreProfessionalDetailsSection = ({{actions: [{- permission: "seller:update",+ permission: "store:edit",label: t("actions.edit"),icon: <PencilSquare />,to: "professional-details",diff --git a/packages/vendor/src/pages/settings/tax-regions/_common/components/tax-override-card.tsx b/packages/vendor/src/pages/settings/tax-regions/_common/components/tax-override-card.tsxindex e42186991..33d9314ed 100644--- a/packages/vendor/src/pages/settings/tax-regions/_common/components/tax-override-card.tsx+++ b/packages/vendor/src/pages/settings/tax-regions/_common/components/tax-override-card.tsx@@ -97,7 +97,7 @@ export const TaxOverrideCard = ({ taxRate }: TaxOverrideCardProps) => {{actions: [{- permission: "tax_region:update",+ permission: "tax_regions:edit",label: t("actions.edit"),icon: <PencilSquare />,to: `overrides/${taxRate.id}/edit`,@@ -107,7 +107,7 @@ export const TaxOverrideCard = ({ taxRate }: TaxOverrideCardProps) => {{actions: [{- permission: "tax_region:delete",+ permission: "tax_regions:manage",label: t("actions.delete"),icon: <Trash />,onClick: handleDelete,diff --git a/packages/vendor/src/pages/settings/tax-regions/_common/components/tax-rate-line.tsx b/packages/vendor/src/pages/settings/tax-regions/_common/components/tax-rate-line.tsxindex 51cf5842b..5f7e0204b 100644--- a/packages/vendor/src/pages/settings/tax-regions/_common/components/tax-rate-line.tsx+++ b/packages/vendor/src/pages/settings/tax-regions/_common/components/tax-rate-line.tsx@@ -61,7 +61,7 @@ const TaxRateActions = ({ taxRate }: { taxRate: HttpTypes.AdminTaxRate }) => {{actions: [{- permission: "tax_region:update",+ permission: "tax_regions:edit",label: t("actions.edit"),icon: <PencilSquare />,to: `tax-rates/${taxRate.id}/edit`,@@ -71,7 +71,7 @@ const TaxRateActions = ({ taxRate }: { taxRate: HttpTypes.AdminTaxRate }) => {{actions: [{- permission: "tax_region:delete",+ permission: "tax_regions:manage",label: t("actions.delete"),icon: <Trash />,onClick: handleDelete,diff --git a/packages/vendor/src/pages/settings/tax-regions/_common/components/tax-region-card.tsx b/packages/vendor/src/pages/settings/tax-regions/_common/components/tax-region-card.tsxindex 5330285e0..94e515564 100644--- a/packages/vendor/src/pages/settings/tax-regions/_common/components/tax-region-card.tsx+++ b/packages/vendor/src/pages/settings/tax-regions/_common/components/tax-region-card.tsx@@ -189,7 +189,7 @@ const TaxRegionCardActions = ({actions: [{icon: <Trash />,- permission: "tax_region:delete",+ permission: "tax_regions:manage",label: t("actions.delete"),onClick: handleDelete,},