@strapi/admin 5.56.0 → 5.58.0

package/dist/server/server/src/services/permission/queries.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var fp = require('lodash/fp');
+var _ = require('lodash');
 var pmap = require('p-map');
 var index = require('../../utils/index.js');
 var index$1 = require('../../domain/permission/index.js');
@@ -24,7 +24,7 @@ var pmap__default = /*#__PURE__*/_interopDefault(pmap);
         }
     });
     if (permissionsToDelete.length > 0) {
-        await deleteByIds(permissionsToDelete.map(fp.prop('id')));
+        await deleteByIds(permissionsToDelete.map((permission)=>permission?.id));
     }
 };
 /**
@@ -105,13 +105,13 @@ const filterPermissionsToRemove = async (permissions)=>{
         const { applyToProperties } = options;
         const invalidProperties = await Promise.all((applyToProperties || []).map(async (property)=>{
             const applies = await actionProvider.appliesToProperty(property, permission.action, permission.subject);
-            return applies && fp.isNil(index$1.default.getProperty(property, permission));
+            return applies && index$1.default.getProperty(property, permission) == null;
         }));
         const isRegisteredAction = actionProvider.has(permission.action);
-        const hasInvalidProperties = fp.isArray(applyToProperties) && invalidProperties.every(fp.eq(true));
-        const isInvalidSubject = fp.isArray(subjects) && !subjects.includes(permission.subject);
+        const hasInvalidProperties = Array.isArray(applyToProperties) && invalidProperties.every((result)=>result === true);
+        const isInvalidSubject = Array.isArray(subjects) && !subjects.includes(permission.subject);
         // On an api token permission, nil properties mean "everything", not "invalid"
-        const hasApiToken = !fp.isNil(fp.prop('apiToken', permission));
+        const hasApiToken = _.get(permission, 'apiToken') != null;
         // If the permission has an invalid action, an invalid subject or invalid properties, then add it to the toBeRemoved collection
         if (!isRegisteredAction || isInvalidSubject || hasInvalidProperties && !hasApiToken) {
             permissionsToRemove.push(permission);
@@ -148,9 +148,9 @@ const filterPermissionsToRemove = async (permissions)=>{
         const remainingPermissions = permissions.filter((permission)=>!permissionsIdToRemove.includes(permission.id));
         const permissionsWithCleanFields = contentTypeService.cleanPermissionFields(remainingPermissions);
         // Update only the ones that need to be updated
-        const permissionsNeedingToBeUpdated = fp.differenceWith((a, b)=>{
-            return a.id === b.id && fp.xor(a.properties.fields, b.properties.fields).length === 0;
-        }, permissionsWithCleanFields, remainingPermissions);
+        const permissionsNeedingToBeUpdated = _.differenceWith(permissionsWithCleanFields, remainingPermissions, (a, b)=>{
+            return a.id === b.id && _.xor(b.properties.fields, a.properties.fields).length === 0;
+        });
         const updatePromiseProvider = (permission)=>{
             return update({
                 id: permission.id

package/dist/server/server/src/services/permission/queries.js.map

@@ -1 +1 @@
-{"version":3,"file":"queries.js","sources":["../../../../../../server/src/services/permission/queries.ts"],"sourcesContent":["import { isNil, isArray, prop, xor, eq, differenceWith } from 'lodash/fp';\nimport pmap from 'p-map';\nimport type { Data } from '@strapi/types';\nimport { getService } from '../../utils';\nimport permissionDomain, { CreatePermissionPayload } from '../../domain/permission';\nimport type { AdminUser, Permission } from '../../../../shared/contracts/shared';\nimport { Action } from '../../domain/action';\n\n/**\n * Delete permissions of roles in database\n * @param rolesIds ids of roles\n */\nexport const deleteByRolesIds = async (rolesIds: Data.ID[]): Promise<void> => {\n  const permissionsToDelete = await strapi.db.query('admin::permission').findMany({\n    select: ['id'],\n    where: {\n      role: { id: rolesIds },\n    },\n  });\n\n  if (permissionsToDelete.length > 0) {\n    await deleteByIds(permissionsToDelete.map(prop('id')));\n  }\n};\n\n/**\n * Delete permissions\n * @param ids ids of permissions\n */\nexport const deleteByIds = async (ids: Data.ID[]): Promise<void> => {\n  const result: unknown[] = [];\n  for (const id of ids) {\n    const queryResult = await strapi.db.query('admin::permission').delete({ where: { id } });\n    result.push(queryResult);\n  }\n  strapi.eventHub.emit('permission.delete', { permissions: result });\n};\n\n/**\n * Create many permissions\n * @param permissions\n */\nexport const createMany = async (permissions: CreatePermissionPayload[]): Promise<Permission[]> => {\n  const createdPermissions: CreatePermissionPayload[] = [];\n  for (const permission of permissions) {\n    const newPerm = await strapi.db.query('admin::permission').create({ data: permission });\n    createdPermissions.push(newPerm);\n  }\n\n  const permissionsToReturn = permissionDomain.toPermission(createdPermissions);\n  strapi.eventHub.emit('permission.create', { permissions: permissionsToReturn });\n\n  return permissionsToReturn;\n};\n\n/**\n * Update a permission\n * @param params\n * @param attributes\n */\nconst update = async (params: unknown, attributes: Partial<Permission>) => {\n  const updatedPermission = (await strapi.db\n    .query('admin::permission')\n    .update({ where: params, data: attributes })) as Permission;\n\n  const permissionToReturn = permissionDomain.toPermission(updatedPermission);\n  strapi.eventHub.emit('permission.update', { permissions: permissionToReturn });\n\n  return permissionToReturn;\n};\n\n/**\n * Find assigned permissions in the database\n * @param params query params to find the permissions\n */\nexport const findMany = async (params = {}): Promise<Permission[]> => {\n  const rawPermissions = await strapi.db.query('admin::permission').findMany(params);\n\n  return permissionDomain.toPermission(rawPermissions);\n};\n\n/**\n * Find all permissions for a user\n * @param user - user\n */\nexport const findUserPermissions = async (user: AdminUser): Promise<Permission[]> => {\n  return findMany({ where: { role: { users: { id: user.id } } } });\n};\n\nconst filterPermissionsToRemove = async (permissions: Permission[]) => {\n  const { actionProvider } = getService('permission');\n\n  const permissionsToRemove: Permission[] = [];\n\n  for (const permission of permissions) {\n    const { subjects, options = {} as Action['options'] } =\n      (actionProvider.get(permission.action) as Action) || {};\n    const { applyToProperties } = options;\n\n    const invalidProperties = await Promise.all(\n      (applyToProperties || []).map(async (property) => {\n        const applies = await actionProvider.appliesToProperty(\n          property,\n          permission.action,\n          permission.subject\n        );\n\n        return applies && isNil(permissionDomain.getProperty(property, permission));\n      })\n    );\n\n    const isRegisteredAction = actionProvider.has(permission.action);\n    const hasInvalidProperties = isArray(applyToProperties) && invalidProperties.every(eq(true));\n    const isInvalidSubject = isArray(subjects) && !subjects.includes(permission.subject as string);\n    // On an api token permission, nil properties mean \"everything\", not \"invalid\"\n    const hasApiToken = !isNil(prop('apiToken', permission));\n\n    // If the permission has an invalid action, an invalid subject or invalid properties, then add it to the toBeRemoved collection\n    if (!isRegisteredAction || isInvalidSubject || (hasInvalidProperties && !hasApiToken)) {\n      permissionsToRemove.push(permission);\n    }\n  }\n\n  return permissionsToRemove;\n};\n\n/**\n * Removes permissions in database that don't exist anymore\n */\nexport const cleanPermissionsInDatabase = async (): Promise<void> => {\n  const pageSize = 200;\n\n  const contentTypeService = getService('content-type');\n\n  const total = await strapi.db.query('admin::permission').count();\n  const pageCount = Math.ceil(total / pageSize);\n\n  for (let page = 0; page < pageCount; page += 1) {\n    // 1. Find invalid permissions and collect their ID to delete them later\n    const results = (await strapi.db.query('admin::permission').findMany({\n      limit: pageSize,\n      offset: page * pageSize,\n      populate: ['role', 'apiToken'],\n    })) as Permission[];\n\n    const permissions = permissionDomain.toPermission(results);\n    const permissionsToRemove = await filterPermissionsToRemove(permissions);\n\n    // Also remove orphaned permissions (no role AND no apiToken)\n    const orphanedPermissions = permissions.filter(\n      (permission: any) => !permission.role && !permission.apiToken\n    );\n\n    const permissionsIdToRemove = Array.from(\n      new Set([...permissionsToRemove, ...orphanedPermissions].map((p) => p.id))\n    );\n\n    // 2. Clean permissions' fields (add required ones, remove the non-existing ones)\n    const remainingPermissions = permissions.filter(\n      (permission: Permission) => !permissionsIdToRemove.includes(permission.id)\n    );\n\n    const permissionsWithCleanFields = contentTypeService.cleanPermissionFields(\n      remainingPermissions\n    ) as Permission[];\n\n    // Update only the ones that need to be updated\n    const permissionsNeedingToBeUpdated = differenceWith(\n      (a: Permission, b: Permission) => {\n        return a.id === b.id && xor(a.properties.fields, b.properties.fields).length === 0;\n      },\n      permissionsWithCleanFields,\n      remainingPermissions\n    );\n\n    const updatePromiseProvider = (permission: Permission) => {\n      return update({ id: permission.id }, permission);\n    };\n\n    // Execute all the queries, update the database\n    await Promise.all([\n      deleteByIds(permissionsIdToRemove),\n      pmap(permissionsNeedingToBeUpdated, updatePromiseProvider, {\n        concurrency: 100,\n        stopOnError: true,\n      }),\n    ]);\n  }\n};\n\nexport default {\n  createMany,\n  findMany,\n  deleteByRolesIds,\n  deleteByIds,\n  findUserPermissions,\n  cleanPermissionsInDatabase,\n};\n"],"names":["deleteByRolesIds","rolesIds","permissionsToDelete","strapi","db","query","findMany","select","where","role","id","length","deleteByIds","map","prop","ids","result","queryResult","delete","push","eventHub","emit","permissions","createMany","createdPermissions","permission","newPerm","create","data","permissionsToReturn","permissionDomain","toPermission","update","params","attributes","updatedPermission","permissionToReturn","rawPermissions","findUserPermissions","user","users","filterPermissionsToRemove","actionProvider","getService","permissionsToRemove","subjects","options","get","action","applyToProperties","invalidProperties","Promise","all","property","applies","appliesToProperty","subject","isNil","getProperty","isRegisteredAction","has","hasInvalidProperties","isArray","every","eq","isInvalidSubject","includes","hasApiToken","cleanPermissionsInDatabase","pageSize","contentTypeService","total","count","pageCount","Math","ceil","page","results","limit","offset","populate","orphanedPermissions","filter","apiToken","permissionsIdToRemove","Array","from","Set","p","remainingPermissions","permissionsWithCleanFields","cleanPermissionFields","permissionsNeedingToBeUpdated","differenceWith","a","b","xor","properties","fields","updatePromiseProvider","pmap","concurrency","stopOnError"],"mappings":";;;;;;;;;;;AAQA;;;IAIO,MAAMA,gBAAAA,GAAmB,OAAOC,QAAAA,GAAAA;IACrC,MAAMC,mBAAAA,GAAsB,MAAMC,MAAAA,CAAOC,EAAE,CAACC,KAAK,CAAC,mBAAA,CAAA,CAAqBC,QAAQ,CAAC;QAC9EC,MAAAA,EAAQ;AAAC,YAAA;AAAK,SAAA;QACdC,KAAAA,EAAO;YACLC,IAAAA,EAAM;gBAAEC,EAAAA,EAAIT;AAAS;AACvB;AACF,KAAA,CAAA;IAEA,IAAIC,mBAAAA,CAAoBS,MAAM,GAAG,CAAA,EAAG;AAClC,QAAA,MAAMC,WAAAA,CAAYV,mBAAAA,CAAoBW,GAAG,CAACC,OAAAA,CAAK,IAAA,CAAA,CAAA,CAAA;AACjD,IAAA;AACF;AAEA;;;IAIO,MAAMF,WAAAA,GAAc,OAAOG,GAAAA,GAAAA;AAChC,IAAA,MAAMC,SAAoB,EAAE;IAC5B,KAAK,MAAMN,MAAMK,GAAAA,CAAK;QACpB,MAAME,WAAAA,GAAc,MAAMd,MAAAA,CAAOC,EAAE,CAACC,KAAK,CAAC,mBAAA,CAAA,CAAqBa,MAAM,CAAC;YAAEV,KAAAA,EAAO;AAAEE,gBAAAA;AAAG;AAAE,SAAA,CAAA;AACtFM,QAAAA,MAAAA,CAAOG,IAAI,CAACF,WAAAA,CAAAA;AACd,IAAA;AACAd,IAAAA,MAAAA,CAAOiB,QAAQ,CAACC,IAAI,CAAC,mBAAA,EAAqB;QAAEC,WAAAA,EAAaN;AAAO,KAAA,CAAA;AAClE;AAEA;;;IAIO,MAAMO,UAAAA,GAAa,OAAOD,WAAAA,GAAAA;AAC/B,IAAA,MAAME,qBAAgD,EAAE;IACxD,KAAK,MAAMC,cAAcH,WAAAA,CAAa;QACpC,MAAMI,OAAAA,GAAU,MAAMvB,MAAAA,CAAOC,EAAE,CAACC,KAAK,CAAC,mBAAA,CAAA,CAAqBsB,MAAM,CAAC;YAAEC,IAAAA,EAAMH;AAAW,SAAA,CAAA;AACrFD,QAAAA,kBAAAA,CAAmBL,IAAI,CAACO,OAAAA,CAAAA;AAC1B,IAAA;IAEA,MAAMG,mBAAAA,GAAsBC,eAAAA,CAAiBC,YAAY,CAACP,kBAAAA,CAAAA;AAC1DrB,IAAAA,MAAAA,CAAOiB,QAAQ,CAACC,IAAI,CAAC,mBAAA,EAAqB;QAAEC,WAAAA,EAAaO;AAAoB,KAAA,CAAA;IAE7E,OAAOA,mBAAAA;AACT;AAEA;;;;IAKA,MAAMG,MAAAA,GAAS,OAAOC,MAAAA,EAAiBC,UAAAA,GAAAA;IACrC,MAAMC,iBAAAA,GAAqB,MAAMhC,MAAAA,CAAOC,EAAE,CACvCC,KAAK,CAAC,mBAAA,CAAA,CACN2B,MAAM,CAAC;QAAExB,KAAAA,EAAOyB,MAAAA;QAAQL,IAAAA,EAAMM;AAAW,KAAA,CAAA;IAE5C,MAAME,kBAAAA,GAAqBN,eAAAA,CAAiBC,YAAY,CAACI,iBAAAA,CAAAA;AACzDhC,IAAAA,MAAAA,CAAOiB,QAAQ,CAACC,IAAI,CAAC,mBAAA,EAAqB;QAAEC,WAAAA,EAAac;AAAmB,KAAA,CAAA;IAE5E,OAAOA,kBAAAA;AACT,CAAA;AAEA;;;AAGC,IACM,MAAM9B,QAAAA,GAAW,OAAO2B,MAAAA,GAAS,EAAE,GAAA;IACxC,MAAMI,cAAAA,GAAiB,MAAMlC,MAAAA,CAAOC,EAAE,CAACC,KAAK,CAAC,mBAAA,CAAA,CAAqBC,QAAQ,CAAC2B,MAAAA,CAAAA;IAE3E,OAAOH,eAAAA,CAAiBC,YAAY,CAACM,cAAAA,CAAAA;AACvC;AAEA;;;IAIO,MAAMC,mBAAAA,GAAsB,OAAOC,IAAAA,GAAAA;AACxC,IAAA,OAAOjC,QAAAA,CAAS;QAAEE,KAAAA,EAAO;YAAEC,IAAAA,EAAM;gBAAE+B,KAAAA,EAAO;AAAE9B,oBAAAA,EAAAA,EAAI6B,KAAK7B;AAAG;AAAE;AAAE;AAAE,KAAA,CAAA;AAChE;AAEA,MAAM+B,4BAA4B,OAAOnB,WAAAA,GAAAA;AACvC,IAAA,MAAM,EAAEoB,cAAc,EAAE,GAAGC,gBAAAA,CAAW,YAAA,CAAA;AAEtC,IAAA,MAAMC,sBAAoC,EAAE;IAE5C,KAAK,MAAMnB,cAAcH,WAAAA,CAAa;AACpC,QAAA,MAAM,EAAEuB,QAAQ,EAAEC,OAAAA,GAAU,EAAuB,EAAE,GAClDJ,eAAeK,GAAG,CAACtB,UAAAA,CAAWuB,MAAM,KAAgB,EAAC;QACxD,MAAM,EAAEC,iBAAiB,EAAE,GAAGH,OAAAA;AAE9B,QAAA,MAAMI,iBAAAA,GAAoB,MAAMC,OAAAA,CAAQC,GAAG,CACxCH,CAAAA,iBAAAA,IAAqB,EAAC,EAAGpC,GAAG,CAAC,OAAOwC,QAAAA,GAAAA;YACnC,MAAMC,OAAAA,GAAU,MAAMZ,cAAAA,CAAea,iBAAiB,CACpDF,UACA5B,UAAAA,CAAWuB,MAAM,EACjBvB,UAAAA,CAAW+B,OAAO,CAAA;AAGpB,YAAA,OAAOF,OAAAA,IAAWG,QAAAA,CAAM3B,eAAAA,CAAiB4B,WAAW,CAACL,QAAAA,EAAU5B,UAAAA,CAAAA,CAAAA;AACjE,QAAA,CAAA,CAAA,CAAA;AAGF,QAAA,MAAMkC,kBAAAA,GAAqBjB,cAAAA,CAAekB,GAAG,CAACnC,WAAWuB,MAAM,CAAA;AAC/D,QAAA,MAAMa,uBAAuBC,UAAAA,CAAQb,iBAAAA,CAAAA,IAAsBC,iBAAAA,CAAkBa,KAAK,CAACC,KAAAA,CAAG,IAAA,CAAA,CAAA;QACtF,MAAMC,gBAAAA,GAAmBH,WAAQjB,QAAAA,CAAAA,IAAa,CAACA,SAASqB,QAAQ,CAACzC,WAAW+B,OAAO,CAAA;;AAEnF,QAAA,MAAMW,WAAAA,GAAc,CAACV,QAAAA,CAAM3C,OAAAA,CAAK,UAAA,EAAYW,UAAAA,CAAAA,CAAAA;;AAG5C,QAAA,IAAI,CAACkC,kBAAAA,IAAsBM,gBAAAA,IAAqBJ,oBAAAA,IAAwB,CAACM,WAAAA,EAAc;AACrFvB,YAAAA,mBAAAA,CAAoBzB,IAAI,CAACM,UAAAA,CAAAA;AAC3B,QAAA;AACF,IAAA;IAEA,OAAOmB,mBAAAA;AACT,CAAA;AAEA;;UAGawB,0BAAAA,GAA6B,UAAA;AACxC,IAAA,MAAMC,QAAAA,GAAW,GAAA;AAEjB,IAAA,MAAMC,qBAAqB3B,gBAAAA,CAAW,cAAA,CAAA;IAEtC,MAAM4B,KAAAA,GAAQ,MAAMpE,MAAAA,CAAOC,EAAE,CAACC,KAAK,CAAC,qBAAqBmE,KAAK,EAAA;AAC9D,IAAA,MAAMC,SAAAA,GAAYC,IAAAA,CAAKC,IAAI,CAACJ,KAAAA,GAAQF,QAAAA,CAAAA;AAEpC,IAAA,IAAK,IAAIO,IAAAA,GAAO,CAAA,EAAGA,IAAAA,GAAOH,SAAAA,EAAWG,QAAQ,CAAA,CAAG;;QAE9C,MAAMC,OAAAA,GAAW,MAAM1E,MAAAA,CAAOC,EAAE,CAACC,KAAK,CAAC,mBAAA,CAAA,CAAqBC,QAAQ,CAAC;YACnEwE,KAAAA,EAAOT,QAAAA;AACPU,YAAAA,MAAAA,EAAQH,IAAAA,GAAOP,QAAAA;YACfW,QAAAA,EAAU;AAAC,gBAAA,MAAA;AAAQ,gBAAA;AAAW;AAChC,SAAA,CAAA;QAEA,MAAM1D,WAAAA,GAAcQ,eAAAA,CAAiBC,YAAY,CAAC8C,OAAAA,CAAAA;QAClD,MAAMjC,mBAAAA,GAAsB,MAAMH,yBAAAA,CAA0BnB,WAAAA,CAAAA;;AAG5D,QAAA,MAAM2D,mBAAAA,GAAsB3D,WAAAA,CAAY4D,MAAM,CAC5C,CAACzD,UAAAA,GAAoB,CAACA,UAAAA,CAAWhB,IAAI,IAAI,CAACgB,UAAAA,CAAW0D,QAAQ,CAAA;AAG/D,QAAA,MAAMC,qBAAAA,GAAwBC,KAAAA,CAAMC,IAAI,CACtC,IAAIC,GAAAA,CAAI;AAAI3C,YAAAA,GAAAA,mBAAAA;AAAwBqC,YAAAA,GAAAA;AAAoB,SAAA,CAACpE,GAAG,CAAC,CAAC2E,CAAAA,GAAMA,EAAE9E,EAAE,CAAA,CAAA,CAAA;;QAI1E,MAAM+E,oBAAAA,GAAuBnE,WAAAA,CAAY4D,MAAM,CAC7C,CAACzD,UAAAA,GAA2B,CAAC2D,qBAAAA,CAAsBlB,QAAQ,CAACzC,UAAAA,CAAWf,EAAE,CAAA,CAAA;QAG3E,MAAMgF,0BAAAA,GAA6BpB,kBAAAA,CAAmBqB,qBAAqB,CACzEF,oBAAAA,CAAAA;;QAIF,MAAMG,6BAAAA,GAAgCC,iBAAAA,CACpC,CAACC,CAAAA,EAAeC,CAAAA,GAAAA;AACd,YAAA,OAAOD,EAAEpF,EAAE,KAAKqF,EAAErF,EAAE,IAAIsF,OAAIF,CAAAA,CAAEG,UAAU,CAACC,MAAM,EAAEH,CAAAA,CAAEE,UAAU,CAACC,MAAM,CAAA,CAAEvF,MAAM,KAAK,CAAA;AACnF,QAAA,CAAA,EACA+E,0BAAAA,EACAD,oBAAAA,CAAAA;AAGF,QAAA,MAAMU,wBAAwB,CAAC1E,UAAAA,GAAAA;AAC7B,YAAA,OAAOO,MAAAA,CAAO;AAAEtB,gBAAAA,EAAAA,EAAIe,WAAWf;aAAG,EAAGe,UAAAA,CAAAA;AACvC,QAAA,CAAA;;QAGA,MAAM0B,OAAAA,CAAQC,GAAG,CAAC;YAChBxC,WAAAA,CAAYwE,qBAAAA,CAAAA;AACZgB,YAAAA,qBAAAA,CAAKR,+BAA+BO,qBAAAA,EAAuB;gBACzDE,WAAAA,EAAa,GAAA;gBACbC,WAAAA,EAAa;AACf,aAAA;AACD,SAAA,CAAA;AACH,IAAA;AACF;;;;;;;;;"}
+{"version":3,"file":"queries.js","sources":["../../../../../../server/src/services/permission/queries.ts"],"sourcesContent":["import { get, xor, differenceWith } from 'lodash';\n\nimport pmap from 'p-map';\nimport type { Data } from '@strapi/types';\nimport { getService } from '../../utils';\nimport permissionDomain, { CreatePermissionPayload } from '../../domain/permission';\nimport type { AdminUser, Permission } from '../../../../shared/contracts/shared';\nimport { Action } from '../../domain/action';\n\n/**\n * Delete permissions of roles in database\n * @param rolesIds ids of roles\n */\nexport const deleteByRolesIds = async (rolesIds: Data.ID[]): Promise<void> => {\n  const permissionsToDelete = await strapi.db.query('admin::permission').findMany({\n    select: ['id'],\n    where: {\n      role: { id: rolesIds },\n    },\n  });\n\n  if (permissionsToDelete.length > 0) {\n    await deleteByIds(permissionsToDelete.map((permission) => permission?.id));\n  }\n};\n\n/**\n * Delete permissions\n * @param ids ids of permissions\n */\nexport const deleteByIds = async (ids: Data.ID[]): Promise<void> => {\n  const result: unknown[] = [];\n  for (const id of ids) {\n    const queryResult = await strapi.db.query('admin::permission').delete({ where: { id } });\n    result.push(queryResult);\n  }\n  strapi.eventHub.emit('permission.delete', { permissions: result });\n};\n\n/**\n * Create many permissions\n * @param permissions\n */\nexport const createMany = async (permissions: CreatePermissionPayload[]): Promise<Permission[]> => {\n  const createdPermissions: CreatePermissionPayload[] = [];\n  for (const permission of permissions) {\n    const newPerm = await strapi.db.query('admin::permission').create({ data: permission });\n    createdPermissions.push(newPerm);\n  }\n\n  const permissionsToReturn = permissionDomain.toPermission(createdPermissions);\n  strapi.eventHub.emit('permission.create', { permissions: permissionsToReturn });\n\n  return permissionsToReturn;\n};\n\n/**\n * Update a permission\n * @param params\n * @param attributes\n */\nconst update = async (params: unknown, attributes: Partial<Permission>) => {\n  const updatedPermission = (await strapi.db\n    .query('admin::permission')\n    .update({ where: params, data: attributes })) as Permission;\n\n  const permissionToReturn = permissionDomain.toPermission(updatedPermission);\n  strapi.eventHub.emit('permission.update', { permissions: permissionToReturn });\n\n  return permissionToReturn;\n};\n\n/**\n * Find assigned permissions in the database\n * @param params query params to find the permissions\n */\nexport const findMany = async (params = {}): Promise<Permission[]> => {\n  const rawPermissions = await strapi.db.query('admin::permission').findMany(params);\n\n  return permissionDomain.toPermission(rawPermissions);\n};\n\n/**\n * Find all permissions for a user\n * @param user - user\n */\nexport const findUserPermissions = async (user: AdminUser): Promise<Permission[]> => {\n  return findMany({ where: { role: { users: { id: user.id } } } });\n};\n\nconst filterPermissionsToRemove = async (permissions: Permission[]) => {\n  const { actionProvider } = getService('permission');\n\n  const permissionsToRemove: Permission[] = [];\n\n  for (const permission of permissions) {\n    const { subjects, options = {} as Action['options'] } =\n      (actionProvider.get(permission.action) as Action) || {};\n    const { applyToProperties } = options;\n\n    const invalidProperties = await Promise.all(\n      (applyToProperties || []).map(async (property) => {\n        const applies = await actionProvider.appliesToProperty(\n          property,\n          permission.action,\n          permission.subject\n        );\n\n        return applies && permissionDomain.getProperty(property, permission) == null;\n      })\n    );\n\n    const isRegisteredAction = actionProvider.has(permission.action);\n    const hasInvalidProperties =\n      Array.isArray(applyToProperties) && invalidProperties.every((result) => result === true);\n    const isInvalidSubject =\n      Array.isArray(subjects) && !subjects.includes(permission.subject as string);\n    // On an api token permission, nil properties mean \"everything\", not \"invalid\"\n    const hasApiToken = get(permission, 'apiToken') != null;\n\n    // If the permission has an invalid action, an invalid subject or invalid properties, then add it to the toBeRemoved collection\n    if (!isRegisteredAction || isInvalidSubject || (hasInvalidProperties && !hasApiToken)) {\n      permissionsToRemove.push(permission);\n    }\n  }\n\n  return permissionsToRemove;\n};\n\n/**\n * Removes permissions in database that don't exist anymore\n */\nexport const cleanPermissionsInDatabase = async (): Promise<void> => {\n  const pageSize = 200;\n\n  const contentTypeService = getService('content-type');\n\n  const total = await strapi.db.query('admin::permission').count();\n  const pageCount = Math.ceil(total / pageSize);\n\n  for (let page = 0; page < pageCount; page += 1) {\n    // 1. Find invalid permissions and collect their ID to delete them later\n    const results = (await strapi.db.query('admin::permission').findMany({\n      limit: pageSize,\n      offset: page * pageSize,\n      populate: ['role', 'apiToken'],\n    })) as Permission[];\n\n    const permissions = permissionDomain.toPermission(results);\n    const permissionsToRemove = await filterPermissionsToRemove(permissions);\n\n    // Also remove orphaned permissions (no role AND no apiToken)\n    const orphanedPermissions = permissions.filter(\n      (permission: any) => !permission.role && !permission.apiToken\n    );\n\n    const permissionsIdToRemove = Array.from(\n      new Set([...permissionsToRemove, ...orphanedPermissions].map((p) => p.id))\n    );\n\n    // 2. Clean permissions' fields (add required ones, remove the non-existing ones)\n    const remainingPermissions = permissions.filter(\n      (permission: Permission) => !permissionsIdToRemove.includes(permission.id)\n    );\n\n    const permissionsWithCleanFields = contentTypeService.cleanPermissionFields(\n      remainingPermissions\n    ) as Permission[];\n\n    // Update only the ones that need to be updated\n    const permissionsNeedingToBeUpdated = differenceWith(\n      permissionsWithCleanFields,\n      remainingPermissions,\n      (a: Permission, b: Permission) => {\n        return a.id === b.id && xor(b.properties.fields, a.properties.fields).length === 0;\n      }\n    );\n\n    const updatePromiseProvider = (permission: Permission) => {\n      return update({ id: permission.id }, permission);\n    };\n\n    // Execute all the queries, update the database\n    await Promise.all([\n      deleteByIds(permissionsIdToRemove),\n      pmap(permissionsNeedingToBeUpdated, updatePromiseProvider, {\n        concurrency: 100,\n        stopOnError: true,\n      }),\n    ]);\n  }\n};\n\nexport default {\n  createMany,\n  findMany,\n  deleteByRolesIds,\n  deleteByIds,\n  findUserPermissions,\n  cleanPermissionsInDatabase,\n};\n"],"names":["deleteByRolesIds","rolesIds","permissionsToDelete","strapi","db","query","findMany","select","where","role","id","length","deleteByIds","map","permission","ids","result","queryResult","delete","push","eventHub","emit","permissions","createMany","createdPermissions","newPerm","create","data","permissionsToReturn","permissionDomain","toPermission","update","params","attributes","updatedPermission","permissionToReturn","rawPermissions","findUserPermissions","user","users","filterPermissionsToRemove","actionProvider","getService","permissionsToRemove","subjects","options","get","action","applyToProperties","invalidProperties","Promise","all","property","applies","appliesToProperty","subject","getProperty","isRegisteredAction","has","hasInvalidProperties","Array","isArray","every","isInvalidSubject","includes","hasApiToken","cleanPermissionsInDatabase","pageSize","contentTypeService","total","count","pageCount","Math","ceil","page","results","limit","offset","populate","orphanedPermissions","filter","apiToken","permissionsIdToRemove","from","Set","p","remainingPermissions","permissionsWithCleanFields","cleanPermissionFields","permissionsNeedingToBeUpdated","differenceWith","a","b","xor","properties","fields","updatePromiseProvider","pmap","concurrency","stopOnError"],"mappings":"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"}

package/dist/server/server/src/services/permission/queries.mjs

@@ -1,4 +1,4 @@
-import { differenceWith, xor, prop, isNil, isArray, eq } from 'lodash/fp';
+import { differenceWith, xor, get } from 'lodash';
 import pmap from 'p-map';
 import { getService } from '../../utils/index.mjs';
 import permissionDomain from '../../domain/permission/index.mjs';
@@ -18,7 +18,7 @@ import permissionDomain from '../../domain/permission/index.mjs';
         }
     });
     if (permissionsToDelete.length > 0) {
-        await deleteByIds(permissionsToDelete.map(prop('id')));
+        await deleteByIds(permissionsToDelete.map((permission)=>permission?.id));
     }
 };
 /**
@@ -99,13 +99,13 @@ const filterPermissionsToRemove = async (permissions)=>{
         const { applyToProperties } = options;
         const invalidProperties = await Promise.all((applyToProperties || []).map(async (property)=>{
             const applies = await actionProvider.appliesToProperty(property, permission.action, permission.subject);
-            return applies && isNil(permissionDomain.getProperty(property, permission));
+            return applies && permissionDomain.getProperty(property, permission) == null;
         }));
         const isRegisteredAction = actionProvider.has(permission.action);
-        const hasInvalidProperties = isArray(applyToProperties) && invalidProperties.every(eq(true));
-        const isInvalidSubject = isArray(subjects) && !subjects.includes(permission.subject);
+        const hasInvalidProperties = Array.isArray(applyToProperties) && invalidProperties.every((result)=>result === true);
+        const isInvalidSubject = Array.isArray(subjects) && !subjects.includes(permission.subject);
         // On an api token permission, nil properties mean "everything", not "invalid"
-        const hasApiToken = !isNil(prop('apiToken', permission));
+        const hasApiToken = get(permission, 'apiToken') != null;
         // If the permission has an invalid action, an invalid subject or invalid properties, then add it to the toBeRemoved collection
         if (!isRegisteredAction || isInvalidSubject || hasInvalidProperties && !hasApiToken) {
             permissionsToRemove.push(permission);
@@ -142,9 +142,9 @@ const filterPermissionsToRemove = async (permissions)=>{
         const remainingPermissions = permissions.filter((permission)=>!permissionsIdToRemove.includes(permission.id));
         const permissionsWithCleanFields = contentTypeService.cleanPermissionFields(remainingPermissions);
         // Update only the ones that need to be updated
-        const permissionsNeedingToBeUpdated = differenceWith((a, b)=>{
-            return a.id === b.id && xor(a.properties.fields, b.properties.fields).length === 0;
-        }, permissionsWithCleanFields, remainingPermissions);
+        const permissionsNeedingToBeUpdated = differenceWith(permissionsWithCleanFields, remainingPermissions, (a, b)=>{
+            return a.id === b.id && xor(b.properties.fields, a.properties.fields).length === 0;
+        });
         const updatePromiseProvider = (permission)=>{
             return update({
                 id: permission.id

package/dist/server/server/src/services/permission/queries.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"queries.mjs","sources":["../../../../../../server/src/services/permission/queries.ts"],"sourcesContent":["import { isNil, isArray, prop, xor, eq, differenceWith } from 'lodash/fp';\nimport pmap from 'p-map';\nimport type { Data } from '@strapi/types';\nimport { getService } from '../../utils';\nimport permissionDomain, { CreatePermissionPayload } from '../../domain/permission';\nimport type { AdminUser, Permission } from '../../../../shared/contracts/shared';\nimport { Action } from '../../domain/action';\n\n/**\n * Delete permissions of roles in database\n * @param rolesIds ids of roles\n */\nexport const deleteByRolesIds = async (rolesIds: Data.ID[]): Promise<void> => {\n  const permissionsToDelete = await strapi.db.query('admin::permission').findMany({\n    select: ['id'],\n    where: {\n      role: { id: rolesIds },\n    },\n  });\n\n  if (permissionsToDelete.length > 0) {\n    await deleteByIds(permissionsToDelete.map(prop('id')));\n  }\n};\n\n/**\n * Delete permissions\n * @param ids ids of permissions\n */\nexport const deleteByIds = async (ids: Data.ID[]): Promise<void> => {\n  const result: unknown[] = [];\n  for (const id of ids) {\n    const queryResult = await strapi.db.query('admin::permission').delete({ where: { id } });\n    result.push(queryResult);\n  }\n  strapi.eventHub.emit('permission.delete', { permissions: result });\n};\n\n/**\n * Create many permissions\n * @param permissions\n */\nexport const createMany = async (permissions: CreatePermissionPayload[]): Promise<Permission[]> => {\n  const createdPermissions: CreatePermissionPayload[] = [];\n  for (const permission of permissions) {\n    const newPerm = await strapi.db.query('admin::permission').create({ data: permission });\n    createdPermissions.push(newPerm);\n  }\n\n  const permissionsToReturn = permissionDomain.toPermission(createdPermissions);\n  strapi.eventHub.emit('permission.create', { permissions: permissionsToReturn });\n\n  return permissionsToReturn;\n};\n\n/**\n * Update a permission\n * @param params\n * @param attributes\n */\nconst update = async (params: unknown, attributes: Partial<Permission>) => {\n  const updatedPermission = (await strapi.db\n    .query('admin::permission')\n    .update({ where: params, data: attributes })) as Permission;\n\n  const permissionToReturn = permissionDomain.toPermission(updatedPermission);\n  strapi.eventHub.emit('permission.update', { permissions: permissionToReturn });\n\n  return permissionToReturn;\n};\n\n/**\n * Find assigned permissions in the database\n * @param params query params to find the permissions\n */\nexport const findMany = async (params = {}): Promise<Permission[]> => {\n  const rawPermissions = await strapi.db.query('admin::permission').findMany(params);\n\n  return permissionDomain.toPermission(rawPermissions);\n};\n\n/**\n * Find all permissions for a user\n * @param user - user\n */\nexport const findUserPermissions = async (user: AdminUser): Promise<Permission[]> => {\n  return findMany({ where: { role: { users: { id: user.id } } } });\n};\n\nconst filterPermissionsToRemove = async (permissions: Permission[]) => {\n  const { actionProvider } = getService('permission');\n\n  const permissionsToRemove: Permission[] = [];\n\n  for (const permission of permissions) {\n    const { subjects, options = {} as Action['options'] } =\n      (actionProvider.get(permission.action) as Action) || {};\n    const { applyToProperties } = options;\n\n    const invalidProperties = await Promise.all(\n      (applyToProperties || []).map(async (property) => {\n        const applies = await actionProvider.appliesToProperty(\n          property,\n          permission.action,\n          permission.subject\n        );\n\n        return applies && isNil(permissionDomain.getProperty(property, permission));\n      })\n    );\n\n    const isRegisteredAction = actionProvider.has(permission.action);\n    const hasInvalidProperties = isArray(applyToProperties) && invalidProperties.every(eq(true));\n    const isInvalidSubject = isArray(subjects) && !subjects.includes(permission.subject as string);\n    // On an api token permission, nil properties mean \"everything\", not \"invalid\"\n    const hasApiToken = !isNil(prop('apiToken', permission));\n\n    // If the permission has an invalid action, an invalid subject or invalid properties, then add it to the toBeRemoved collection\n    if (!isRegisteredAction || isInvalidSubject || (hasInvalidProperties && !hasApiToken)) {\n      permissionsToRemove.push(permission);\n    }\n  }\n\n  return permissionsToRemove;\n};\n\n/**\n * Removes permissions in database that don't exist anymore\n */\nexport const cleanPermissionsInDatabase = async (): Promise<void> => {\n  const pageSize = 200;\n\n  const contentTypeService = getService('content-type');\n\n  const total = await strapi.db.query('admin::permission').count();\n  const pageCount = Math.ceil(total / pageSize);\n\n  for (let page = 0; page < pageCount; page += 1) {\n    // 1. Find invalid permissions and collect their ID to delete them later\n    const results = (await strapi.db.query('admin::permission').findMany({\n      limit: pageSize,\n      offset: page * pageSize,\n      populate: ['role', 'apiToken'],\n    })) as Permission[];\n\n    const permissions = permissionDomain.toPermission(results);\n    const permissionsToRemove = await filterPermissionsToRemove(permissions);\n\n    // Also remove orphaned permissions (no role AND no apiToken)\n    const orphanedPermissions = permissions.filter(\n      (permission: any) => !permission.role && !permission.apiToken\n    );\n\n    const permissionsIdToRemove = Array.from(\n      new Set([...permissionsToRemove, ...orphanedPermissions].map((p) => p.id))\n    );\n\n    // 2. Clean permissions' fields (add required ones, remove the non-existing ones)\n    const remainingPermissions = permissions.filter(\n      (permission: Permission) => !permissionsIdToRemove.includes(permission.id)\n    );\n\n    const permissionsWithCleanFields = contentTypeService.cleanPermissionFields(\n      remainingPermissions\n    ) as Permission[];\n\n    // Update only the ones that need to be updated\n    const permissionsNeedingToBeUpdated = differenceWith(\n      (a: Permission, b: Permission) => {\n        return a.id === b.id && xor(a.properties.fields, b.properties.fields).length === 0;\n      },\n      permissionsWithCleanFields,\n      remainingPermissions\n    );\n\n    const updatePromiseProvider = (permission: Permission) => {\n      return update({ id: permission.id }, permission);\n    };\n\n    // Execute all the queries, update the database\n    await Promise.all([\n      deleteByIds(permissionsIdToRemove),\n      pmap(permissionsNeedingToBeUpdated, updatePromiseProvider, {\n        concurrency: 100,\n        stopOnError: true,\n      }),\n    ]);\n  }\n};\n\nexport default {\n  createMany,\n  findMany,\n  deleteByRolesIds,\n  deleteByIds,\n  findUserPermissions,\n  cleanPermissionsInDatabase,\n};\n"],"names":["deleteByRolesIds","rolesIds","permissionsToDelete","strapi","db","query","findMany","select","where","role","id","length","deleteByIds","map","prop","ids","result","queryResult","delete","push","eventHub","emit","permissions","createMany","createdPermissions","permission","newPerm","create","data","permissionsToReturn","permissionDomain","toPermission","update","params","attributes","updatedPermission","permissionToReturn","rawPermissions","findUserPermissions","user","users","filterPermissionsToRemove","actionProvider","getService","permissionsToRemove","subjects","options","get","action","applyToProperties","invalidProperties","Promise","all","property","applies","appliesToProperty","subject","isNil","getProperty","isRegisteredAction","has","hasInvalidProperties","isArray","every","eq","isInvalidSubject","includes","hasApiToken","cleanPermissionsInDatabase","pageSize","contentTypeService","total","count","pageCount","Math","ceil","page","results","limit","offset","populate","orphanedPermissions","filter","apiToken","permissionsIdToRemove","Array","from","Set","p","remainingPermissions","permissionsWithCleanFields","cleanPermissionFields","permissionsNeedingToBeUpdated","differenceWith","a","b","xor","properties","fields","updatePromiseProvider","pmap","concurrency","stopOnError"],"mappings":";;;;;AAQA;;;IAIO,MAAMA,gBAAAA,GAAmB,OAAOC,QAAAA,GAAAA;IACrC,MAAMC,mBAAAA,GAAsB,MAAMC,MAAAA,CAAOC,EAAE,CAACC,KAAK,CAAC,mBAAA,CAAA,CAAqBC,QAAQ,CAAC;QAC9EC,MAAAA,EAAQ;AAAC,YAAA;AAAK,SAAA;QACdC,KAAAA,EAAO;YACLC,IAAAA,EAAM;gBAAEC,EAAAA,EAAIT;AAAS;AACvB;AACF,KAAA,CAAA;IAEA,IAAIC,mBAAAA,CAAoBS,MAAM,GAAG,CAAA,EAAG;AAClC,QAAA,MAAMC,WAAAA,CAAYV,mBAAAA,CAAoBW,GAAG,CAACC,IAAAA,CAAK,IAAA,CAAA,CAAA,CAAA;AACjD,IAAA;AACF;AAEA;;;IAIO,MAAMF,WAAAA,GAAc,OAAOG,GAAAA,GAAAA;AAChC,IAAA,MAAMC,SAAoB,EAAE;IAC5B,KAAK,MAAMN,MAAMK,GAAAA,CAAK;QACpB,MAAME,WAAAA,GAAc,MAAMd,MAAAA,CAAOC,EAAE,CAACC,KAAK,CAAC,mBAAA,CAAA,CAAqBa,MAAM,CAAC;YAAEV,KAAAA,EAAO;AAAEE,gBAAAA;AAAG;AAAE,SAAA,CAAA;AACtFM,QAAAA,MAAAA,CAAOG,IAAI,CAACF,WAAAA,CAAAA;AACd,IAAA;AACAd,IAAAA,MAAAA,CAAOiB,QAAQ,CAACC,IAAI,CAAC,mBAAA,EAAqB;QAAEC,WAAAA,EAAaN;AAAO,KAAA,CAAA;AAClE;AAEA;;;IAIO,MAAMO,UAAAA,GAAa,OAAOD,WAAAA,GAAAA;AAC/B,IAAA,MAAME,qBAAgD,EAAE;IACxD,KAAK,MAAMC,cAAcH,WAAAA,CAAa;QACpC,MAAMI,OAAAA,GAAU,MAAMvB,MAAAA,CAAOC,EAAE,CAACC,KAAK,CAAC,mBAAA,CAAA,CAAqBsB,MAAM,CAAC;YAAEC,IAAAA,EAAMH;AAAW,SAAA,CAAA;AACrFD,QAAAA,kBAAAA,CAAmBL,IAAI,CAACO,OAAAA,CAAAA;AAC1B,IAAA;IAEA,MAAMG,mBAAAA,GAAsBC,gBAAAA,CAAiBC,YAAY,CAACP,kBAAAA,CAAAA;AAC1DrB,IAAAA,MAAAA,CAAOiB,QAAQ,CAACC,IAAI,CAAC,mBAAA,EAAqB;QAAEC,WAAAA,EAAaO;AAAoB,KAAA,CAAA;IAE7E,OAAOA,mBAAAA;AACT;AAEA;;;;IAKA,MAAMG,MAAAA,GAAS,OAAOC,MAAAA,EAAiBC,UAAAA,GAAAA;IACrC,MAAMC,iBAAAA,GAAqB,MAAMhC,MAAAA,CAAOC,EAAE,CACvCC,KAAK,CAAC,mBAAA,CAAA,CACN2B,MAAM,CAAC;QAAExB,KAAAA,EAAOyB,MAAAA;QAAQL,IAAAA,EAAMM;AAAW,KAAA,CAAA;IAE5C,MAAME,kBAAAA,GAAqBN,gBAAAA,CAAiBC,YAAY,CAACI,iBAAAA,CAAAA;AACzDhC,IAAAA,MAAAA,CAAOiB,QAAQ,CAACC,IAAI,CAAC,mBAAA,EAAqB;QAAEC,WAAAA,EAAac;AAAmB,KAAA,CAAA;IAE5E,OAAOA,kBAAAA;AACT,CAAA;AAEA;;;AAGC,IACM,MAAM9B,QAAAA,GAAW,OAAO2B,MAAAA,GAAS,EAAE,GAAA;IACxC,MAAMI,cAAAA,GAAiB,MAAMlC,MAAAA,CAAOC,EAAE,CAACC,KAAK,CAAC,mBAAA,CAAA,CAAqBC,QAAQ,CAAC2B,MAAAA,CAAAA;IAE3E,OAAOH,gBAAAA,CAAiBC,YAAY,CAACM,cAAAA,CAAAA;AACvC;AAEA;;;IAIO,MAAMC,mBAAAA,GAAsB,OAAOC,IAAAA,GAAAA;AACxC,IAAA,OAAOjC,QAAAA,CAAS;QAAEE,KAAAA,EAAO;YAAEC,IAAAA,EAAM;gBAAE+B,KAAAA,EAAO;AAAE9B,oBAAAA,EAAAA,EAAI6B,KAAK7B;AAAG;AAAE;AAAE;AAAE,KAAA,CAAA;AAChE;AAEA,MAAM+B,4BAA4B,OAAOnB,WAAAA,GAAAA;AACvC,IAAA,MAAM,EAAEoB,cAAc,EAAE,GAAGC,UAAAA,CAAW,YAAA,CAAA;AAEtC,IAAA,MAAMC,sBAAoC,EAAE;IAE5C,KAAK,MAAMnB,cAAcH,WAAAA,CAAa;AACpC,QAAA,MAAM,EAAEuB,QAAQ,EAAEC,OAAAA,GAAU,EAAuB,EAAE,GAClDJ,eAAeK,GAAG,CAACtB,UAAAA,CAAWuB,MAAM,KAAgB,EAAC;QACxD,MAAM,EAAEC,iBAAiB,EAAE,GAAGH,OAAAA;AAE9B,QAAA,MAAMI,iBAAAA,GAAoB,MAAMC,OAAAA,CAAQC,GAAG,CACxCH,CAAAA,iBAAAA,IAAqB,EAAC,EAAGpC,GAAG,CAAC,OAAOwC,QAAAA,GAAAA;YACnC,MAAMC,OAAAA,GAAU,MAAMZ,cAAAA,CAAea,iBAAiB,CACpDF,UACA5B,UAAAA,CAAWuB,MAAM,EACjBvB,UAAAA,CAAW+B,OAAO,CAAA;AAGpB,YAAA,OAAOF,OAAAA,IAAWG,KAAAA,CAAM3B,gBAAAA,CAAiB4B,WAAW,CAACL,QAAAA,EAAU5B,UAAAA,CAAAA,CAAAA;AACjE,QAAA,CAAA,CAAA,CAAA;AAGF,QAAA,MAAMkC,kBAAAA,GAAqBjB,cAAAA,CAAekB,GAAG,CAACnC,WAAWuB,MAAM,CAAA;AAC/D,QAAA,MAAMa,uBAAuBC,OAAAA,CAAQb,iBAAAA,CAAAA,IAAsBC,iBAAAA,CAAkBa,KAAK,CAACC,EAAAA,CAAG,IAAA,CAAA,CAAA;QACtF,MAAMC,gBAAAA,GAAmBH,QAAQjB,QAAAA,CAAAA,IAAa,CAACA,SAASqB,QAAQ,CAACzC,WAAW+B,OAAO,CAAA;;AAEnF,QAAA,MAAMW,WAAAA,GAAc,CAACV,KAAAA,CAAM3C,IAAAA,CAAK,UAAA,EAAYW,UAAAA,CAAAA,CAAAA;;AAG5C,QAAA,IAAI,CAACkC,kBAAAA,IAAsBM,gBAAAA,IAAqBJ,oBAAAA,IAAwB,CAACM,WAAAA,EAAc;AACrFvB,YAAAA,mBAAAA,CAAoBzB,IAAI,CAACM,UAAAA,CAAAA;AAC3B,QAAA;AACF,IAAA;IAEA,OAAOmB,mBAAAA;AACT,CAAA;AAEA;;UAGawB,0BAAAA,GAA6B,UAAA;AACxC,IAAA,MAAMC,QAAAA,GAAW,GAAA;AAEjB,IAAA,MAAMC,qBAAqB3B,UAAAA,CAAW,cAAA,CAAA;IAEtC,MAAM4B,KAAAA,GAAQ,MAAMpE,MAAAA,CAAOC,EAAE,CAACC,KAAK,CAAC,qBAAqBmE,KAAK,EAAA;AAC9D,IAAA,MAAMC,SAAAA,GAAYC,IAAAA,CAAKC,IAAI,CAACJ,KAAAA,GAAQF,QAAAA,CAAAA;AAEpC,IAAA,IAAK,IAAIO,IAAAA,GAAO,CAAA,EAAGA,IAAAA,GAAOH,SAAAA,EAAWG,QAAQ,CAAA,CAAG;;QAE9C,MAAMC,OAAAA,GAAW,MAAM1E,MAAAA,CAAOC,EAAE,CAACC,KAAK,CAAC,mBAAA,CAAA,CAAqBC,QAAQ,CAAC;YACnEwE,KAAAA,EAAOT,QAAAA;AACPU,YAAAA,MAAAA,EAAQH,IAAAA,GAAOP,QAAAA;YACfW,QAAAA,EAAU;AAAC,gBAAA,MAAA;AAAQ,gBAAA;AAAW;AAChC,SAAA,CAAA;QAEA,MAAM1D,WAAAA,GAAcQ,gBAAAA,CAAiBC,YAAY,CAAC8C,OAAAA,CAAAA;QAClD,MAAMjC,mBAAAA,GAAsB,MAAMH,yBAAAA,CAA0BnB,WAAAA,CAAAA;;AAG5D,QAAA,MAAM2D,mBAAAA,GAAsB3D,WAAAA,CAAY4D,MAAM,CAC5C,CAACzD,UAAAA,GAAoB,CAACA,UAAAA,CAAWhB,IAAI,IAAI,CAACgB,UAAAA,CAAW0D,QAAQ,CAAA;AAG/D,QAAA,MAAMC,qBAAAA,GAAwBC,KAAAA,CAAMC,IAAI,CACtC,IAAIC,GAAAA,CAAI;AAAI3C,YAAAA,GAAAA,mBAAAA;AAAwBqC,YAAAA,GAAAA;AAAoB,SAAA,CAACpE,GAAG,CAAC,CAAC2E,CAAAA,GAAMA,EAAE9E,EAAE,CAAA,CAAA,CAAA;;QAI1E,MAAM+E,oBAAAA,GAAuBnE,WAAAA,CAAY4D,MAAM,CAC7C,CAACzD,UAAAA,GAA2B,CAAC2D,qBAAAA,CAAsBlB,QAAQ,CAACzC,UAAAA,CAAWf,EAAE,CAAA,CAAA;QAG3E,MAAMgF,0BAAAA,GAA6BpB,kBAAAA,CAAmBqB,qBAAqB,CACzEF,oBAAAA,CAAAA;;QAIF,MAAMG,6BAAAA,GAAgCC,cAAAA,CACpC,CAACC,CAAAA,EAAeC,CAAAA,GAAAA;AACd,YAAA,OAAOD,EAAEpF,EAAE,KAAKqF,EAAErF,EAAE,IAAIsF,IAAIF,CAAAA,CAAEG,UAAU,CAACC,MAAM,EAAEH,CAAAA,CAAEE,UAAU,CAACC,MAAM,CAAA,CAAEvF,MAAM,KAAK,CAAA;AACnF,QAAA,CAAA,EACA+E,0BAAAA,EACAD,oBAAAA,CAAAA;AAGF,QAAA,MAAMU,wBAAwB,CAAC1E,UAAAA,GAAAA;AAC7B,YAAA,OAAOO,MAAAA,CAAO;AAAEtB,gBAAAA,EAAAA,EAAIe,WAAWf;aAAG,EAAGe,UAAAA,CAAAA;AACvC,QAAA,CAAA;;QAGA,MAAM0B,OAAAA,CAAQC,GAAG,CAAC;YAChBxC,WAAAA,CAAYwE,qBAAAA,CAAAA;AACZgB,YAAAA,IAAAA,CAAKR,+BAA+BO,qBAAAA,EAAuB;gBACzDE,WAAAA,EAAa,GAAA;gBACbC,WAAAA,EAAa;AACf,aAAA;AACD,SAAA,CAAA;AACH,IAAA;AACF;;;;"}
+{"version":3,"file":"queries.mjs","sources":["../../../../../../server/src/services/permission/queries.ts"],"sourcesContent":["import { get, xor, differenceWith } from 'lodash';\n\nimport pmap from 'p-map';\nimport type { Data } from '@strapi/types';\nimport { getService } from '../../utils';\nimport permissionDomain, { CreatePermissionPayload } from '../../domain/permission';\nimport type { AdminUser, Permission } from '../../../../shared/contracts/shared';\nimport { Action } from '../../domain/action';\n\n/**\n * Delete permissions of roles in database\n * @param rolesIds ids of roles\n */\nexport const deleteByRolesIds = async (rolesIds: Data.ID[]): Promise<void> => {\n  const permissionsToDelete = await strapi.db.query('admin::permission').findMany({\n    select: ['id'],\n    where: {\n      role: { id: rolesIds },\n    },\n  });\n\n  if (permissionsToDelete.length > 0) {\n    await deleteByIds(permissionsToDelete.map((permission) => permission?.id));\n  }\n};\n\n/**\n * Delete permissions\n * @param ids ids of permissions\n */\nexport const deleteByIds = async (ids: Data.ID[]): Promise<void> => {\n  const result: unknown[] = [];\n  for (const id of ids) {\n    const queryResult = await strapi.db.query('admin::permission').delete({ where: { id } });\n    result.push(queryResult);\n  }\n  strapi.eventHub.emit('permission.delete', { permissions: result });\n};\n\n/**\n * Create many permissions\n * @param permissions\n */\nexport const createMany = async (permissions: CreatePermissionPayload[]): Promise<Permission[]> => {\n  const createdPermissions: CreatePermissionPayload[] = [];\n  for (const permission of permissions) {\n    const newPerm = await strapi.db.query('admin::permission').create({ data: permission });\n    createdPermissions.push(newPerm);\n  }\n\n  const permissionsToReturn = permissionDomain.toPermission(createdPermissions);\n  strapi.eventHub.emit('permission.create', { permissions: permissionsToReturn });\n\n  return permissionsToReturn;\n};\n\n/**\n * Update a permission\n * @param params\n * @param attributes\n */\nconst update = async (params: unknown, attributes: Partial<Permission>) => {\n  const updatedPermission = (await strapi.db\n    .query('admin::permission')\n    .update({ where: params, data: attributes })) as Permission;\n\n  const permissionToReturn = permissionDomain.toPermission(updatedPermission);\n  strapi.eventHub.emit('permission.update', { permissions: permissionToReturn });\n\n  return permissionToReturn;\n};\n\n/**\n * Find assigned permissions in the database\n * @param params query params to find the permissions\n */\nexport const findMany = async (params = {}): Promise<Permission[]> => {\n  const rawPermissions = await strapi.db.query('admin::permission').findMany(params);\n\n  return permissionDomain.toPermission(rawPermissions);\n};\n\n/**\n * Find all permissions for a user\n * @param user - user\n */\nexport const findUserPermissions = async (user: AdminUser): Promise<Permission[]> => {\n  return findMany({ where: { role: { users: { id: user.id } } } });\n};\n\nconst filterPermissionsToRemove = async (permissions: Permission[]) => {\n  const { actionProvider } = getService('permission');\n\n  const permissionsToRemove: Permission[] = [];\n\n  for (const permission of permissions) {\n    const { subjects, options = {} as Action['options'] } =\n      (actionProvider.get(permission.action) as Action) || {};\n    const { applyToProperties } = options;\n\n    const invalidProperties = await Promise.all(\n      (applyToProperties || []).map(async (property) => {\n        const applies = await actionProvider.appliesToProperty(\n          property,\n          permission.action,\n          permission.subject\n        );\n\n        return applies && permissionDomain.getProperty(property, permission) == null;\n      })\n    );\n\n    const isRegisteredAction = actionProvider.has(permission.action);\n    const hasInvalidProperties =\n      Array.isArray(applyToProperties) && invalidProperties.every((result) => result === true);\n    const isInvalidSubject =\n      Array.isArray(subjects) && !subjects.includes(permission.subject as string);\n    // On an api token permission, nil properties mean \"everything\", not \"invalid\"\n    const hasApiToken = get(permission, 'apiToken') != null;\n\n    // If the permission has an invalid action, an invalid subject or invalid properties, then add it to the toBeRemoved collection\n    if (!isRegisteredAction || isInvalidSubject || (hasInvalidProperties && !hasApiToken)) {\n      permissionsToRemove.push(permission);\n    }\n  }\n\n  return permissionsToRemove;\n};\n\n/**\n * Removes permissions in database that don't exist anymore\n */\nexport const cleanPermissionsInDatabase = async (): Promise<void> => {\n  const pageSize = 200;\n\n  const contentTypeService = getService('content-type');\n\n  const total = await strapi.db.query('admin::permission').count();\n  const pageCount = Math.ceil(total / pageSize);\n\n  for (let page = 0; page < pageCount; page += 1) {\n    // 1. Find invalid permissions and collect their ID to delete them later\n    const results = (await strapi.db.query('admin::permission').findMany({\n      limit: pageSize,\n      offset: page * pageSize,\n      populate: ['role', 'apiToken'],\n    })) as Permission[];\n\n    const permissions = permissionDomain.toPermission(results);\n    const permissionsToRemove = await filterPermissionsToRemove(permissions);\n\n    // Also remove orphaned permissions (no role AND no apiToken)\n    const orphanedPermissions = permissions.filter(\n      (permission: any) => !permission.role && !permission.apiToken\n    );\n\n    const permissionsIdToRemove = Array.from(\n      new Set([...permissionsToRemove, ...orphanedPermissions].map((p) => p.id))\n    );\n\n    // 2. Clean permissions' fields (add required ones, remove the non-existing ones)\n    const remainingPermissions = permissions.filter(\n      (permission: Permission) => !permissionsIdToRemove.includes(permission.id)\n    );\n\n    const permissionsWithCleanFields = contentTypeService.cleanPermissionFields(\n      remainingPermissions\n    ) as Permission[];\n\n    // Update only the ones that need to be updated\n    const permissionsNeedingToBeUpdated = differenceWith(\n      permissionsWithCleanFields,\n      remainingPermissions,\n      (a: Permission, b: Permission) => {\n        return a.id === b.id && xor(b.properties.fields, a.properties.fields).length === 0;\n      }\n    );\n\n    const updatePromiseProvider = (permission: Permission) => {\n      return update({ id: permission.id }, permission);\n    };\n\n    // Execute all the queries, update the database\n    await Promise.all([\n      deleteByIds(permissionsIdToRemove),\n      pmap(permissionsNeedingToBeUpdated, updatePromiseProvider, {\n        concurrency: 100,\n        stopOnError: true,\n      }),\n    ]);\n  }\n};\n\nexport default {\n  createMany,\n  findMany,\n  deleteByRolesIds,\n  deleteByIds,\n  findUserPermissions,\n  cleanPermissionsInDatabase,\n};\n"],"names":["deleteByRolesIds","rolesIds","permissionsToDelete","strapi","db","query","findMany","select","where","role","id","length","deleteByIds","map","permission","ids","result","queryResult","delete","push","eventHub","emit","permissions","createMany","createdPermissions","newPerm","create","data","permissionsToReturn","permissionDomain","toPermission","update","params","attributes","updatedPermission","permissionToReturn","rawPermissions","findUserPermissions","user","users","filterPermissionsToRemove","actionProvider","getService","permissionsToRemove","subjects","options","get","action","applyToProperties","invalidProperties","Promise","all","property","applies","appliesToProperty","subject","getProperty","isRegisteredAction","has","hasInvalidProperties","Array","isArray","every","isInvalidSubject","includes","hasApiToken","cleanPermissionsInDatabase","pageSize","contentTypeService","total","count","pageCount","Math","ceil","page","results","limit","offset","populate","orphanedPermissions","filter","apiToken","permissionsIdToRemove","from","Set","p","remainingPermissions","permissionsWithCleanFields","cleanPermissionFields","permissionsNeedingToBeUpdated","differenceWith","a","b","xor","properties","fields","updatePromiseProvider","pmap","concurrency","stopOnError"],"mappings":"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"}

package/dist/server/server/src/services/permission/rename-fields.js

@@ -0,0 +1,118 @@
+'use strict';
+
+var _ = require('lodash');
+var contentType = require('../content-type.js');
+
+const PERMISSION_UID = 'admin::permission';
+/**
+ * Carries attribute renames to the `properties.fields` of admin permissions
+ * (roles and admin API tokens).
+ *
+ * Runs from the generated rename migration, inside its transaction, before the
+ * admin bootstrap cleans permission fields against the new schema. Without it,
+ * the cleanup drops every renamed field from every role but the super admin.
+ *
+ * `strapi.contentTypes` / `strapi.components` already hold the new schema at
+ * that point, so every new field path is mapped back to the path it had before
+ * the renames, segment by segment (a component field path goes through its
+ * parent's component). This also composes a parent rename with a rename inside
+ * its component in the same save.
+ */ const createPermissionFieldRenamer = ({ strapi })=>{
+    const getOldPath = (subject, path, originsOf)=>{
+        let ownerUid = subject;
+        let owner = strapi.contentTypes[subject];
+        return path.split('.').map((segment)=>{
+            const origin = originsOf[ownerUid]?.[segment] ?? segment;
+            const attribute = owner?.attributes?.[segment];
+            if (attribute?.type === 'component' && attribute.component) {
+                ownerUid = attribute.component;
+                owner = strapi.components[attribute.component];
+            } else {
+                owner = undefined;
+            }
+            return origin;
+        }).join('.');
+    };
+    /**
+   * `old path -> new path` per subject, for the subjects with at least one
+   * renamed path.
+   */ const getRenamedPaths = (renames)=>{
+        // Per model: final name -> origin name.
+        const originsOf = {};
+        for (const [uid, mapping] of Object.entries(renames)){
+            originsOf[uid] = _.invert(mapping);
+        }
+        const renamedPaths = new Map();
+        for (const [subject, contentType$1] of Object.entries(strapi.contentTypes)){
+            const paths = contentType.getNestedFieldsWithIntermediate(contentType$1, {
+                components: strapi.components
+            });
+            const byOldPath = {};
+            for (const path of paths){
+                const oldPath = getOldPath(subject, path, originsOf);
+                if (oldPath !== path) {
+                    byOldPath[oldPath] = path;
+                }
+            }
+            if (!_.isEmpty(byOldPath)) {
+                renamedPaths.set(subject, byOldPath);
+            }
+        }
+        return renamedPaths;
+    };
+    return async (trx, renames)=>{
+        if (_.isEmpty(renames)) {
+            return;
+        }
+        // Fresh database: the table is created by schema sync after the migrations.
+        const { tableName } = strapi.db.metadata.get(PERMISSION_UID);
+        if (!await strapi.db.getSchemaConnection(trx).hasTable(tableName)) {
+            return;
+        }
+        const renamedPaths = getRenamedPaths(renames);
+        if (renamedPaths.size === 0) {
+            return;
+        }
+        // Joins the migration transaction.
+        const permissions = await strapi.db.query(PERMISSION_UID).findMany({
+            select: [
+                'id',
+                'subject',
+                'properties'
+            ],
+            where: {
+                subject: {
+                    $in: [
+                        ...renamedPaths.keys()
+                    ]
+                }
+            }
+        });
+        for (const permission of permissions){
+            const fields = permission.properties?.fields;
+            const byOldPath = permission.subject ? renamedPaths.get(permission.subject) : undefined;
+            if (!Array.isArray(fields) || !byOldPath) {
+                continue;
+            }
+            // One pass over the old paths, so a swap is applied once.
+            const newFields = _.uniq(fields.map((field)=>byOldPath[field] ?? field));
+            if (_.xor(fields, newFields).length === 0) {
+                continue;
+            }
+            await strapi.db.query(PERMISSION_UID).update({
+                where: {
+                    id: permission.id
+                },
+                data: {
+                    properties: {
+                        ...permission.properties,
+                        fields: newFields
+                    }
+                }
+            });
+        }
+    };
+};
+
+exports.createPermissionFieldRenamer = createPermissionFieldRenamer;
+//# sourceMappingURL=rename-fields.js.map

package/dist/server/server/src/services/permission/rename-fields.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"rename-fields.js","sources":["../../../../../../server/src/services/permission/rename-fields.ts"],"sourcesContent":["import { invert, isEmpty, uniq, xor } from 'lodash';\nimport type { Core, Struct } from '@strapi/types';\n\nimport { getNestedFieldsWithIntermediate } from '../content-type';\n\ntype AttributeRenameHandler = Parameters<\n  Core.Strapi['db']['schema']['registerAttributeRenameHandler']\n>[0];\n\ntype AttributeRenames = Parameters<AttributeRenameHandler>[1];\n\ninterface PermissionRow {\n  id: number | string;\n  subject: string | null;\n  properties?: { fields?: unknown } | null;\n}\n\nconst PERMISSION_UID = 'admin::permission';\n\n/**\n * Carries attribute renames to the `properties.fields` of admin permissions\n * (roles and admin API tokens).\n *\n * Runs from the generated rename migration, inside its transaction, before the\n * admin bootstrap cleans permission fields against the new schema. Without it,\n * the cleanup drops every renamed field from every role but the super admin.\n *\n * `strapi.contentTypes` / `strapi.components` already hold the new schema at\n * that point, so every new field path is mapped back to the path it had before\n * the renames, segment by segment (a component field path goes through its\n * parent's component). This also composes a parent rename with a rename inside\n * its component in the same save.\n */\nexport const createPermissionFieldRenamer = ({\n  strapi,\n}: {\n  strapi: Core.Strapi;\n}): AttributeRenameHandler => {\n  const getOldPath = (\n    subject: string,\n    path: string,\n    originsOf: Record<string, Record<string, string>>\n  ): string => {\n    let ownerUid = subject;\n    let owner: Struct.Schema | undefined =\n      strapi.contentTypes[subject as keyof typeof strapi.contentTypes];\n\n    return path\n      .split('.')\n      .map((segment) => {\n        const origin = originsOf[ownerUid]?.[segment] ?? segment;\n        const attribute = owner?.attributes?.[segment] as\n          | { type?: string; component?: string }\n          | undefined;\n\n        if (attribute?.type === 'component' && attribute.component) {\n          ownerUid = attribute.component;\n          owner = strapi.components[attribute.component as keyof typeof strapi.components];\n        } else {\n          owner = undefined;\n        }\n\n        return origin;\n      })\n      .join('.');\n  };\n\n  /**\n   * `old path -> new path` per subject, for the subjects with at least one\n   * renamed path.\n   */\n  const getRenamedPaths = (renames: AttributeRenames): Map<string, Record<string, string>> => {\n    // Per model: final name -> origin name.\n    const originsOf: Record<string, Record<string, string>> = {};\n    for (const [uid, mapping] of Object.entries(renames)) {\n      originsOf[uid] = invert(mapping);\n    }\n\n    const renamedPaths = new Map<string, Record<string, string>>();\n\n    for (const [subject, contentType] of Object.entries(strapi.contentTypes)) {\n      const paths = getNestedFieldsWithIntermediate(contentType as Struct.ContentTypeSchema, {\n        components: strapi.components,\n      });\n\n      const byOldPath: Record<string, string> = {};\n      for (const path of paths) {\n        const oldPath = getOldPath(subject, path, originsOf);\n        if (oldPath !== path) {\n          byOldPath[oldPath] = path;\n        }\n      }\n\n      if (!isEmpty(byOldPath)) {\n        renamedPaths.set(subject, byOldPath);\n      }\n    }\n\n    return renamedPaths;\n  };\n\n  return async (trx, renames) => {\n    if (isEmpty(renames)) {\n      return;\n    }\n\n    // Fresh database: the table is created by schema sync after the migrations.\n    const { tableName } = strapi.db.metadata.get(PERMISSION_UID);\n    if (!(await strapi.db.getSchemaConnection(trx).hasTable(tableName))) {\n      return;\n    }\n\n    const renamedPaths = getRenamedPaths(renames);\n    if (renamedPaths.size === 0) {\n      return;\n    }\n\n    // Joins the migration transaction.\n    const permissions = (await strapi.db.query(PERMISSION_UID).findMany({\n      select: ['id', 'subject', 'properties'],\n      where: { subject: { $in: [...renamedPaths.keys()] } },\n    })) as PermissionRow[];\n\n    for (const permission of permissions) {\n      const fields = permission.properties?.fields;\n      const byOldPath = permission.subject ? renamedPaths.get(permission.subject) : undefined;\n\n      if (!Array.isArray(fields) || !byOldPath) {\n        continue;\n      }\n\n      // One pass over the old paths, so a swap is applied once.\n      const newFields = uniq(fields.map((field: string) => byOldPath[field] ?? field));\n\n      if (xor(fields, newFields).length === 0) {\n        continue;\n      }\n\n      await strapi.db.query(PERMISSION_UID).update({\n        where: { id: permission.id },\n        data: { properties: { ...permission.properties, fields: newFields } },\n      });\n    }\n  };\n};\n"],"names":["PERMISSION_UID","createPermissionFieldRenamer","strapi","getOldPath","subject","path","originsOf","ownerUid","owner","contentTypes","split","map","segment","origin","attribute","attributes","type","component","components","undefined","join","getRenamedPaths","renames","uid","mapping","Object","entries","invert","renamedPaths","Map","contentType","paths","getNestedFieldsWithIntermediate","byOldPath","oldPath","isEmpty","set","trx","tableName","db","metadata","get","getSchemaConnection","hasTable","size","permissions","query","findMany","select","where","$in","keys","permission","fields","properties","Array","isArray","newFields","uniq","field","xor","length","update","id","data"],"mappings":"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"}

package/dist/server/server/src/services/permission/rename-fields.mjs

@@ -0,0 +1,116 @@
+import { isEmpty, uniq, xor, invert } from 'lodash';
+import { getNestedFieldsWithIntermediate } from '../content-type.mjs';
+
+const PERMISSION_UID = 'admin::permission';
+/**
+ * Carries attribute renames to the `properties.fields` of admin permissions
+ * (roles and admin API tokens).
+ *
+ * Runs from the generated rename migration, inside its transaction, before the
+ * admin bootstrap cleans permission fields against the new schema. Without it,
+ * the cleanup drops every renamed field from every role but the super admin.
+ *
+ * `strapi.contentTypes` / `strapi.components` already hold the new schema at
+ * that point, so every new field path is mapped back to the path it had before
+ * the renames, segment by segment (a component field path goes through its
+ * parent's component). This also composes a parent rename with a rename inside
+ * its component in the same save.
+ */ const createPermissionFieldRenamer = ({ strapi })=>{
+    const getOldPath = (subject, path, originsOf)=>{
+        let ownerUid = subject;
+        let owner = strapi.contentTypes[subject];
+        return path.split('.').map((segment)=>{
+            const origin = originsOf[ownerUid]?.[segment] ?? segment;
+            const attribute = owner?.attributes?.[segment];
+            if (attribute?.type === 'component' && attribute.component) {
+                ownerUid = attribute.component;
+                owner = strapi.components[attribute.component];
+            } else {
+                owner = undefined;
+            }
+            return origin;
+        }).join('.');
+    };
+    /**
+   * `old path -> new path` per subject, for the subjects with at least one
+   * renamed path.
+   */ const getRenamedPaths = (renames)=>{
+        // Per model: final name -> origin name.
+        const originsOf = {};
+        for (const [uid, mapping] of Object.entries(renames)){
+            originsOf[uid] = invert(mapping);
+        }
+        const renamedPaths = new Map();
+        for (const [subject, contentType] of Object.entries(strapi.contentTypes)){
+            const paths = getNestedFieldsWithIntermediate(contentType, {
+                components: strapi.components
+            });
+            const byOldPath = {};
+            for (const path of paths){
+                const oldPath = getOldPath(subject, path, originsOf);
+                if (oldPath !== path) {
+                    byOldPath[oldPath] = path;
+                }
+            }
+            if (!isEmpty(byOldPath)) {
+                renamedPaths.set(subject, byOldPath);
+            }
+        }
+        return renamedPaths;
+    };
+    return async (trx, renames)=>{
+        if (isEmpty(renames)) {
+            return;
+        }
+        // Fresh database: the table is created by schema sync after the migrations.
+        const { tableName } = strapi.db.metadata.get(PERMISSION_UID);
+        if (!await strapi.db.getSchemaConnection(trx).hasTable(tableName)) {
+            return;
+        }
+        const renamedPaths = getRenamedPaths(renames);
+        if (renamedPaths.size === 0) {
+            return;
+        }
+        // Joins the migration transaction.
+        const permissions = await strapi.db.query(PERMISSION_UID).findMany({
+            select: [
+                'id',
+                'subject',
+                'properties'
+            ],
+            where: {
+                subject: {
+                    $in: [
+                        ...renamedPaths.keys()
+                    ]
+                }
+            }
+        });
+        for (const permission of permissions){
+            const fields = permission.properties?.fields;
+            const byOldPath = permission.subject ? renamedPaths.get(permission.subject) : undefined;
+            if (!Array.isArray(fields) || !byOldPath) {
+                continue;
+            }
+            // One pass over the old paths, so a swap is applied once.
+            const newFields = uniq(fields.map((field)=>byOldPath[field] ?? field));
+            if (xor(fields, newFields).length === 0) {
+                continue;
+            }
+            await strapi.db.query(PERMISSION_UID).update({
+                where: {
+                    id: permission.id
+                },
+                data: {
+                    properties: {
+                        ...permission.properties,
+                        fields: newFields
+                    }
+                }
+            });
+        }
+    };
+};
+
+export { createPermissionFieldRenamer };
+//# sourceMappingURL=rename-fields.mjs.map

package/dist/server/server/src/services/permission/rename-fields.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"rename-fields.mjs","sources":["../../../../../../server/src/services/permission/rename-fields.ts"],"sourcesContent":["import { invert, isEmpty, uniq, xor } from 'lodash';\nimport type { Core, Struct } from '@strapi/types';\n\nimport { getNestedFieldsWithIntermediate } from '../content-type';\n\ntype AttributeRenameHandler = Parameters<\n  Core.Strapi['db']['schema']['registerAttributeRenameHandler']\n>[0];\n\ntype AttributeRenames = Parameters<AttributeRenameHandler>[1];\n\ninterface PermissionRow {\n  id: number | string;\n  subject: string | null;\n  properties?: { fields?: unknown } | null;\n}\n\nconst PERMISSION_UID = 'admin::permission';\n\n/**\n * Carries attribute renames to the `properties.fields` of admin permissions\n * (roles and admin API tokens).\n *\n * Runs from the generated rename migration, inside its transaction, before the\n * admin bootstrap cleans permission fields against the new schema. Without it,\n * the cleanup drops every renamed field from every role but the super admin.\n *\n * `strapi.contentTypes` / `strapi.components` already hold the new schema at\n * that point, so every new field path is mapped back to the path it had before\n * the renames, segment by segment (a component field path goes through its\n * parent's component). This also composes a parent rename with a rename inside\n * its component in the same save.\n */\nexport const createPermissionFieldRenamer = ({\n  strapi,\n}: {\n  strapi: Core.Strapi;\n}): AttributeRenameHandler => {\n  const getOldPath = (\n    subject: string,\n    path: string,\n    originsOf: Record<string, Record<string, string>>\n  ): string => {\n    let ownerUid = subject;\n    let owner: Struct.Schema | undefined =\n      strapi.contentTypes[subject as keyof typeof strapi.contentTypes];\n\n    return path\n      .split('.')\n      .map((segment) => {\n        const origin = originsOf[ownerUid]?.[segment] ?? segment;\n        const attribute = owner?.attributes?.[segment] as\n          | { type?: string; component?: string }\n          | undefined;\n\n        if (attribute?.type === 'component' && attribute.component) {\n          ownerUid = attribute.component;\n          owner = strapi.components[attribute.component as keyof typeof strapi.components];\n        } else {\n          owner = undefined;\n        }\n\n        return origin;\n      })\n      .join('.');\n  };\n\n  /**\n   * `old path -> new path` per subject, for the subjects with at least one\n   * renamed path.\n   */\n  const getRenamedPaths = (renames: AttributeRenames): Map<string, Record<string, string>> => {\n    // Per model: final name -> origin name.\n    const originsOf: Record<string, Record<string, string>> = {};\n    for (const [uid, mapping] of Object.entries(renames)) {\n      originsOf[uid] = invert(mapping);\n    }\n\n    const renamedPaths = new Map<string, Record<string, string>>();\n\n    for (const [subject, contentType] of Object.entries(strapi.contentTypes)) {\n      const paths = getNestedFieldsWithIntermediate(contentType as Struct.ContentTypeSchema, {\n        components: strapi.components,\n      });\n\n      const byOldPath: Record<string, string> = {};\n      for (const path of paths) {\n        const oldPath = getOldPath(subject, path, originsOf);\n        if (oldPath !== path) {\n          byOldPath[oldPath] = path;\n        }\n      }\n\n      if (!isEmpty(byOldPath)) {\n        renamedPaths.set(subject, byOldPath);\n      }\n    }\n\n    return renamedPaths;\n  };\n\n  return async (trx, renames) => {\n    if (isEmpty(renames)) {\n      return;\n    }\n\n    // Fresh database: the table is created by schema sync after the migrations.\n    const { tableName } = strapi.db.metadata.get(PERMISSION_UID);\n    if (!(await strapi.db.getSchemaConnection(trx).hasTable(tableName))) {\n      return;\n    }\n\n    const renamedPaths = getRenamedPaths(renames);\n    if (renamedPaths.size === 0) {\n      return;\n    }\n\n    // Joins the migration transaction.\n    const permissions = (await strapi.db.query(PERMISSION_UID).findMany({\n      select: ['id', 'subject', 'properties'],\n      where: { subject: { $in: [...renamedPaths.keys()] } },\n    })) as PermissionRow[];\n\n    for (const permission of permissions) {\n      const fields = permission.properties?.fields;\n      const byOldPath = permission.subject ? renamedPaths.get(permission.subject) : undefined;\n\n      if (!Array.isArray(fields) || !byOldPath) {\n        continue;\n      }\n\n      // One pass over the old paths, so a swap is applied once.\n      const newFields = uniq(fields.map((field: string) => byOldPath[field] ?? field));\n\n      if (xor(fields, newFields).length === 0) {\n        continue;\n      }\n\n      await strapi.db.query(PERMISSION_UID).update({\n        where: { id: permission.id },\n        data: { properties: { ...permission.properties, fields: newFields } },\n      });\n    }\n  };\n};\n"],"names":["PERMISSION_UID","createPermissionFieldRenamer","strapi","getOldPath","subject","path","originsOf","ownerUid","owner","contentTypes","split","map","segment","origin","attribute","attributes","type","component","components","undefined","join","getRenamedPaths","renames","uid","mapping","Object","entries","invert","renamedPaths","Map","contentType","paths","getNestedFieldsWithIntermediate","byOldPath","oldPath","isEmpty","set","trx","tableName","db","metadata","get","getSchemaConnection","hasTable","size","permissions","query","findMany","select","where","$in","keys","permission","fields","properties","Array","isArray","newFields","uniq","field","xor","length","update","id","data"],"mappings":"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"}

package/dist/server/server/src/services/permission/sections-builder/index.js

@@ -1,10 +1,10 @@
 'use strict';
 
-var fp = require('lodash/fp');
+var _ = require('lodash');
 var builder = require('./builder.js');
 var handlers = require('./handlers.js');
 
-const sectionPropMatcher = fp.propEq('section');
+const sectionPropMatcher = (section)=>_.matchesProperty('section', section);
 const createContentTypesInitialState = ()=>({
         actions: [],
         subjects: []

package/dist/server/server/src/services/permission/sections-builder/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":["../../../../../../../server/src/services/permission/sections-builder/index.ts"],"sourcesContent":["import { propEq } from 'lodash/fp';\nimport createSectionBuilder from './builder';\nimport {\n  subjectsHandlerFor,\n  contentTypesBase,\n  fieldsProperty,\n  plugins as pluginsHandler,\n  settings as settingsHandler,\n} from './handlers';\n\nconst sectionPropMatcher = propEq('section');\n\nconst createContentTypesInitialState = () => ({\n  actions: [],\n  subjects: [],\n});\n\nconst createDefaultSectionBuilder = () => {\n  const builder = createSectionBuilder();\n\n  builder.createSection('plugins', {\n    initialStateFactory: () => [],\n    handlers: [pluginsHandler],\n    matchers: [sectionPropMatcher('plugins')],\n  });\n\n  builder.createSection('settings', {\n    initialStateFactory: () => [],\n    handlers: [settingsHandler],\n    matchers: [sectionPropMatcher('settings')],\n  });\n\n  builder.createSection('singleTypes', {\n    initialStateFactory: createContentTypesInitialState,\n    handlers: [contentTypesBase, subjectsHandlerFor('singleType'), fieldsProperty],\n    matchers: [sectionPropMatcher('contentTypes')],\n  });\n\n  builder.createSection('collectionTypes', {\n    initialStateFactory: createContentTypesInitialState,\n    handlers: [contentTypesBase, subjectsHandlerFor('collectionType'), fieldsProperty],\n    matchers: [sectionPropMatcher('contentTypes')],\n  });\n\n  return builder;\n};\n\nexport default createDefaultSectionBuilder;\n"],"names":["sectionPropMatcher","propEq","createContentTypesInitialState","actions","subjects","createDefaultSectionBuilder","builder","createSectionBuilder","createSection","initialStateFactory","handlers","pluginsHandler","matchers","settingsHandler","contentTypesBase","subjectsHandlerFor","fieldsProperty"],"mappings":";;;;;;AAUA,MAAMA,qBAAqBC,SAAAA,CAAO,SAAA,CAAA;AAElC,MAAMC,8BAAAA,GAAiC,KAAO;AAC5CC,QAAAA,OAAAA,EAAS,EAAE;AACXC,QAAAA,QAAAA,EAAU;KACZ,CAAA;AAEA,MAAMC,2BAAAA,GAA8B,IAAA;AAClC,IAAA,MAAMC,SAAAA,GAAUC,OAAAA,EAAAA;IAEhBD,SAAAA,CAAQE,aAAa,CAAC,SAAA,EAAW;AAC/BC,QAAAA,mBAAAA,EAAqB,IAAM,EAAE;QAC7BC,QAAAA,EAAU;AAACC,YAAAA;AAAe,SAAA;QAC1BC,QAAAA,EAAU;YAACZ,kBAAAA,CAAmB,SAAA;AAAW;AAC3C,KAAA,CAAA;IAEAM,SAAAA,CAAQE,aAAa,CAAC,UAAA,EAAY;AAChCC,QAAAA,mBAAAA,EAAqB,IAAM,EAAE;QAC7BC,QAAAA,EAAU;AAACG,YAAAA;AAAgB,SAAA;QAC3BD,QAAAA,EAAU;YAACZ,kBAAAA,CAAmB,UAAA;AAAY;AAC5C,KAAA,CAAA;IAEAM,SAAAA,CAAQE,aAAa,CAAC,aAAA,EAAe;QACnCC,mBAAAA,EAAqBP,8BAAAA;QACrBQ,QAAAA,EAAU;AAACI,YAAAA,yBAAAA;YAAkBC,2BAAAA,CAAmB,YAAA,CAAA;AAAeC,YAAAA;AAAe,SAAA;QAC9EJ,QAAAA,EAAU;YAACZ,kBAAAA,CAAmB,cAAA;AAAgB;AAChD,KAAA,CAAA;IAEAM,SAAAA,CAAQE,aAAa,CAAC,iBAAA,EAAmB;QACvCC,mBAAAA,EAAqBP,8BAAAA;QACrBQ,QAAAA,EAAU;AAACI,YAAAA,yBAAAA;YAAkBC,2BAAAA,CAAmB,gBAAA,CAAA;AAAmBC,YAAAA;AAAe,SAAA;QAClFJ,QAAAA,EAAU;YAACZ,kBAAAA,CAAmB,cAAA;AAAgB;AAChD,KAAA,CAAA;IAEA,OAAOM,SAAAA;AACT;;;;"}
+{"version":3,"file":"index.js","sources":["../../../../../../../server/src/services/permission/sections-builder/index.ts"],"sourcesContent":["import { matchesProperty } from 'lodash';\nimport createSectionBuilder from './builder';\nimport {\n  subjectsHandlerFor,\n  contentTypesBase,\n  fieldsProperty,\n  plugins as pluginsHandler,\n  settings as settingsHandler,\n} from './handlers';\n\nconst sectionPropMatcher = (section: string) => matchesProperty('section', section);\n\nconst createContentTypesInitialState = () => ({\n  actions: [],\n  subjects: [],\n});\n\nconst createDefaultSectionBuilder = () => {\n  const builder = createSectionBuilder();\n\n  builder.createSection('plugins', {\n    initialStateFactory: () => [],\n    handlers: [pluginsHandler],\n    matchers: [sectionPropMatcher('plugins')],\n  });\n\n  builder.createSection('settings', {\n    initialStateFactory: () => [],\n    handlers: [settingsHandler],\n    matchers: [sectionPropMatcher('settings')],\n  });\n\n  builder.createSection('singleTypes', {\n    initialStateFactory: createContentTypesInitialState,\n    handlers: [contentTypesBase, subjectsHandlerFor('singleType'), fieldsProperty],\n    matchers: [sectionPropMatcher('contentTypes')],\n  });\n\n  builder.createSection('collectionTypes', {\n    initialStateFactory: createContentTypesInitialState,\n    handlers: [contentTypesBase, subjectsHandlerFor('collectionType'), fieldsProperty],\n    matchers: [sectionPropMatcher('contentTypes')],\n  });\n\n  return builder;\n};\n\nexport default createDefaultSectionBuilder;\n"],"names":["sectionPropMatcher","section","matchesProperty","createContentTypesInitialState","actions","subjects","createDefaultSectionBuilder","builder","createSectionBuilder","createSection","initialStateFactory","handlers","pluginsHandler","matchers","settingsHandler","contentTypesBase","subjectsHandlerFor","fieldsProperty"],"mappings":";;;;;;AAUA,MAAMA,kBAAAA,GAAqB,CAACC,OAAAA,GAAoBC,iBAAAA,CAAgB,SAAA,EAAWD,OAAAA,CAAAA;AAE3E,MAAME,8BAAAA,GAAiC,KAAO;AAC5CC,QAAAA,OAAAA,EAAS,EAAE;AACXC,QAAAA,QAAAA,EAAU;KACZ,CAAA;AAEA,MAAMC,2BAAAA,GAA8B,IAAA;AAClC,IAAA,MAAMC,SAAAA,GAAUC,OAAAA,EAAAA;IAEhBD,SAAAA,CAAQE,aAAa,CAAC,SAAA,EAAW;AAC/BC,QAAAA,mBAAAA,EAAqB,IAAM,EAAE;QAC7BC,QAAAA,EAAU;AAACC,YAAAA;AAAe,SAAA;QAC1BC,QAAAA,EAAU;YAACb,kBAAAA,CAAmB,SAAA;AAAW;AAC3C,KAAA,CAAA;IAEAO,SAAAA,CAAQE,aAAa,CAAC,UAAA,EAAY;AAChCC,QAAAA,mBAAAA,EAAqB,IAAM,EAAE;QAC7BC,QAAAA,EAAU;AAACG,YAAAA;AAAgB,SAAA;QAC3BD,QAAAA,EAAU;YAACb,kBAAAA,CAAmB,UAAA;AAAY;AAC5C,KAAA,CAAA;IAEAO,SAAAA,CAAQE,aAAa,CAAC,aAAA,EAAe;QACnCC,mBAAAA,EAAqBP,8BAAAA;QACrBQ,QAAAA,EAAU;AAACI,YAAAA,yBAAAA;YAAkBC,2BAAAA,CAAmB,YAAA,CAAA;AAAeC,YAAAA;AAAe,SAAA;QAC9EJ,QAAAA,EAAU;YAACb,kBAAAA,CAAmB,cAAA;AAAgB;AAChD,KAAA,CAAA;IAEAO,SAAAA,CAAQE,aAAa,CAAC,iBAAA,EAAmB;QACvCC,mBAAAA,EAAqBP,8BAAAA;QACrBQ,QAAAA,EAAU;AAACI,YAAAA,yBAAAA;YAAkBC,2BAAAA,CAAmB,gBAAA,CAAA;AAAmBC,YAAAA;AAAe,SAAA;QAClFJ,QAAAA,EAAU;YAACb,kBAAAA,CAAmB,cAAA;AAAgB;AAChD,KAAA,CAAA;IAEA,OAAOO,SAAAA;AACT;;;;"}

package/dist/server/server/src/services/permission/sections-builder/index.mjs

@@ -1,8 +1,8 @@
-import { propEq } from 'lodash/fp';
+import { matchesProperty } from 'lodash';
 import createSectionBuilder from './builder.mjs';
 import { plugins, settings, contentTypesBase, fieldsProperty, subjectsHandlerFor } from './handlers.mjs';
 
-const sectionPropMatcher = propEq('section');
+const sectionPropMatcher = (section)=>matchesProperty('section', section);
 const createContentTypesInitialState = ()=>({
         actions: [],
         subjects: []

package/dist/server/server/src/services/permission/sections-builder/index.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.mjs","sources":["../../../../../../../server/src/services/permission/sections-builder/index.ts"],"sourcesContent":["import { propEq } from 'lodash/fp';\nimport createSectionBuilder from './builder';\nimport {\n  subjectsHandlerFor,\n  contentTypesBase,\n  fieldsProperty,\n  plugins as pluginsHandler,\n  settings as settingsHandler,\n} from './handlers';\n\nconst sectionPropMatcher = propEq('section');\n\nconst createContentTypesInitialState = () => ({\n  actions: [],\n  subjects: [],\n});\n\nconst createDefaultSectionBuilder = () => {\n  const builder = createSectionBuilder();\n\n  builder.createSection('plugins', {\n    initialStateFactory: () => [],\n    handlers: [pluginsHandler],\n    matchers: [sectionPropMatcher('plugins')],\n  });\n\n  builder.createSection('settings', {\n    initialStateFactory: () => [],\n    handlers: [settingsHandler],\n    matchers: [sectionPropMatcher('settings')],\n  });\n\n  builder.createSection('singleTypes', {\n    initialStateFactory: createContentTypesInitialState,\n    handlers: [contentTypesBase, subjectsHandlerFor('singleType'), fieldsProperty],\n    matchers: [sectionPropMatcher('contentTypes')],\n  });\n\n  builder.createSection('collectionTypes', {\n    initialStateFactory: createContentTypesInitialState,\n    handlers: [contentTypesBase, subjectsHandlerFor('collectionType'), fieldsProperty],\n    matchers: [sectionPropMatcher('contentTypes')],\n  });\n\n  return builder;\n};\n\nexport default createDefaultSectionBuilder;\n"],"names":["sectionPropMatcher","propEq","createContentTypesInitialState","actions","subjects","createDefaultSectionBuilder","builder","createSectionBuilder","createSection","initialStateFactory","handlers","pluginsHandler","matchers","settingsHandler","contentTypesBase","subjectsHandlerFor","fieldsProperty"],"mappings":";;;;AAUA,MAAMA,qBAAqBC,MAAAA,CAAO,SAAA,CAAA;AAElC,MAAMC,8BAAAA,GAAiC,KAAO;AAC5CC,QAAAA,OAAAA,EAAS,EAAE;AACXC,QAAAA,QAAAA,EAAU;KACZ,CAAA;AAEA,MAAMC,2BAAAA,GAA8B,IAAA;AAClC,IAAA,MAAMC,OAAAA,GAAUC,oBAAAA,EAAAA;IAEhBD,OAAAA,CAAQE,aAAa,CAAC,SAAA,EAAW;AAC/BC,QAAAA,mBAAAA,EAAqB,IAAM,EAAE;QAC7BC,QAAAA,EAAU;AAACC,YAAAA;AAAe,SAAA;QAC1BC,QAAAA,EAAU;YAACZ,kBAAAA,CAAmB,SAAA;AAAW;AAC3C,KAAA,CAAA;IAEAM,OAAAA,CAAQE,aAAa,CAAC,UAAA,EAAY;AAChCC,QAAAA,mBAAAA,EAAqB,IAAM,EAAE;QAC7BC,QAAAA,EAAU;AAACG,YAAAA;AAAgB,SAAA;QAC3BD,QAAAA,EAAU;YAACZ,kBAAAA,CAAmB,UAAA;AAAY;AAC5C,KAAA,CAAA;IAEAM,OAAAA,CAAQE,aAAa,CAAC,aAAA,EAAe;QACnCC,mBAAAA,EAAqBP,8BAAAA;QACrBQ,QAAAA,EAAU;AAACI,YAAAA,gBAAAA;YAAkBC,kBAAAA,CAAmB,YAAA,CAAA;AAAeC,YAAAA;AAAe,SAAA;QAC9EJ,QAAAA,EAAU;YAACZ,kBAAAA,CAAmB,cAAA;AAAgB;AAChD,KAAA,CAAA;IAEAM,OAAAA,CAAQE,aAAa,CAAC,iBAAA,EAAmB;QACvCC,mBAAAA,EAAqBP,8BAAAA;QACrBQ,QAAAA,EAAU;AAACI,YAAAA,gBAAAA;YAAkBC,kBAAAA,CAAmB,gBAAA,CAAA;AAAmBC,YAAAA;AAAe,SAAA;QAClFJ,QAAAA,EAAU;YAACZ,kBAAAA,CAAmB,cAAA;AAAgB;AAChD,KAAA,CAAA;IAEA,OAAOM,OAAAA;AACT;;;;"}
+{"version":3,"file":"index.mjs","sources":["../../../../../../../server/src/services/permission/sections-builder/index.ts"],"sourcesContent":["import { matchesProperty } from 'lodash';\nimport createSectionBuilder from './builder';\nimport {\n  subjectsHandlerFor,\n  contentTypesBase,\n  fieldsProperty,\n  plugins as pluginsHandler,\n  settings as settingsHandler,\n} from './handlers';\n\nconst sectionPropMatcher = (section: string) => matchesProperty('section', section);\n\nconst createContentTypesInitialState = () => ({\n  actions: [],\n  subjects: [],\n});\n\nconst createDefaultSectionBuilder = () => {\n  const builder = createSectionBuilder();\n\n  builder.createSection('plugins', {\n    initialStateFactory: () => [],\n    handlers: [pluginsHandler],\n    matchers: [sectionPropMatcher('plugins')],\n  });\n\n  builder.createSection('settings', {\n    initialStateFactory: () => [],\n    handlers: [settingsHandler],\n    matchers: [sectionPropMatcher('settings')],\n  });\n\n  builder.createSection('singleTypes', {\n    initialStateFactory: createContentTypesInitialState,\n    handlers: [contentTypesBase, subjectsHandlerFor('singleType'), fieldsProperty],\n    matchers: [sectionPropMatcher('contentTypes')],\n  });\n\n  builder.createSection('collectionTypes', {\n    initialStateFactory: createContentTypesInitialState,\n    handlers: [contentTypesBase, subjectsHandlerFor('collectionType'), fieldsProperty],\n    matchers: [sectionPropMatcher('contentTypes')],\n  });\n\n  return builder;\n};\n\nexport default createDefaultSectionBuilder;\n"],"names":["sectionPropMatcher","section","matchesProperty","createContentTypesInitialState","actions","subjects","createDefaultSectionBuilder","builder","createSectionBuilder","createSection","initialStateFactory","handlers","pluginsHandler","matchers","settingsHandler","contentTypesBase","subjectsHandlerFor","fieldsProperty"],"mappings":";;;;AAUA,MAAMA,kBAAAA,GAAqB,CAACC,OAAAA,GAAoBC,eAAAA,CAAgB,SAAA,EAAWD,OAAAA,CAAAA;AAE3E,MAAME,8BAAAA,GAAiC,KAAO;AAC5CC,QAAAA,OAAAA,EAAS,EAAE;AACXC,QAAAA,QAAAA,EAAU;KACZ,CAAA;AAEA,MAAMC,2BAAAA,GAA8B,IAAA;AAClC,IAAA,MAAMC,OAAAA,GAAUC,oBAAAA,EAAAA;IAEhBD,OAAAA,CAAQE,aAAa,CAAC,SAAA,EAAW;AAC/BC,QAAAA,mBAAAA,EAAqB,IAAM,EAAE;QAC7BC,QAAAA,EAAU;AAACC,YAAAA;AAAe,SAAA;QAC1BC,QAAAA,EAAU;YAACb,kBAAAA,CAAmB,SAAA;AAAW;AAC3C,KAAA,CAAA;IAEAO,OAAAA,CAAQE,aAAa,CAAC,UAAA,EAAY;AAChCC,QAAAA,mBAAAA,EAAqB,IAAM,EAAE;QAC7BC,QAAAA,EAAU;AAACG,YAAAA;AAAgB,SAAA;QAC3BD,QAAAA,EAAU;YAACb,kBAAAA,CAAmB,UAAA;AAAY;AAC5C,KAAA,CAAA;IAEAO,OAAAA,CAAQE,aAAa,CAAC,aAAA,EAAe;QACnCC,mBAAAA,EAAqBP,8BAAAA;QACrBQ,QAAAA,EAAU;AAACI,YAAAA,gBAAAA;YAAkBC,kBAAAA,CAAmB,YAAA,CAAA;AAAeC,YAAAA;AAAe,SAAA;QAC9EJ,QAAAA,EAAU;YAACb,kBAAAA,CAAmB,cAAA;AAAgB;AAChD,KAAA,CAAA;IAEAO,OAAAA,CAAQE,aAAa,CAAC,iBAAA,EAAmB;QACvCC,mBAAAA,EAAqBP,8BAAAA;QACrBQ,QAAAA,EAAU;AAACI,YAAAA,gBAAAA;YAAkBC,kBAAAA,CAAmB,gBAAA,CAAA;AAAmBC,YAAAA;AAAe,SAAA;QAClFJ,QAAAA,EAAU;YAACb,kBAAAA,CAAmB,cAAA;AAAgB;AAChD,KAAA,CAAA;IAEA,OAAOO,OAAAA;AACT;;;;"}

package/dist/server/server/src/services/permission/sections-builder/section.js

@@ -1,6 +1,5 @@
 'use strict';
 
-var fp = require('lodash/fp');
 var utils = require('@strapi/utils');
 
 const emptyObjectFactory = ()=>({});
@@ -23,7 +22,7 @@ const emptyObjectFactory = ()=>({});
      * If any of the registered matcher functions returns true, then the condition applies.
      */ async appliesToAction (action) {
             const results = await state.hooks.matchers.call(action);
-            return results.some(fp.eq(true));
+            return results.some((result)=>result === true);
         },
         /**
      * Init, build and returns a section object based on the given actions