chore(rbac): user link and utils

CONTRIBUTING.md

@@ -83,6 +83,7 @@ The code snippets in this section assume that your forked Medusa project and the
     "@medusajs/pricing": "file:../medusa/packages/modules/pricing",
     "@medusajs/product": "file:../medusa/packages/modules/product",
     "@medusajs/promotion": "file:../medusa/packages/modules/promotion",
+    "@medusajs/rbac": "file:../medusa/packages/modules/rbac",
     "@medusajs/region": "file:../medusa/packages/modules/region",
     "@medusajs/sales-channel": "file:../medusa/packages/modules/sales-channel",
     "@medusajs/stock-location": "file:../medusa/packages/modules/stock-location",

integration-tests/http/__tests__/rbac/admin/rbac-policies.spec.ts

@@ -6,6 +6,8 @@ import {
 
 jest.setTimeout(60000)
 
+process.env.MEDUSA_FF_RBAC = "true"
+
 medusaIntegrationTestRunner({
   testSuite: ({ dbConnection, api, getContainer }) => {
     let container
@@ -15,6 +17,10 @@ medusaIntegrationTestRunner({
       await createAdminUser(dbConnection, adminHeaders, container)
     })
 
+    afterAll(async () => {
+      delete process.env.MEDUSA_FF_RBAC
+    })
+
     describe("RBAC Policies - Admin API", () => {
       describe("POST /admin/rbac/policies", () => {
         it("should create a policy", async () => {

integration-tests/http/__tests__/rbac/admin/rbac-roles.spec.ts

@@ -6,6 +6,8 @@ import {
 
 jest.setTimeout(60000)
 
+process.env.MEDUSA_FF_RBAC = "true"
+
 medusaIntegrationTestRunner({
   testSuite: ({ dbConnection, api, getContainer }) => {
     let container
@@ -15,6 +17,10 @@ medusaIntegrationTestRunner({
       await createAdminUser(dbConnection, adminHeaders, container)
     })
 
+    afterAll(async () => {
+      delete process.env.MEDUSA_FF_RBAC
+    })
+
     describe("RBAC Roles - Admin API", () => {
       describe("POST /admin/rbac/roles", () => {
         it("should create a role", async () => {
@@ -292,7 +298,7 @@ medusaIntegrationTestRunner({
             "/admin/rbac/role-policies",
             {
               role_id: viewerRole.id,
-              scope_id: policies[0].id,
+              policy_id: policies[0].id,
             },
             adminHeaders
           )
@@ -301,7 +307,7 @@ medusaIntegrationTestRunner({
           expect(response.data.role_policy).toEqual(
             expect.objectContaining({
               role_id: viewerRole.id,
-              scope_id: policies[0].id,
+              policy_id: policies[0].id,
             })
           )
         })
@@ -311,7 +317,7 @@ medusaIntegrationTestRunner({
             "/admin/rbac/role-policies",
             {
               role_id: viewerRole.id,
-              scope_id: policies[0].id,
+              policy_id: policies[0].id,
             },
             adminHeaders
           )
@@ -320,7 +326,7 @@ medusaIntegrationTestRunner({
             "/admin/rbac/role-policies",
             {
               role_id: viewerRole.id,
-              scope_id: policies[1].id,
+              policy_id: policies[1].id,
             },
             adminHeaders
           )
@@ -336,11 +342,11 @@ medusaIntegrationTestRunner({
             expect.arrayContaining([
               expect.objectContaining({
                 role_id: viewerRole.id,
-                scope_id: policies[0].id,
+                policy_id: policies[0].id,
               }),
               expect.objectContaining({
                 role_id: viewerRole.id,
-                scope_id: policies[1].id,
+                policy_id: policies[1].id,
               }),
             ])
           )
@@ -351,7 +357,7 @@ medusaIntegrationTestRunner({
             "/admin/rbac/role-policies",
             {
               role_id: editorRole.id,
-              scope_id: policies[2].id,
+              policy_id: policies[2].id,
             },
             adminHeaders
           )

integration-tests/http/medusa-config.js

@@ -68,6 +68,7 @@ const modules = {
   },
   [Modules.RBAC]: {
     resolve: "@medusajs/rbac",
+    disable: process.env.MEDUSA_FF_RBAC !== "true",
   },
 }
 
@@ -89,6 +90,7 @@ module.exports = defineConfig({
   featureFlags: {
     index_engine: process.env.ENABLE_INDEX_MODULE === "true",
     translation: process.env.MEDUSA_FF_TRANSLATION === "true",
+    rbac: process.env.MEDUSA_FF_RBAC === "true",
   },
   modules,
 })