@strapi/admin 5.55.1 → 5.57.0

package/dist/server/server/src/domain/permission/index.js

@@ -2,7 +2,8 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var fp = require('lodash/fp');
+var utils = require('@strapi/utils');
+var _ = require('lodash');
 
 const permissionFields = [
     'id',
@@ -22,7 +23,7 @@ const sanitizedPermissionFields = [
     'properties',
     'conditions'
 ];
-const sanitizePermissionFields = fp.pick(sanitizedPermissionFields);
+const sanitizePermissionFields = (permission)=>_.pick(permission, sanitizedPermissionFields);
 /**
  * Creates a permission with default values
  */ const getDefaultPermission = ()=>({
@@ -36,57 +37,65 @@ const sanitizePermissionFields = fp.pick(sanitizedPermissionFields);
  * @param condition - The condition to add
  * @param permission - The permission on which we want to add the condition
  * @return
- */ const addCondition = fp.curry((condition, permission)=>{
+ */ const addCondition = _.curry((condition, permission)=>{
     const { conditions } = permission;
-    const newConditions = Array.isArray(conditions) ? fp.uniq(conditions.concat(condition)) : [
+    const newConditions = Array.isArray(conditions) ? [
+        ...new Set(conditions.concat(condition))
+    ] : [
         condition
     ];
-    return fp.set('conditions', newConditions, permission);
+    return {
+        ...permission,
+        conditions: newConditions
+    };
 });
 /**
  * Returns a new permission without the given condition
  * @param condition - The condition to remove
  * @param permission - The permission on which we want to remove the condition
- */ const removeCondition = fp.curry((condition, permission)=>{
-    return fp.set('conditions', fp.remove(fp.eq(condition), permission.conditions), permission);
+ */ const removeCondition = _.curry((condition, permission)=>{
+    return {
+        ...permission,
+        conditions: _.reject(permission.conditions, (value)=>value === condition)
+    };
 });
 /**
  * Gets a property or a part of a property from a permission.
  * @param property - The property to get
  * @param permission - The permission on which we want to access the property
- */ const getProperty = fp.curry((property, permission)=>fp.get(`properties.${property}`, permission));
+ */ const getProperty = _.curry((property, permission)=>_.get(permission, `properties.${property}`));
 /**
  * Set a value for a given property on a new permission object
  * @param property - The name of the property
  * @param value - The value of the property
  * @param permission - The permission on which we want to set the property
  */ const setProperty = (property, value, permission)=>{
-    return fp.set(`properties.${property}`, value, permission);
+    return utils.objects.set(permission, `properties.${property}`, value);
 };
 /**
  * Returns a new permission without the given property name set
  * @param property - The name of the property to delete
  * @param permission - The permission on which we want to remove the property
- */ const deleteProperty = (property, permission)=>fp.omit(`properties.${property}`, permission);
+ */ const deleteProperty = (property, permission)=>_.omit(permission, `properties.${property}`);
 /**
  * Creates a new {@link Permission} object from raw attributes. Set default values for certain fields
  * @param  attributes
  */ const create = (attributes)=>{
-    return fp.pipe(fp.pick(permissionFields), fp.merge(getDefaultPermission()))(attributes);
+    return _.merge({}, getDefaultPermission(), _.pick(attributes, permissionFields));
 };
 /**
  * Using the given condition provider, check and remove invalid condition from the permission's condition array.
  * @param provider - The condition provider used to do the checks
  * @param permission - The condition to sanitize
- */ const sanitizeConditions = fp.curry((provider, permission)=>{
-    if (!fp.isArray(permission.conditions)) {
+ */ const sanitizeConditions = _.curry((provider, permission)=>{
+    if (!Array.isArray(permission.conditions)) {
         return permission;
     }
     return permission.conditions.filter((condition)=>!provider.has(condition)).reduce((perm, condition)=>removeCondition(condition, perm), permission);
 });
 function toPermission(payload) {
-    if (fp.isArray(payload)) {
-        return fp.map((value)=>create(value), payload);
+    if (Array.isArray(payload)) {
+        return Array.from(payload, (value)=>create(value));
     }
     return create(payload);
 }

package/dist/server/server/src/domain/permission/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":["../../../../../../server/src/domain/permission/index.ts"],"sourcesContent":["import type { Utils } from '@strapi/types';\n\nimport { providerFactory } from '@strapi/utils';\nimport {\n  pipe,\n  set,\n  pick,\n  eq,\n  omit,\n  remove,\n  get,\n  uniq,\n  isArray,\n  map,\n  curry,\n  merge,\n} from 'lodash/fp';\nimport { Permission } from '../../../../shared/contracts/shared';\nimport { SanitizedPermission } from '../../../../shared/contracts/roles';\n\nexport type CreatePermissionPayload = Utils.Object.PartialBy<\n  Permission,\n  'actionParameters' | 'conditions' | 'properties' | 'subject' | 'id' | 'createdAt' | 'updatedAt'\n>;\n\ntype Provider = ReturnType<typeof providerFactory>;\n\nexport const permissionFields = [\n  'id',\n  'action',\n  'actionParameters',\n  'subject',\n  'properties',\n  'conditions',\n  'role',\n  'apiToken',\n];\nexport const sanitizedPermissionFields = [\n  'id',\n  'action',\n  'actionParameters',\n  'subject',\n  'properties',\n  'conditions',\n] as const;\n\nexport const sanitizePermissionFields: (p: Permission) => SanitizedPermission =\n  pick(sanitizedPermissionFields);\n\n/**\n * Creates a permission with default values\n */\nconst getDefaultPermission = () => ({\n  actionParameters: {},\n  conditions: [],\n  properties: {},\n  subject: null,\n});\n\n/**\n * Returns a new permission with the given condition\n * @param condition - The condition to add\n * @param permission - The permission on which we want to add the condition\n * @return\n */\nexport const addCondition = curry((condition: string, permission: Permission): Permission => {\n  const { conditions } = permission;\n  const newConditions = Array.isArray(conditions)\n    ? uniq(conditions.concat(condition))\n    : [condition];\n\n  return set('conditions', newConditions, permission);\n});\n\n/**\n * Returns a new permission without the given condition\n * @param condition - The condition to remove\n * @param permission - The permission on which we want to remove the condition\n */\nexport const removeCondition = curry((condition: string, permission: Permission): Permission => {\n  return set('conditions', remove(eq(condition), permission.conditions), permission);\n});\n\n/**\n * Gets a property or a part of a property from a permission.\n * @param property - The property to get\n * @param permission - The permission on which we want to access the property\n */\nexport const getProperty = curry(\n  (property: string, permission: Permission): Permission =>\n    get(`properties.${property}`, permission)\n);\n\n/**\n * Set a value for a given property on a new permission object\n * @param property - The name of the property\n * @param value - The value of the property\n * @param permission - The permission on which we want to set the property\n */\nexport const setProperty = (\n  property: string,\n  value: unknown,\n  permission: Permission\n): Permission => {\n  return set(`properties.${property}`, value, permission);\n};\n\n/**\n * Returns a new permission without the given property name set\n * @param property - The name of the property to delete\n * @param permission - The permission on which we want to remove the property\n */\nexport const deleteProperty = <TProperty extends string>(\n  property: TProperty,\n  permission: Permission\n) => omit(`properties.${property}`, permission) as Omit<Permission, TProperty>;\n\n/**\n * Creates a new {@link Permission} object from raw attributes. Set default values for certain fields\n * @param  attributes\n */\nexport const create = (attributes: CreatePermissionPayload) => {\n  return pipe(pick(permissionFields), merge(getDefaultPermission()))(attributes) as Permission;\n};\n\n/**\n * Using the given condition provider, check and remove invalid condition from the permission's condition array.\n * @param provider - The condition provider used to do the checks\n * @param permission - The condition to sanitize\n */\nexport const sanitizeConditions = curry(\n  (provider: Provider, permission: Permission): Permission => {\n    if (!isArray(permission.conditions)) {\n      return permission;\n    }\n\n    return permission.conditions\n      .filter((condition: string) => !provider.has(condition))\n      .reduce(\n        (perm: Permission, condition: string) => removeCondition(condition, perm),\n        permission\n      );\n  }\n);\n\n/**\n * Transform raw attributes into valid permissions using the create domain function.\n * @param  payload - Can either be a single object of attributes or an array of those objects.\n */\n\nfunction toPermission<T extends CreatePermissionPayload>(payload: T[]): Permission[];\nfunction toPermission<T extends CreatePermissionPayload>(payload: T): Permission;\nfunction toPermission<T extends CreatePermissionPayload>(\n  payload: T[] | T\n): Permission[] | Permission {\n  if (isArray(payload)) {\n    return map((value) => create(value), payload);\n  }\n\n  return create(payload);\n}\n\nexport { toPermission };\n\nexport default {\n  addCondition,\n  removeCondition,\n  create,\n  deleteProperty,\n  permissionFields,\n  getProperty,\n  sanitizedPermissionFields,\n  sanitizeConditions,\n  sanitizePermissionFields,\n  setProperty,\n  toPermission,\n};\n"],"names":["permissionFields","sanitizedPermissionFields","sanitizePermissionFields","pick","getDefaultPermission","actionParameters","conditions","properties","subject","addCondition","curry","condition","permission","newConditions","Array","isArray","uniq","concat","set","removeCondition","remove","eq","getProperty","property","get","setProperty","value","deleteProperty","omit","create","attributes","pipe","merge","sanitizeConditions","provider","filter","has","reduce","perm","toPermission","payload","map"],"mappings":"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"}
+{"version":3,"file":"index.js","sources":["../../../../../../server/src/domain/permission/index.ts"],"sourcesContent":["import { objects, providerFactory } from '@strapi/utils';\nimport { pick, reject, merge, omit, get, curry } from 'lodash';\nimport type { Utils } from '@strapi/types';\n\nimport { Permission } from '../../../../shared/contracts/shared';\nimport { SanitizedPermission } from '../../../../shared/contracts/roles';\n\nexport type CreatePermissionPayload = Utils.Object.PartialBy<\n  Permission,\n  'actionParameters' | 'conditions' | 'properties' | 'subject' | 'id' | 'createdAt' | 'updatedAt'\n>;\n\ntype Provider = ReturnType<typeof providerFactory>;\n\nexport const permissionFields = [\n  'id',\n  'action',\n  'actionParameters',\n  'subject',\n  'properties',\n  'conditions',\n  'role',\n  'apiToken',\n];\nexport const sanitizedPermissionFields = [\n  'id',\n  'action',\n  'actionParameters',\n  'subject',\n  'properties',\n  'conditions',\n] as const;\n\nexport const sanitizePermissionFields: (p: Permission) => SanitizedPermission = (permission) =>\n  pick(permission, sanitizedPermissionFields);\n\n/**\n * Creates a permission with default values\n */\nconst getDefaultPermission = () => ({\n  actionParameters: {},\n  conditions: [],\n  properties: {},\n  subject: null,\n});\n\n/**\n * Returns a new permission with the given condition\n * @param condition - The condition to add\n * @param permission - The permission on which we want to add the condition\n * @return\n */\nexport const addCondition = curry((condition: string, permission: Permission): Permission => {\n  const { conditions } = permission;\n  const newConditions = Array.isArray(conditions)\n    ? [...new Set(conditions.concat(condition))]\n    : [condition];\n\n  return { ...permission, conditions: newConditions };\n});\n\n/**\n * Returns a new permission without the given condition\n * @param condition - The condition to remove\n * @param permission - The permission on which we want to remove the condition\n */\nexport const removeCondition = curry((condition: string, permission: Permission): Permission => {\n  return {\n    ...permission,\n    conditions: reject(permission.conditions, (value) => value === condition),\n  };\n});\n\n/**\n * Gets a property or a part of a property from a permission.\n * @param property - The property to get\n * @param permission - The permission on which we want to access the property\n */\nexport const getProperty = curry(\n  (property: string, permission: Permission): Permission =>\n    get(permission, `properties.${property}`)\n);\n\n/**\n * Set a value for a given property on a new permission object\n * @param property - The name of the property\n * @param value - The value of the property\n * @param permission - The permission on which we want to set the property\n */\nexport const setProperty = (\n  property: string,\n  value: unknown,\n  permission: Permission\n): Permission => {\n  return objects.set(permission, `properties.${property}`, value);\n};\n\n/**\n * Returns a new permission without the given property name set\n * @param property - The name of the property to delete\n * @param permission - The permission on which we want to remove the property\n */\nexport const deleteProperty = <TProperty extends string>(\n  property: TProperty,\n  permission: Permission\n) => omit(permission, `properties.${property}` as string) as Omit<Permission, TProperty>;\n\n/**\n * Creates a new {@link Permission} object from raw attributes. Set default values for certain fields\n * @param  attributes\n */\nexport const create = (attributes: CreatePermissionPayload) => {\n  return merge({}, getDefaultPermission(), pick(attributes, permissionFields)) as Permission;\n};\n\n/**\n * Using the given condition provider, check and remove invalid condition from the permission's condition array.\n * @param provider - The condition provider used to do the checks\n * @param permission - The condition to sanitize\n */\nexport const sanitizeConditions = curry(\n  (provider: Provider, permission: Permission): Permission => {\n    if (!Array.isArray(permission.conditions)) {\n      return permission;\n    }\n\n    return permission.conditions\n      .filter((condition: string) => !provider.has(condition))\n      .reduce(\n        (perm: Permission, condition: string) => removeCondition(condition, perm),\n        permission\n      );\n  }\n);\n\n/**\n * Transform raw attributes into valid permissions using the create domain function.\n * @param  payload - Can either be a single object of attributes or an array of those objects.\n */\n\nfunction toPermission<T extends CreatePermissionPayload>(payload: T[]): Permission[];\nfunction toPermission<T extends CreatePermissionPayload>(payload: T): Permission;\nfunction toPermission<T extends CreatePermissionPayload>(\n  payload: T[] | T\n): Permission[] | Permission {\n  if (Array.isArray(payload)) {\n    return Array.from(payload, (value) => create(value));\n  }\n\n  return create(payload);\n}\n\nexport { toPermission };\n\nexport default {\n  addCondition,\n  removeCondition,\n  create,\n  deleteProperty,\n  permissionFields,\n  getProperty,\n  sanitizedPermissionFields,\n  sanitizeConditions,\n  sanitizePermissionFields,\n  setProperty,\n  toPermission,\n};\n"],"names":["permissionFields","sanitizedPermissionFields","sanitizePermissionFields","permission","pick","getDefaultPermission","actionParameters","conditions","properties","subject","addCondition","curry","condition","newConditions","Array","isArray","Set","concat","removeCondition","reject","value","getProperty","property","get","setProperty","objects","set","deleteProperty","omit","create","attributes","merge","sanitizeConditions","provider","filter","has","reduce","perm","toPermission","payload","from"],"mappings":"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"}

package/dist/server/server/src/domain/permission/index.mjs

@@ -1,4 +1,5 @@
-import { pick, curry, uniq, set, remove, eq, get, isArray, omit, map, pipe, merge } from 'lodash/fp';
+import { objects } from '@strapi/utils';
+import { curry, reject, get, omit, pick, merge } from 'lodash';
 
 const permissionFields = [
     'id',
@@ -18,7 +19,7 @@ const sanitizedPermissionFields = [
     'properties',
     'conditions'
 ];
-const sanitizePermissionFields = pick(sanitizedPermissionFields);
+const sanitizePermissionFields = (permission)=>pick(permission, sanitizedPermissionFields);
 /**
  * Creates a permission with default values
  */ const getDefaultPermission = ()=>({
@@ -34,55 +35,63 @@ const sanitizePermissionFields = pick(sanitizedPermissionFields);
  * @return
  */ const addCondition = curry((condition, permission)=>{
     const { conditions } = permission;
-    const newConditions = Array.isArray(conditions) ? uniq(conditions.concat(condition)) : [
+    const newConditions = Array.isArray(conditions) ? [
+        ...new Set(conditions.concat(condition))
+    ] : [
         condition
     ];
-    return set('conditions', newConditions, permission);
+    return {
+        ...permission,
+        conditions: newConditions
+    };
 });
 /**
  * Returns a new permission without the given condition
  * @param condition - The condition to remove
  * @param permission - The permission on which we want to remove the condition
  */ const removeCondition = curry((condition, permission)=>{
-    return set('conditions', remove(eq(condition), permission.conditions), permission);
+    return {
+        ...permission,
+        conditions: reject(permission.conditions, (value)=>value === condition)
+    };
 });
 /**
  * Gets a property or a part of a property from a permission.
  * @param property - The property to get
  * @param permission - The permission on which we want to access the property
- */ const getProperty = curry((property, permission)=>get(`properties.${property}`, permission));
+ */ const getProperty = curry((property, permission)=>get(permission, `properties.${property}`));
 /**
  * Set a value for a given property on a new permission object
  * @param property - The name of the property
  * @param value - The value of the property
  * @param permission - The permission on which we want to set the property
  */ const setProperty = (property, value, permission)=>{
-    return set(`properties.${property}`, value, permission);
+    return objects.set(permission, `properties.${property}`, value);
 };
 /**
  * Returns a new permission without the given property name set
  * @param property - The name of the property to delete
  * @param permission - The permission on which we want to remove the property
- */ const deleteProperty = (property, permission)=>omit(`properties.${property}`, permission);
+ */ const deleteProperty = (property, permission)=>omit(permission, `properties.${property}`);
 /**
  * Creates a new {@link Permission} object from raw attributes. Set default values for certain fields
  * @param  attributes
  */ const create = (attributes)=>{
-    return pipe(pick(permissionFields), merge(getDefaultPermission()))(attributes);
+    return merge({}, getDefaultPermission(), pick(attributes, permissionFields));
 };
 /**
  * Using the given condition provider, check and remove invalid condition from the permission's condition array.
  * @param provider - The condition provider used to do the checks
  * @param permission - The condition to sanitize
  */ const sanitizeConditions = curry((provider, permission)=>{
-    if (!isArray(permission.conditions)) {
+    if (!Array.isArray(permission.conditions)) {
         return permission;
     }
     return permission.conditions.filter((condition)=>!provider.has(condition)).reduce((perm, condition)=>removeCondition(condition, perm), permission);
 });
 function toPermission(payload) {
-    if (isArray(payload)) {
-        return map((value)=>create(value), payload);
+    if (Array.isArray(payload)) {
+        return Array.from(payload, (value)=>create(value));
     }
     return create(payload);
 }

package/dist/server/server/src/domain/permission/index.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.mjs","sources":["../../../../../../server/src/domain/permission/index.ts"],"sourcesContent":["import type { Utils } from '@strapi/types';\n\nimport { providerFactory } from '@strapi/utils';\nimport {\n  pipe,\n  set,\n  pick,\n  eq,\n  omit,\n  remove,\n  get,\n  uniq,\n  isArray,\n  map,\n  curry,\n  merge,\n} from 'lodash/fp';\nimport { Permission } from '../../../../shared/contracts/shared';\nimport { SanitizedPermission } from '../../../../shared/contracts/roles';\n\nexport type CreatePermissionPayload = Utils.Object.PartialBy<\n  Permission,\n  'actionParameters' | 'conditions' | 'properties' | 'subject' | 'id' | 'createdAt' | 'updatedAt'\n>;\n\ntype Provider = ReturnType<typeof providerFactory>;\n\nexport const permissionFields = [\n  'id',\n  'action',\n  'actionParameters',\n  'subject',\n  'properties',\n  'conditions',\n  'role',\n  'apiToken',\n];\nexport const sanitizedPermissionFields = [\n  'id',\n  'action',\n  'actionParameters',\n  'subject',\n  'properties',\n  'conditions',\n] as const;\n\nexport const sanitizePermissionFields: (p: Permission) => SanitizedPermission =\n  pick(sanitizedPermissionFields);\n\n/**\n * Creates a permission with default values\n */\nconst getDefaultPermission = () => ({\n  actionParameters: {},\n  conditions: [],\n  properties: {},\n  subject: null,\n});\n\n/**\n * Returns a new permission with the given condition\n * @param condition - The condition to add\n * @param permission - The permission on which we want to add the condition\n * @return\n */\nexport const addCondition = curry((condition: string, permission: Permission): Permission => {\n  const { conditions } = permission;\n  const newConditions = Array.isArray(conditions)\n    ? uniq(conditions.concat(condition))\n    : [condition];\n\n  return set('conditions', newConditions, permission);\n});\n\n/**\n * Returns a new permission without the given condition\n * @param condition - The condition to remove\n * @param permission - The permission on which we want to remove the condition\n */\nexport const removeCondition = curry((condition: string, permission: Permission): Permission => {\n  return set('conditions', remove(eq(condition), permission.conditions), permission);\n});\n\n/**\n * Gets a property or a part of a property from a permission.\n * @param property - The property to get\n * @param permission - The permission on which we want to access the property\n */\nexport const getProperty = curry(\n  (property: string, permission: Permission): Permission =>\n    get(`properties.${property}`, permission)\n);\n\n/**\n * Set a value for a given property on a new permission object\n * @param property - The name of the property\n * @param value - The value of the property\n * @param permission - The permission on which we want to set the property\n */\nexport const setProperty = (\n  property: string,\n  value: unknown,\n  permission: Permission\n): Permission => {\n  return set(`properties.${property}`, value, permission);\n};\n\n/**\n * Returns a new permission without the given property name set\n * @param property - The name of the property to delete\n * @param permission - The permission on which we want to remove the property\n */\nexport const deleteProperty = <TProperty extends string>(\n  property: TProperty,\n  permission: Permission\n) => omit(`properties.${property}`, permission) as Omit<Permission, TProperty>;\n\n/**\n * Creates a new {@link Permission} object from raw attributes. Set default values for certain fields\n * @param  attributes\n */\nexport const create = (attributes: CreatePermissionPayload) => {\n  return pipe(pick(permissionFields), merge(getDefaultPermission()))(attributes) as Permission;\n};\n\n/**\n * Using the given condition provider, check and remove invalid condition from the permission's condition array.\n * @param provider - The condition provider used to do the checks\n * @param permission - The condition to sanitize\n */\nexport const sanitizeConditions = curry(\n  (provider: Provider, permission: Permission): Permission => {\n    if (!isArray(permission.conditions)) {\n      return permission;\n    }\n\n    return permission.conditions\n      .filter((condition: string) => !provider.has(condition))\n      .reduce(\n        (perm: Permission, condition: string) => removeCondition(condition, perm),\n        permission\n      );\n  }\n);\n\n/**\n * Transform raw attributes into valid permissions using the create domain function.\n * @param  payload - Can either be a single object of attributes or an array of those objects.\n */\n\nfunction toPermission<T extends CreatePermissionPayload>(payload: T[]): Permission[];\nfunction toPermission<T extends CreatePermissionPayload>(payload: T): Permission;\nfunction toPermission<T extends CreatePermissionPayload>(\n  payload: T[] | T\n): Permission[] | Permission {\n  if (isArray(payload)) {\n    return map((value) => create(value), payload);\n  }\n\n  return create(payload);\n}\n\nexport { toPermission };\n\nexport default {\n  addCondition,\n  removeCondition,\n  create,\n  deleteProperty,\n  permissionFields,\n  getProperty,\n  sanitizedPermissionFields,\n  sanitizeConditions,\n  sanitizePermissionFields,\n  setProperty,\n  toPermission,\n};\n"],"names":["permissionFields","sanitizedPermissionFields","sanitizePermissionFields","pick","getDefaultPermission","actionParameters","conditions","properties","subject","addCondition","curry","condition","permission","newConditions","Array","isArray","uniq","concat","set","removeCondition","remove","eq","getProperty","property","get","setProperty","value","deleteProperty","omit","create","attributes","pipe","merge","sanitizeConditions","provider","filter","has","reduce","perm","toPermission","payload","map"],"mappings":"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"}
+{"version":3,"file":"index.mjs","sources":["../../../../../../server/src/domain/permission/index.ts"],"sourcesContent":["import { objects, providerFactory } from '@strapi/utils';\nimport { pick, reject, merge, omit, get, curry } from 'lodash';\nimport type { Utils } from '@strapi/types';\n\nimport { Permission } from '../../../../shared/contracts/shared';\nimport { SanitizedPermission } from '../../../../shared/contracts/roles';\n\nexport type CreatePermissionPayload = Utils.Object.PartialBy<\n  Permission,\n  'actionParameters' | 'conditions' | 'properties' | 'subject' | 'id' | 'createdAt' | 'updatedAt'\n>;\n\ntype Provider = ReturnType<typeof providerFactory>;\n\nexport const permissionFields = [\n  'id',\n  'action',\n  'actionParameters',\n  'subject',\n  'properties',\n  'conditions',\n  'role',\n  'apiToken',\n];\nexport const sanitizedPermissionFields = [\n  'id',\n  'action',\n  'actionParameters',\n  'subject',\n  'properties',\n  'conditions',\n] as const;\n\nexport const sanitizePermissionFields: (p: Permission) => SanitizedPermission = (permission) =>\n  pick(permission, sanitizedPermissionFields);\n\n/**\n * Creates a permission with default values\n */\nconst getDefaultPermission = () => ({\n  actionParameters: {},\n  conditions: [],\n  properties: {},\n  subject: null,\n});\n\n/**\n * Returns a new permission with the given condition\n * @param condition - The condition to add\n * @param permission - The permission on which we want to add the condition\n * @return\n */\nexport const addCondition = curry((condition: string, permission: Permission): Permission => {\n  const { conditions } = permission;\n  const newConditions = Array.isArray(conditions)\n    ? [...new Set(conditions.concat(condition))]\n    : [condition];\n\n  return { ...permission, conditions: newConditions };\n});\n\n/**\n * Returns a new permission without the given condition\n * @param condition - The condition to remove\n * @param permission - The permission on which we want to remove the condition\n */\nexport const removeCondition = curry((condition: string, permission: Permission): Permission => {\n  return {\n    ...permission,\n    conditions: reject(permission.conditions, (value) => value === condition),\n  };\n});\n\n/**\n * Gets a property or a part of a property from a permission.\n * @param property - The property to get\n * @param permission - The permission on which we want to access the property\n */\nexport const getProperty = curry(\n  (property: string, permission: Permission): Permission =>\n    get(permission, `properties.${property}`)\n);\n\n/**\n * Set a value for a given property on a new permission object\n * @param property - The name of the property\n * @param value - The value of the property\n * @param permission - The permission on which we want to set the property\n */\nexport const setProperty = (\n  property: string,\n  value: unknown,\n  permission: Permission\n): Permission => {\n  return objects.set(permission, `properties.${property}`, value);\n};\n\n/**\n * Returns a new permission without the given property name set\n * @param property - The name of the property to delete\n * @param permission - The permission on which we want to remove the property\n */\nexport const deleteProperty = <TProperty extends string>(\n  property: TProperty,\n  permission: Permission\n) => omit(permission, `properties.${property}` as string) as Omit<Permission, TProperty>;\n\n/**\n * Creates a new {@link Permission} object from raw attributes. Set default values for certain fields\n * @param  attributes\n */\nexport const create = (attributes: CreatePermissionPayload) => {\n  return merge({}, getDefaultPermission(), pick(attributes, permissionFields)) as Permission;\n};\n\n/**\n * Using the given condition provider, check and remove invalid condition from the permission's condition array.\n * @param provider - The condition provider used to do the checks\n * @param permission - The condition to sanitize\n */\nexport const sanitizeConditions = curry(\n  (provider: Provider, permission: Permission): Permission => {\n    if (!Array.isArray(permission.conditions)) {\n      return permission;\n    }\n\n    return permission.conditions\n      .filter((condition: string) => !provider.has(condition))\n      .reduce(\n        (perm: Permission, condition: string) => removeCondition(condition, perm),\n        permission\n      );\n  }\n);\n\n/**\n * Transform raw attributes into valid permissions using the create domain function.\n * @param  payload - Can either be a single object of attributes or an array of those objects.\n */\n\nfunction toPermission<T extends CreatePermissionPayload>(payload: T[]): Permission[];\nfunction toPermission<T extends CreatePermissionPayload>(payload: T): Permission;\nfunction toPermission<T extends CreatePermissionPayload>(\n  payload: T[] | T\n): Permission[] | Permission {\n  if (Array.isArray(payload)) {\n    return Array.from(payload, (value) => create(value));\n  }\n\n  return create(payload);\n}\n\nexport { toPermission };\n\nexport default {\n  addCondition,\n  removeCondition,\n  create,\n  deleteProperty,\n  permissionFields,\n  getProperty,\n  sanitizedPermissionFields,\n  sanitizeConditions,\n  sanitizePermissionFields,\n  setProperty,\n  toPermission,\n};\n"],"names":["permissionFields","sanitizedPermissionFields","sanitizePermissionFields","permission","pick","getDefaultPermission","actionParameters","conditions","properties","subject","addCondition","curry","condition","newConditions","Array","isArray","Set","concat","removeCondition","reject","value","getProperty","property","get","setProperty","objects","set","deleteProperty","omit","create","attributes","merge","sanitizeConditions","provider","filter","has","reduce","perm","toPermission","payload","from"],"mappings":"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"}

package/dist/server/server/src/middlewares/rateLimit.js

@@ -1,8 +1,8 @@
 'use strict';
 
+var _ = require('lodash');
 var path = require('path');
 var utils = require('@strapi/utils');
-var fp = require('lodash/fp');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
@@ -16,16 +16,16 @@ var rateLimit = ((config, { strapi })=>async (ctx, next)=>{
                 enabled: true
             };
         }
-        if (!fp.has('enabled', rateLimitConfig)) {
+        if (!_.has(rateLimitConfig, 'enabled')) {
             rateLimitConfig.enabled = true;
         }
         if (rateLimitConfig.enabled === true) {
             // TODO: TS - Do the dynamic import
             // eslint-disable-next-line @typescript-eslint/no-var-requires
             const rateLimit = require('koa2-ratelimit').RateLimit;
-            const requestEmail = fp.get('request.body.email')(ctx);
-            const userEmail = fp.isString(requestEmail) ? requestEmail.toLowerCase() : 'unknownEmail';
-            const requestPath = fp.isString(ctx.request.path) ? fp.toLower(path__default.default.normalize(ctx.request.path)).replace(/\/$/, '') : 'invalidPath';
+            const requestEmail = _.get(ctx, 'request.body.email');
+            const userEmail = _.isString(requestEmail) ? requestEmail.toLowerCase() : 'unknownEmail';
+            const requestPath = _.isString(ctx.request.path) ? path__default.default.normalize(ctx.request.path).toLowerCase().replace(/\/$/, '') : 'invalidPath';
             const loadConfig = {
                 interval: {
                     min: 5

package/dist/server/server/src/middlewares/rateLimit.js.map

@@ -1 +1 @@
-{"version":3,"file":"rateLimit.js","sources":["../../../../../server/src/middlewares/rateLimit.ts"],"sourcesContent":["import type { Context, Next } from 'koa';\nimport path from 'path';\nimport { errors } from '@strapi/utils';\nimport { isString, has, toLower, get } from 'lodash/fp';\nimport type { Core } from '@strapi/types';\n\nconst { RateLimitError } = errors;\n\nexport default (config: any, { strapi }: { strapi: Core.Strapi }) =>\n  async (ctx: Context, next: Next) => {\n    let rateLimitConfig = strapi.config.get('admin.rateLimit') as any;\n\n    if (!rateLimitConfig) {\n      rateLimitConfig = {\n        enabled: true,\n      };\n    }\n\n    if (!has('enabled', rateLimitConfig)) {\n      rateLimitConfig.enabled = true;\n    }\n\n    if (rateLimitConfig.enabled === true) {\n      // TODO: TS - Do the dynamic import\n      // eslint-disable-next-line @typescript-eslint/no-var-requires\n      const rateLimit = require('koa2-ratelimit').RateLimit;\n\n      const requestEmail = get('request.body.email')(ctx);\n      const userEmail = isString(requestEmail) ? requestEmail.toLowerCase() : 'unknownEmail';\n\n      const requestPath = isString(ctx.request.path)\n        ? toLower(path.normalize(ctx.request.path)).replace(/\\/$/, '')\n        : 'invalidPath';\n\n      const loadConfig = {\n        interval: { min: 5 },\n        max: 5,\n        prefixKey: `${userEmail}:${requestPath}:${ctx.request.ip}`,\n        handler() {\n          throw new RateLimitError();\n        },\n        ...rateLimitConfig,\n        ...config,\n      };\n\n      return rateLimit.middleware(loadConfig)(ctx, next);\n    }\n\n    return next();\n  };\n"],"names":["RateLimitError","errors","config","strapi","ctx","next","rateLimitConfig","get","enabled","has","rateLimit","require","RateLimit","requestEmail","userEmail","isString","toLowerCase","requestPath","request","path","toLower","normalize","replace","loadConfig","interval","min","max","prefixKey","ip","handler","middleware"],"mappings":";;;;;;;;;;AAMA,MAAM,EAAEA,cAAc,EAAE,GAAGC,YAAAA;AAE3B,gBAAe,CAAA,CAACC,MAAAA,EAAa,EAAEC,MAAM,EAA2B,GAC9D,OAAOC,GAAAA,EAAcC,IAAAA,GAAAA;AACnB,QAAA,IAAIC,eAAAA,GAAkBH,MAAAA,CAAOD,MAAM,CAACK,GAAG,CAAC,iBAAA,CAAA;AAExC,QAAA,IAAI,CAACD,eAAAA,EAAiB;YACpBA,eAAAA,GAAkB;gBAChBE,OAAAA,EAAS;AACX,aAAA;AACF,QAAA;QAEA,IAAI,CAACC,MAAAA,CAAI,SAAA,EAAWH,eAAAA,CAAAA,EAAkB;AACpCA,YAAAA,eAAAA,CAAgBE,OAAO,GAAG,IAAA;AAC5B,QAAA;QAEA,IAAIF,eAAAA,CAAgBE,OAAO,KAAK,IAAA,EAAM;;;YAGpC,MAAME,SAAAA,GAAYC,OAAAA,CAAQ,gBAAA,CAAA,CAAkBC,SAAS;YAErD,MAAMC,YAAAA,GAAeN,OAAI,oBAAA,CAAA,CAAsBH,GAAAA,CAAAA;AAC/C,YAAA,MAAMU,SAAAA,GAAYC,WAAAA,CAASF,YAAAA,CAAAA,GAAgBA,YAAAA,CAAaG,WAAW,EAAA,GAAK,cAAA;AAExE,YAAA,MAAMC,cAAcF,WAAAA,CAASX,GAAAA,CAAIc,OAAO,CAACC,IAAI,IACzCC,UAAAA,CAAQD,qBAAAA,CAAKE,SAAS,CAACjB,GAAAA,CAAIc,OAAO,CAACC,IAAI,GAAGG,OAAO,CAAC,OAAO,EAAA,CAAA,GACzD,aAAA;AAEJ,YAAA,MAAMC,UAAAA,GAAa;gBACjBC,QAAAA,EAAU;oBAAEC,GAAAA,EAAK;AAAE,iBAAA;gBACnBC,GAAAA,EAAK,CAAA;gBACLC,SAAAA,EAAW,CAAA,EAAGb,SAAAA,CAAU,CAAC,EAAEG,WAAAA,CAAY,CAAC,EAAEb,GAAAA,CAAIc,OAAO,CAACU,EAAE,CAAA,CAAE;AAC1DC,gBAAAA,OAAAA,CAAAA,GAAAA;AACE,oBAAA,MAAM,IAAI7B,cAAAA,EAAAA;AACZ,gBAAA,CAAA;AACA,gBAAA,GAAGM,eAAe;AAClB,gBAAA,GAAGJ;AACL,aAAA;AAEA,YAAA,OAAOQ,SAAAA,CAAUoB,UAAU,CAACP,UAAAA,CAAAA,CAAYnB,GAAAA,EAAKC,IAAAA,CAAAA;AAC/C,QAAA;QAEA,OAAOA,IAAAA,EAAAA;AACT,IAAA,CAAA;;;;"}
+{"version":3,"file":"rateLimit.js","sources":["../../../../../server/src/middlewares/rateLimit.ts"],"sourcesContent":["import { get, isString, has } from 'lodash';\nimport type { Context, Next } from 'koa';\nimport path from 'path';\nimport { errors } from '@strapi/utils';\n\nimport type { Core } from '@strapi/types';\n\nconst { RateLimitError } = errors;\n\nexport default (config: any, { strapi }: { strapi: Core.Strapi }) =>\n  async (ctx: Context, next: Next) => {\n    let rateLimitConfig = strapi.config.get('admin.rateLimit') as any;\n\n    if (!rateLimitConfig) {\n      rateLimitConfig = {\n        enabled: true,\n      };\n    }\n\n    if (!has(rateLimitConfig, 'enabled')) {\n      rateLimitConfig.enabled = true;\n    }\n\n    if (rateLimitConfig.enabled === true) {\n      // TODO: TS - Do the dynamic import\n      // eslint-disable-next-line @typescript-eslint/no-var-requires\n      const rateLimit = require('koa2-ratelimit').RateLimit;\n\n      const requestEmail = get(ctx, 'request.body.email');\n      const userEmail = isString(requestEmail) ? requestEmail.toLowerCase() : 'unknownEmail';\n\n      const requestPath = isString(ctx.request.path)\n        ? path.normalize(ctx.request.path).toLowerCase().replace(/\\/$/, '')\n        : 'invalidPath';\n\n      const loadConfig = {\n        interval: { min: 5 },\n        max: 5,\n        prefixKey: `${userEmail}:${requestPath}:${ctx.request.ip}`,\n        handler() {\n          throw new RateLimitError();\n        },\n        ...rateLimitConfig,\n        ...config,\n      };\n\n      return rateLimit.middleware(loadConfig)(ctx, next);\n    }\n\n    return next();\n  };\n"],"names":["RateLimitError","errors","config","strapi","ctx","next","rateLimitConfig","get","enabled","has","rateLimit","require","RateLimit","requestEmail","userEmail","isString","toLowerCase","requestPath","request","path","normalize","replace","loadConfig","interval","min","max","prefixKey","ip","handler","middleware"],"mappings":";;;;;;;;;;AAOA,MAAM,EAAEA,cAAc,EAAE,GAAGC,YAAAA;AAE3B,gBAAe,CAAA,CAACC,MAAAA,EAAa,EAAEC,MAAM,EAA2B,GAC9D,OAAOC,GAAAA,EAAcC,IAAAA,GAAAA;AACnB,QAAA,IAAIC,eAAAA,GAAkBH,MAAAA,CAAOD,MAAM,CAACK,GAAG,CAAC,iBAAA,CAAA;AAExC,QAAA,IAAI,CAACD,eAAAA,EAAiB;YACpBA,eAAAA,GAAkB;gBAChBE,OAAAA,EAAS;AACX,aAAA;AACF,QAAA;QAEA,IAAI,CAACC,KAAAA,CAAIH,eAAAA,EAAiB,SAAA,CAAA,EAAY;AACpCA,YAAAA,eAAAA,CAAgBE,OAAO,GAAG,IAAA;AAC5B,QAAA;QAEA,IAAIF,eAAAA,CAAgBE,OAAO,KAAK,IAAA,EAAM;;;YAGpC,MAAME,SAAAA,GAAYC,OAAAA,CAAQ,gBAAA,CAAA,CAAkBC,SAAS;YAErD,MAAMC,YAAAA,GAAeN,MAAIH,GAAAA,EAAK,oBAAA,CAAA;AAC9B,YAAA,MAAMU,SAAAA,GAAYC,UAAAA,CAASF,YAAAA,CAAAA,GAAgBA,YAAAA,CAAaG,WAAW,EAAA,GAAK,cAAA;YAExE,MAAMC,WAAAA,GAAcF,WAASX,GAAAA,CAAIc,OAAO,CAACC,IAAI,CAAA,GACzCA,sBAAKC,SAAS,CAAChB,IAAIc,OAAO,CAACC,IAAI,CAAA,CAAEH,WAAW,GAAGK,OAAO,CAAC,OAAO,EAAA,CAAA,GAC9D,aAAA;AAEJ,YAAA,MAAMC,UAAAA,GAAa;gBACjBC,QAAAA,EAAU;oBAAEC,GAAAA,EAAK;AAAE,iBAAA;gBACnBC,GAAAA,EAAK,CAAA;gBACLC,SAAAA,EAAW,CAAA,EAAGZ,SAAAA,CAAU,CAAC,EAAEG,WAAAA,CAAY,CAAC,EAAEb,GAAAA,CAAIc,OAAO,CAACS,EAAE,CAAA,CAAE;AAC1DC,gBAAAA,OAAAA,CAAAA,GAAAA;AACE,oBAAA,MAAM,IAAI5B,cAAAA,EAAAA;AACZ,gBAAA,CAAA;AACA,gBAAA,GAAGM,eAAe;AAClB,gBAAA,GAAGJ;AACL,aAAA;AAEA,YAAA,OAAOQ,SAAAA,CAAUmB,UAAU,CAACP,UAAAA,CAAAA,CAAYlB,GAAAA,EAAKC,IAAAA,CAAAA;AAC/C,QAAA;QAEA,OAAOA,IAAAA,EAAAA;AACT,IAAA,CAAA;;;;"}

package/dist/server/server/src/middlewares/rateLimit.mjs

@@ -1,6 +1,6 @@
+import { has, get, isString } from 'lodash';
 import path from 'path';
 import { errors } from '@strapi/utils';
-import { has, get, isString, toLower } from 'lodash/fp';
 
 const { RateLimitError } = errors;
 var rateLimit = ((config, { strapi })=>async (ctx, next)=>{
@@ -10,16 +10,16 @@ var rateLimit = ((config, { strapi })=>async (ctx, next)=>{
                 enabled: true
             };
         }
-        if (!has('enabled', rateLimitConfig)) {
+        if (!has(rateLimitConfig, 'enabled')) {
             rateLimitConfig.enabled = true;
         }
         if (rateLimitConfig.enabled === true) {
             // TODO: TS - Do the dynamic import
             // eslint-disable-next-line @typescript-eslint/no-var-requires
             const rateLimit = require('koa2-ratelimit').RateLimit;
-            const requestEmail = get('request.body.email')(ctx);
+            const requestEmail = get(ctx, 'request.body.email');
             const userEmail = isString(requestEmail) ? requestEmail.toLowerCase() : 'unknownEmail';
-            const requestPath = isString(ctx.request.path) ? toLower(path.normalize(ctx.request.path)).replace(/\/$/, '') : 'invalidPath';
+            const requestPath = isString(ctx.request.path) ? path.normalize(ctx.request.path).toLowerCase().replace(/\/$/, '') : 'invalidPath';
             const loadConfig = {
                 interval: {
                     min: 5

package/dist/server/server/src/middlewares/rateLimit.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"rateLimit.mjs","sources":["../../../../../server/src/middlewares/rateLimit.ts"],"sourcesContent":["import type { Context, Next } from 'koa';\nimport path from 'path';\nimport { errors } from '@strapi/utils';\nimport { isString, has, toLower, get } from 'lodash/fp';\nimport type { Core } from '@strapi/types';\n\nconst { RateLimitError } = errors;\n\nexport default (config: any, { strapi }: { strapi: Core.Strapi }) =>\n  async (ctx: Context, next: Next) => {\n    let rateLimitConfig = strapi.config.get('admin.rateLimit') as any;\n\n    if (!rateLimitConfig) {\n      rateLimitConfig = {\n        enabled: true,\n      };\n    }\n\n    if (!has('enabled', rateLimitConfig)) {\n      rateLimitConfig.enabled = true;\n    }\n\n    if (rateLimitConfig.enabled === true) {\n      // TODO: TS - Do the dynamic import\n      // eslint-disable-next-line @typescript-eslint/no-var-requires\n      const rateLimit = require('koa2-ratelimit').RateLimit;\n\n      const requestEmail = get('request.body.email')(ctx);\n      const userEmail = isString(requestEmail) ? requestEmail.toLowerCase() : 'unknownEmail';\n\n      const requestPath = isString(ctx.request.path)\n        ? toLower(path.normalize(ctx.request.path)).replace(/\\/$/, '')\n        : 'invalidPath';\n\n      const loadConfig = {\n        interval: { min: 5 },\n        max: 5,\n        prefixKey: `${userEmail}:${requestPath}:${ctx.request.ip}`,\n        handler() {\n          throw new RateLimitError();\n        },\n        ...rateLimitConfig,\n        ...config,\n      };\n\n      return rateLimit.middleware(loadConfig)(ctx, next);\n    }\n\n    return next();\n  };\n"],"names":["RateLimitError","errors","config","strapi","ctx","next","rateLimitConfig","get","enabled","has","rateLimit","require","RateLimit","requestEmail","userEmail","isString","toLowerCase","requestPath","request","path","toLower","normalize","replace","loadConfig","interval","min","max","prefixKey","ip","handler","middleware"],"mappings":";;;;AAMA,MAAM,EAAEA,cAAc,EAAE,GAAGC,MAAAA;AAE3B,gBAAe,CAAA,CAACC,MAAAA,EAAa,EAAEC,MAAM,EAA2B,GAC9D,OAAOC,GAAAA,EAAcC,IAAAA,GAAAA;AACnB,QAAA,IAAIC,eAAAA,GAAkBH,MAAAA,CAAOD,MAAM,CAACK,GAAG,CAAC,iBAAA,CAAA;AAExC,QAAA,IAAI,CAACD,eAAAA,EAAiB;YACpBA,eAAAA,GAAkB;gBAChBE,OAAAA,EAAS;AACX,aAAA;AACF,QAAA;QAEA,IAAI,CAACC,GAAAA,CAAI,SAAA,EAAWH,eAAAA,CAAAA,EAAkB;AACpCA,YAAAA,eAAAA,CAAgBE,OAAO,GAAG,IAAA;AAC5B,QAAA;QAEA,IAAIF,eAAAA,CAAgBE,OAAO,KAAK,IAAA,EAAM;;;YAGpC,MAAME,SAAAA,GAAYC,OAAAA,CAAQ,gBAAA,CAAA,CAAkBC,SAAS;YAErD,MAAMC,YAAAA,GAAeN,IAAI,oBAAA,CAAA,CAAsBH,GAAAA,CAAAA;AAC/C,YAAA,MAAMU,SAAAA,GAAYC,QAAAA,CAASF,YAAAA,CAAAA,GAAgBA,YAAAA,CAAaG,WAAW,EAAA,GAAK,cAAA;AAExE,YAAA,MAAMC,cAAcF,QAAAA,CAASX,GAAAA,CAAIc,OAAO,CAACC,IAAI,IACzCC,OAAAA,CAAQD,IAAAA,CAAKE,SAAS,CAACjB,GAAAA,CAAIc,OAAO,CAACC,IAAI,GAAGG,OAAO,CAAC,OAAO,EAAA,CAAA,GACzD,aAAA;AAEJ,YAAA,MAAMC,UAAAA,GAAa;gBACjBC,QAAAA,EAAU;oBAAEC,GAAAA,EAAK;AAAE,iBAAA;gBACnBC,GAAAA,EAAK,CAAA;gBACLC,SAAAA,EAAW,CAAA,EAAGb,SAAAA,CAAU,CAAC,EAAEG,WAAAA,CAAY,CAAC,EAAEb,GAAAA,CAAIc,OAAO,CAACU,EAAE,CAAA,CAAE;AAC1DC,gBAAAA,OAAAA,CAAAA,GAAAA;AACE,oBAAA,MAAM,IAAI7B,cAAAA,EAAAA;AACZ,gBAAA,CAAA;AACA,gBAAA,GAAGM,eAAe;AAClB,gBAAA,GAAGJ;AACL,aAAA;AAEA,YAAA,OAAOQ,SAAAA,CAAUoB,UAAU,CAACP,UAAAA,CAAAA,CAAYnB,GAAAA,EAAKC,IAAAA,CAAAA;AAC/C,QAAA;QAEA,OAAOA,IAAAA,EAAAA;AACT,IAAA,CAAA;;;;"}
+{"version":3,"file":"rateLimit.mjs","sources":["../../../../../server/src/middlewares/rateLimit.ts"],"sourcesContent":["import { get, isString, has } from 'lodash';\nimport type { Context, Next } from 'koa';\nimport path from 'path';\nimport { errors } from '@strapi/utils';\n\nimport type { Core } from '@strapi/types';\n\nconst { RateLimitError } = errors;\n\nexport default (config: any, { strapi }: { strapi: Core.Strapi }) =>\n  async (ctx: Context, next: Next) => {\n    let rateLimitConfig = strapi.config.get('admin.rateLimit') as any;\n\n    if (!rateLimitConfig) {\n      rateLimitConfig = {\n        enabled: true,\n      };\n    }\n\n    if (!has(rateLimitConfig, 'enabled')) {\n      rateLimitConfig.enabled = true;\n    }\n\n    if (rateLimitConfig.enabled === true) {\n      // TODO: TS - Do the dynamic import\n      // eslint-disable-next-line @typescript-eslint/no-var-requires\n      const rateLimit = require('koa2-ratelimit').RateLimit;\n\n      const requestEmail = get(ctx, 'request.body.email');\n      const userEmail = isString(requestEmail) ? requestEmail.toLowerCase() : 'unknownEmail';\n\n      const requestPath = isString(ctx.request.path)\n        ? path.normalize(ctx.request.path).toLowerCase().replace(/\\/$/, '')\n        : 'invalidPath';\n\n      const loadConfig = {\n        interval: { min: 5 },\n        max: 5,\n        prefixKey: `${userEmail}:${requestPath}:${ctx.request.ip}`,\n        handler() {\n          throw new RateLimitError();\n        },\n        ...rateLimitConfig,\n        ...config,\n      };\n\n      return rateLimit.middleware(loadConfig)(ctx, next);\n    }\n\n    return next();\n  };\n"],"names":["RateLimitError","errors","config","strapi","ctx","next","rateLimitConfig","get","enabled","has","rateLimit","require","RateLimit","requestEmail","userEmail","isString","toLowerCase","requestPath","request","path","normalize","replace","loadConfig","interval","min","max","prefixKey","ip","handler","middleware"],"mappings":";;;;AAOA,MAAM,EAAEA,cAAc,EAAE,GAAGC,MAAAA;AAE3B,gBAAe,CAAA,CAACC,MAAAA,EAAa,EAAEC,MAAM,EAA2B,GAC9D,OAAOC,GAAAA,EAAcC,IAAAA,GAAAA;AACnB,QAAA,IAAIC,eAAAA,GAAkBH,MAAAA,CAAOD,MAAM,CAACK,GAAG,CAAC,iBAAA,CAAA;AAExC,QAAA,IAAI,CAACD,eAAAA,EAAiB;YACpBA,eAAAA,GAAkB;gBAChBE,OAAAA,EAAS;AACX,aAAA;AACF,QAAA;QAEA,IAAI,CAACC,GAAAA,CAAIH,eAAAA,EAAiB,SAAA,CAAA,EAAY;AACpCA,YAAAA,eAAAA,CAAgBE,OAAO,GAAG,IAAA;AAC5B,QAAA;QAEA,IAAIF,eAAAA,CAAgBE,OAAO,KAAK,IAAA,EAAM;;;YAGpC,MAAME,SAAAA,GAAYC,OAAAA,CAAQ,gBAAA,CAAA,CAAkBC,SAAS;YAErD,MAAMC,YAAAA,GAAeN,IAAIH,GAAAA,EAAK,oBAAA,CAAA;AAC9B,YAAA,MAAMU,SAAAA,GAAYC,QAAAA,CAASF,YAAAA,CAAAA,GAAgBA,YAAAA,CAAaG,WAAW,EAAA,GAAK,cAAA;YAExE,MAAMC,WAAAA,GAAcF,SAASX,GAAAA,CAAIc,OAAO,CAACC,IAAI,CAAA,GACzCA,KAAKC,SAAS,CAAChB,IAAIc,OAAO,CAACC,IAAI,CAAA,CAAEH,WAAW,GAAGK,OAAO,CAAC,OAAO,EAAA,CAAA,GAC9D,aAAA;AAEJ,YAAA,MAAMC,UAAAA,GAAa;gBACjBC,QAAAA,EAAU;oBAAEC,GAAAA,EAAK;AAAE,iBAAA;gBACnBC,GAAAA,EAAK,CAAA;gBACLC,SAAAA,EAAW,CAAA,EAAGZ,SAAAA,CAAU,CAAC,EAAEG,WAAAA,CAAY,CAAC,EAAEb,GAAAA,CAAIc,OAAO,CAACS,EAAE,CAAA,CAAE;AAC1DC,gBAAAA,OAAAA,CAAAA,GAAAA;AACE,oBAAA,MAAM,IAAI5B,cAAAA,EAAAA;AACZ,gBAAA,CAAA;AACA,gBAAA,GAAGM,eAAe;AAClB,gBAAA,GAAGJ;AACL,aAAA;AAEA,YAAA,OAAOQ,SAAAA,CAAUmB,UAAU,CAACP,UAAAA,CAAAA,CAAYlB,GAAAA,EAAKC,IAAAA,CAAAA;AAC/C,QAAA;QAEA,OAAOA,IAAAA,EAAAA;AACT,IAAA,CAAA;;;;"}

package/dist/server/server/src/register.js

@@ -6,9 +6,15 @@ var ai = require('./ai/services/ai.js');
 var contentApiToken = require('./strategies/content-api-token.js');
 var adminToken = require('./strategies/admin-token.js');
 var migratePreferedLanguageDkToDa = require('./migrations/database/migrate-prefered-language-dk-to-da.js');
+var renameFields = require('./services/permission/rename-fields.js');
 
 var register = (({ strapi })=>{
     strapi.db.migrations.providers.internal.register(migratePreferedLanguageDkToDa.migrateAdminPreferedLanguageDkToDa);
+    // Generated rename migrations carry field renames to admin permissions; this
+    // must be registered before user migrations run (during schema sync).
+    strapi.db.schema.registerAttributeRenameHandler(renameFields.createPermissionFieldRenamer({
+        strapi
+    }));
     const passportMiddleware = strapi.service('admin::passport').init();
     strapi.server.api('admin').use(passportMiddleware);
     strapi.get('auth').register('admin', admin.default);

package/dist/server/server/src/register.js.map

@@ -1 +1 @@
-{"version":3,"file":"register.js","sources":["../../../../server/src/register.ts"],"sourcesContent":["import type { Core } from '@strapi/types';\nimport registerAdminPanelRoute from './routes/serve-admin-panel';\nimport adminAuthStrategy from './strategies/admin';\nimport { createAiAdminService } from './ai/services/ai';\nimport contentApiTokenAuthStrategy from './strategies/content-api-token';\nimport adminTokenAuthStrategy from './strategies/admin-token';\nimport { migrateAdminPreferedLanguageDkToDa } from './migrations/database/migrate-prefered-language-dk-to-da';\n\nexport default ({ strapi }: { strapi: Core.Strapi }) => {\n  strapi.db.migrations.providers.internal.register(migrateAdminPreferedLanguageDkToDa);\n\n  const passportMiddleware = strapi.service('admin::passport').init();\n\n  strapi.server.api('admin').use(passportMiddleware);\n  strapi.get('auth').register('admin', adminAuthStrategy);\n  strapi.get('auth').register('admin', adminTokenAuthStrategy);\n  strapi.get('auth').register('content-api', contentApiTokenAuthStrategy);\n\n  strapi.add('ai.admin', () => createAiAdminService({ strapi }));\n\n  const shouldServeAdminPanel = strapi.config.get('admin.serveAdminPanel');\n\n  if (shouldServeAdminPanel) {\n    registerAdminPanelRoute({ strapi });\n  }\n};\n"],"names":["strapi","db","migrations","providers","internal","register","migrateAdminPreferedLanguageDkToDa","passportMiddleware","service","init","server","api","use","get","adminAuthStrategy","adminTokenAuthStrategy","contentApiTokenAuthStrategy","add","createAiAdminService","shouldServeAdminPanel","config","registerAdminPanelRoute"],"mappings":";;;;;;;;;AAQA,eAAe,CAAA,CAAC,EAAEA,MAAM,EAA2B,GAAA;IACjDA,MAAAA,CAAOC,EAAE,CAACC,UAAU,CAACC,SAAS,CAACC,QAAQ,CAACC,QAAQ,CAACC,gEAAAA,CAAAA;AAEjD,IAAA,MAAMC,kBAAAA,GAAqBP,MAAAA,CAAOQ,OAAO,CAAC,mBAAmBC,IAAI,EAAA;AAEjET,IAAAA,MAAAA,CAAOU,MAAM,CAACC,GAAG,CAAC,OAAA,CAAA,CAASC,GAAG,CAACL,kBAAAA,CAAAA;AAC/BP,IAAAA,MAAAA,CAAOa,GAAG,CAAC,MAAA,CAAA,CAAQR,QAAQ,CAAC,OAAA,EAASS,aAAAA,CAAAA;AACrCd,IAAAA,MAAAA,CAAOa,GAAG,CAAC,MAAA,CAAA,CAAQR,QAAQ,CAAC,OAAA,EAASU,kBAAAA,CAAAA;AACrCf,IAAAA,MAAAA,CAAOa,GAAG,CAAC,MAAA,CAAA,CAAQR,QAAQ,CAAC,aAAA,EAAeW,uBAAAA,CAAAA;AAE3ChB,IAAAA,MAAAA,CAAOiB,GAAG,CAAC,UAAA,EAAY,IAAMC,uBAAAA,CAAqB;AAAElB,YAAAA;AAAO,SAAA,CAAA,CAAA;AAE3D,IAAA,MAAMmB,qBAAAA,GAAwBnB,MAAAA,CAAOoB,MAAM,CAACP,GAAG,CAAC,uBAAA,CAAA;AAEhD,IAAA,IAAIM,qBAAAA,EAAuB;QACzBE,uBAAAA,CAAwB;AAAErB,YAAAA;AAAO,SAAA,CAAA;AACnC,IAAA;AACF,CAAA;;;;"}
+{"version":3,"file":"register.js","sources":["../../../../server/src/register.ts"],"sourcesContent":["import type { Core } from '@strapi/types';\nimport registerAdminPanelRoute from './routes/serve-admin-panel';\nimport adminAuthStrategy from './strategies/admin';\nimport { createAiAdminService } from './ai/services/ai';\nimport contentApiTokenAuthStrategy from './strategies/content-api-token';\nimport adminTokenAuthStrategy from './strategies/admin-token';\nimport { migrateAdminPreferedLanguageDkToDa } from './migrations/database/migrate-prefered-language-dk-to-da';\nimport { createPermissionFieldRenamer } from './services/permission/rename-fields';\n\nexport default ({ strapi }: { strapi: Core.Strapi }) => {\n  strapi.db.migrations.providers.internal.register(migrateAdminPreferedLanguageDkToDa);\n  // Generated rename migrations carry field renames to admin permissions; this\n  // must be registered before user migrations run (during schema sync).\n  strapi.db.schema.registerAttributeRenameHandler(createPermissionFieldRenamer({ strapi }));\n\n  const passportMiddleware = strapi.service('admin::passport').init();\n\n  strapi.server.api('admin').use(passportMiddleware);\n  strapi.get('auth').register('admin', adminAuthStrategy);\n  strapi.get('auth').register('admin', adminTokenAuthStrategy);\n  strapi.get('auth').register('content-api', contentApiTokenAuthStrategy);\n\n  strapi.add('ai.admin', () => createAiAdminService({ strapi }));\n\n  const shouldServeAdminPanel = strapi.config.get('admin.serveAdminPanel');\n\n  if (shouldServeAdminPanel) {\n    registerAdminPanelRoute({ strapi });\n  }\n};\n"],"names":["strapi","db","migrations","providers","internal","register","migrateAdminPreferedLanguageDkToDa","schema","registerAttributeRenameHandler","createPermissionFieldRenamer","passportMiddleware","service","init","server","api","use","get","adminAuthStrategy","adminTokenAuthStrategy","contentApiTokenAuthStrategy","add","createAiAdminService","shouldServeAdminPanel","config","registerAdminPanelRoute"],"mappings":";;;;;;;;;;AASA,eAAe,CAAA,CAAC,EAAEA,MAAM,EAA2B,GAAA;IACjDA,MAAAA,CAAOC,EAAE,CAACC,UAAU,CAACC,SAAS,CAACC,QAAQ,CAACC,QAAQ,CAACC,gEAAAA,CAAAA;;;AAGjDN,IAAAA,MAAAA,CAAOC,EAAE,CAACM,MAAM,CAACC,8BAA8B,CAACC,yCAAAA,CAA6B;AAAET,QAAAA;AAAO,KAAA,CAAA,CAAA;AAEtF,IAAA,MAAMU,kBAAAA,GAAqBV,MAAAA,CAAOW,OAAO,CAAC,mBAAmBC,IAAI,EAAA;AAEjEZ,IAAAA,MAAAA,CAAOa,MAAM,CAACC,GAAG,CAAC,OAAA,CAAA,CAASC,GAAG,CAACL,kBAAAA,CAAAA;AAC/BV,IAAAA,MAAAA,CAAOgB,GAAG,CAAC,MAAA,CAAA,CAAQX,QAAQ,CAAC,OAAA,EAASY,aAAAA,CAAAA;AACrCjB,IAAAA,MAAAA,CAAOgB,GAAG,CAAC,MAAA,CAAA,CAAQX,QAAQ,CAAC,OAAA,EAASa,kBAAAA,CAAAA;AACrClB,IAAAA,MAAAA,CAAOgB,GAAG,CAAC,MAAA,CAAA,CAAQX,QAAQ,CAAC,aAAA,EAAec,uBAAAA,CAAAA;AAE3CnB,IAAAA,MAAAA,CAAOoB,GAAG,CAAC,UAAA,EAAY,IAAMC,uBAAAA,CAAqB;AAAErB,YAAAA;AAAO,SAAA,CAAA,CAAA;AAE3D,IAAA,MAAMsB,qBAAAA,GAAwBtB,MAAAA,CAAOuB,MAAM,CAACP,GAAG,CAAC,uBAAA,CAAA;AAEhD,IAAA,IAAIM,qBAAAA,EAAuB;QACzBE,uBAAAA,CAAwB;AAAExB,YAAAA;AAAO,SAAA,CAAA;AACnC,IAAA;AACF,CAAA;;;;"}

package/dist/server/server/src/register.mjs

@@ -4,9 +4,15 @@ import { createAiAdminService } from './ai/services/ai.mjs';
 import contentApiTokenAuthStrategy from './strategies/content-api-token.mjs';
 import adminTokenAuthStrategy from './strategies/admin-token.mjs';
 import { migrateAdminPreferedLanguageDkToDa } from './migrations/database/migrate-prefered-language-dk-to-da.mjs';
+import { createPermissionFieldRenamer } from './services/permission/rename-fields.mjs';
 
 var register = (({ strapi })=>{
     strapi.db.migrations.providers.internal.register(migrateAdminPreferedLanguageDkToDa);
+    // Generated rename migrations carry field renames to admin permissions; this
+    // must be registered before user migrations run (during schema sync).
+    strapi.db.schema.registerAttributeRenameHandler(createPermissionFieldRenamer({
+        strapi
+    }));
     const passportMiddleware = strapi.service('admin::passport').init();
     strapi.server.api('admin').use(passportMiddleware);
     strapi.get('auth').register('admin', adminAuthStrategy);

package/dist/server/server/src/register.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"register.mjs","sources":["../../../../server/src/register.ts"],"sourcesContent":["import type { Core } from '@strapi/types';\nimport registerAdminPanelRoute from './routes/serve-admin-panel';\nimport adminAuthStrategy from './strategies/admin';\nimport { createAiAdminService } from './ai/services/ai';\nimport contentApiTokenAuthStrategy from './strategies/content-api-token';\nimport adminTokenAuthStrategy from './strategies/admin-token';\nimport { migrateAdminPreferedLanguageDkToDa } from './migrations/database/migrate-prefered-language-dk-to-da';\n\nexport default ({ strapi }: { strapi: Core.Strapi }) => {\n  strapi.db.migrations.providers.internal.register(migrateAdminPreferedLanguageDkToDa);\n\n  const passportMiddleware = strapi.service('admin::passport').init();\n\n  strapi.server.api('admin').use(passportMiddleware);\n  strapi.get('auth').register('admin', adminAuthStrategy);\n  strapi.get('auth').register('admin', adminTokenAuthStrategy);\n  strapi.get('auth').register('content-api', contentApiTokenAuthStrategy);\n\n  strapi.add('ai.admin', () => createAiAdminService({ strapi }));\n\n  const shouldServeAdminPanel = strapi.config.get('admin.serveAdminPanel');\n\n  if (shouldServeAdminPanel) {\n    registerAdminPanelRoute({ strapi });\n  }\n};\n"],"names":["strapi","db","migrations","providers","internal","register","migrateAdminPreferedLanguageDkToDa","passportMiddleware","service","init","server","api","use","get","adminAuthStrategy","adminTokenAuthStrategy","contentApiTokenAuthStrategy","add","createAiAdminService","shouldServeAdminPanel","config","registerAdminPanelRoute"],"mappings":";;;;;;;AAQA,eAAe,CAAA,CAAC,EAAEA,MAAM,EAA2B,GAAA;IACjDA,MAAAA,CAAOC,EAAE,CAACC,UAAU,CAACC,SAAS,CAACC,QAAQ,CAACC,QAAQ,CAACC,kCAAAA,CAAAA;AAEjD,IAAA,MAAMC,kBAAAA,GAAqBP,MAAAA,CAAOQ,OAAO,CAAC,mBAAmBC,IAAI,EAAA;AAEjET,IAAAA,MAAAA,CAAOU,MAAM,CAACC,GAAG,CAAC,OAAA,CAAA,CAASC,GAAG,CAACL,kBAAAA,CAAAA;AAC/BP,IAAAA,MAAAA,CAAOa,GAAG,CAAC,MAAA,CAAA,CAAQR,QAAQ,CAAC,OAAA,EAASS,iBAAAA,CAAAA;AACrCd,IAAAA,MAAAA,CAAOa,GAAG,CAAC,MAAA,CAAA,CAAQR,QAAQ,CAAC,OAAA,EAASU,sBAAAA,CAAAA;AACrCf,IAAAA,MAAAA,CAAOa,GAAG,CAAC,MAAA,CAAA,CAAQR,QAAQ,CAAC,aAAA,EAAeW,2BAAAA,CAAAA;AAE3ChB,IAAAA,MAAAA,CAAOiB,GAAG,CAAC,UAAA,EAAY,IAAMC,oBAAAA,CAAqB;AAAElB,YAAAA;AAAO,SAAA,CAAA,CAAA;AAE3D,IAAA,MAAMmB,qBAAAA,GAAwBnB,MAAAA,CAAOoB,MAAM,CAACP,GAAG,CAAC,uBAAA,CAAA;AAEhD,IAAA,IAAIM,qBAAAA,EAAuB;QACzBE,uBAAAA,CAAwB;AAAErB,YAAAA;AAAO,SAAA,CAAA;AACnC,IAAA;AACF,CAAA;;;;"}
+{"version":3,"file":"register.mjs","sources":["../../../../server/src/register.ts"],"sourcesContent":["import type { Core } from '@strapi/types';\nimport registerAdminPanelRoute from './routes/serve-admin-panel';\nimport adminAuthStrategy from './strategies/admin';\nimport { createAiAdminService } from './ai/services/ai';\nimport contentApiTokenAuthStrategy from './strategies/content-api-token';\nimport adminTokenAuthStrategy from './strategies/admin-token';\nimport { migrateAdminPreferedLanguageDkToDa } from './migrations/database/migrate-prefered-language-dk-to-da';\nimport { createPermissionFieldRenamer } from './services/permission/rename-fields';\n\nexport default ({ strapi }: { strapi: Core.Strapi }) => {\n  strapi.db.migrations.providers.internal.register(migrateAdminPreferedLanguageDkToDa);\n  // Generated rename migrations carry field renames to admin permissions; this\n  // must be registered before user migrations run (during schema sync).\n  strapi.db.schema.registerAttributeRenameHandler(createPermissionFieldRenamer({ strapi }));\n\n  const passportMiddleware = strapi.service('admin::passport').init();\n\n  strapi.server.api('admin').use(passportMiddleware);\n  strapi.get('auth').register('admin', adminAuthStrategy);\n  strapi.get('auth').register('admin', adminTokenAuthStrategy);\n  strapi.get('auth').register('content-api', contentApiTokenAuthStrategy);\n\n  strapi.add('ai.admin', () => createAiAdminService({ strapi }));\n\n  const shouldServeAdminPanel = strapi.config.get('admin.serveAdminPanel');\n\n  if (shouldServeAdminPanel) {\n    registerAdminPanelRoute({ strapi });\n  }\n};\n"],"names":["strapi","db","migrations","providers","internal","register","migrateAdminPreferedLanguageDkToDa","schema","registerAttributeRenameHandler","createPermissionFieldRenamer","passportMiddleware","service","init","server","api","use","get","adminAuthStrategy","adminTokenAuthStrategy","contentApiTokenAuthStrategy","add","createAiAdminService","shouldServeAdminPanel","config","registerAdminPanelRoute"],"mappings":";;;;;;;;AASA,eAAe,CAAA,CAAC,EAAEA,MAAM,EAA2B,GAAA;IACjDA,MAAAA,CAAOC,EAAE,CAACC,UAAU,CAACC,SAAS,CAACC,QAAQ,CAACC,QAAQ,CAACC,kCAAAA,CAAAA;;;AAGjDN,IAAAA,MAAAA,CAAOC,EAAE,CAACM,MAAM,CAACC,8BAA8B,CAACC,4BAAAA,CAA6B;AAAET,QAAAA;AAAO,KAAA,CAAA,CAAA;AAEtF,IAAA,MAAMU,kBAAAA,GAAqBV,MAAAA,CAAOW,OAAO,CAAC,mBAAmBC,IAAI,EAAA;AAEjEZ,IAAAA,MAAAA,CAAOa,MAAM,CAACC,GAAG,CAAC,OAAA,CAAA,CAASC,GAAG,CAACL,kBAAAA,CAAAA;AAC/BV,IAAAA,MAAAA,CAAOgB,GAAG,CAAC,MAAA,CAAA,CAAQX,QAAQ,CAAC,OAAA,EAASY,iBAAAA,CAAAA;AACrCjB,IAAAA,MAAAA,CAAOgB,GAAG,CAAC,MAAA,CAAA,CAAQX,QAAQ,CAAC,OAAA,EAASa,sBAAAA,CAAAA;AACrClB,IAAAA,MAAAA,CAAOgB,GAAG,CAAC,MAAA,CAAA,CAAQX,QAAQ,CAAC,aAAA,EAAec,2BAAAA,CAAAA;AAE3CnB,IAAAA,MAAAA,CAAOoB,GAAG,CAAC,UAAA,EAAY,IAAMC,oBAAAA,CAAqB;AAAErB,YAAAA;AAAO,SAAA,CAAA,CAAA;AAE3D,IAAA,MAAMsB,qBAAAA,GAAwBtB,MAAAA,CAAOuB,MAAM,CAACP,GAAG,CAAC,uBAAA,CAAA;AAEhD,IAAA,IAAIM,qBAAAA,EAAuB;QACzBE,uBAAAA,CAAwB;AAAExB,YAAAA;AAAO,SAAA,CAAA;AACnC,IAAA;AACF,CAAA;;;;"}

package/dist/server/server/src/services/action.js

@@ -1,6 +1,5 @@
 'use strict';
 
-var fp = require('lodash/fp');
 var utils = require('@strapi/utils');
 var index = require('../utils/index.js');
 var constants = require('./constants.js');
@@ -14,7 +13,7 @@ const { NotFoundError } = utils.errors;
  * @returns {object[]}
  */ const getAllowedActionsForRole = async (roleId)=>{
     const { actionProvider } = index.getService('permission');
-    if (!fp.isNil(roleId)) {
+    if (roleId != null) {
         const role = await index.getService('role').findOne({
             id: roleId
         });

package/dist/server/server/src/services/action.js.map

@@ -1 +1 @@
-{"version":3,"file":"action.js","sources":["../../../../../server/src/services/action.ts"],"sourcesContent":["import { isNil } from 'lodash/fp';\nimport { errors } from '@strapi/utils';\nimport { getService } from '../utils';\nimport constants from './constants';\nimport type { AdminRole } from '../../../shared/contracts/shared';\n\nconst { AUTHOR_CODE, PUBLISH_ACTION } = constants;\n\nconst { NotFoundError } = errors;\n// TODO: move actionProvider here instead of in the permission service\n\n/**\n * Returns actions available for a role.\n * @param {string|number} roleId\n * @returns {object[]}\n */\nconst getAllowedActionsForRole = async (roleId?: string) => {\n  const { actionProvider } = getService('permission');\n\n  if (!isNil(roleId)) {\n    const role: AdminRole = await getService('role').findOne({ id: roleId });\n\n    if (!role) {\n      throw new NotFoundError('role.notFound');\n    }\n\n    if (role.code === AUTHOR_CODE) {\n      return actionProvider.values().filter(({ actionId }: any) => actionId !== PUBLISH_ACTION);\n    }\n  }\n\n  return actionProvider.values();\n};\n\nexport { getAllowedActionsForRole };\n"],"names":["AUTHOR_CODE","PUBLISH_ACTION","constants","NotFoundError","errors","getAllowedActionsForRole","roleId","actionProvider","getService","isNil","role","findOne","id","code","values","filter","actionId"],"mappings":";;;;;;;AAMA,MAAM,EAAEA,WAAW,EAAEC,cAAc,EAAE,GAAGC,SAAAA;AAExC,MAAM,EAAEC,aAAa,EAAE,GAAGC,YAAAA;AAC1B;AAEA;;;;IAKA,MAAMC,2BAA2B,OAAOC,MAAAA,GAAAA;AACtC,IAAA,MAAM,EAAEC,cAAc,EAAE,GAAGC,gBAAAA,CAAW,YAAA,CAAA;IAEtC,IAAI,CAACC,SAAMH,MAAAA,CAAAA,EAAS;AAClB,QAAA,MAAMI,IAAAA,GAAkB,MAAMF,gBAAAA,CAAW,MAAA,CAAA,CAAQG,OAAO,CAAC;YAAEC,EAAAA,EAAIN;AAAO,SAAA,CAAA;AAEtE,QAAA,IAAI,CAACI,IAAAA,EAAM;AACT,YAAA,MAAM,IAAIP,aAAAA,CAAc,eAAA,CAAA;AAC1B,QAAA;QAEA,IAAIO,IAAAA,CAAKG,IAAI,KAAKb,WAAAA,EAAa;YAC7B,OAAOO,cAAAA,CAAeO,MAAM,EAAA,CAAGC,MAAM,CAAC,CAAC,EAAEC,QAAQ,EAAO,GAAKA,QAAAA,KAAaf,cAAAA,CAAAA;AAC5E,QAAA;AACF,IAAA;AAEA,IAAA,OAAOM,eAAeO,MAAM,EAAA;AAC9B;;;;"}
+{"version":3,"file":"action.js","sources":["../../../../../server/src/services/action.ts"],"sourcesContent":["import { errors } from '@strapi/utils';\nimport { getService } from '../utils';\nimport constants from './constants';\nimport type { AdminRole } from '../../../shared/contracts/shared';\n\nconst { AUTHOR_CODE, PUBLISH_ACTION } = constants;\n\nconst { NotFoundError } = errors;\n// TODO: move actionProvider here instead of in the permission service\n\n/**\n * Returns actions available for a role.\n * @param {string|number} roleId\n * @returns {object[]}\n */\nconst getAllowedActionsForRole = async (roleId?: string) => {\n  const { actionProvider } = getService('permission');\n\n  if (roleId != null) {\n    const role: AdminRole = await getService('role').findOne({ id: roleId });\n\n    if (!role) {\n      throw new NotFoundError('role.notFound');\n    }\n\n    if (role.code === AUTHOR_CODE) {\n      return actionProvider.values().filter(({ actionId }: any) => actionId !== PUBLISH_ACTION);\n    }\n  }\n\n  return actionProvider.values();\n};\n\nexport { getAllowedActionsForRole };\n"],"names":["AUTHOR_CODE","PUBLISH_ACTION","constants","NotFoundError","errors","getAllowedActionsForRole","roleId","actionProvider","getService","role","findOne","id","code","values","filter","actionId"],"mappings":";;;;;;AAKA,MAAM,EAAEA,WAAW,EAAEC,cAAc,EAAE,GAAGC,SAAAA;AAExC,MAAM,EAAEC,aAAa,EAAE,GAAGC,YAAAA;AAC1B;AAEA;;;;IAKA,MAAMC,2BAA2B,OAAOC,MAAAA,GAAAA;AACtC,IAAA,MAAM,EAAEC,cAAc,EAAE,GAAGC,gBAAAA,CAAW,YAAA,CAAA;AAEtC,IAAA,IAAIF,UAAU,IAAA,EAAM;AAClB,QAAA,MAAMG,IAAAA,GAAkB,MAAMD,gBAAAA,CAAW,MAAA,CAAA,CAAQE,OAAO,CAAC;YAAEC,EAAAA,EAAIL;AAAO,SAAA,CAAA;AAEtE,QAAA,IAAI,CAACG,IAAAA,EAAM;AACT,YAAA,MAAM,IAAIN,aAAAA,CAAc,eAAA,CAAA;AAC1B,QAAA;QAEA,IAAIM,IAAAA,CAAKG,IAAI,KAAKZ,WAAAA,EAAa;YAC7B,OAAOO,cAAAA,CAAeM,MAAM,EAAA,CAAGC,MAAM,CAAC,CAAC,EAAEC,QAAQ,EAAO,GAAKA,QAAAA,KAAad,cAAAA,CAAAA;AAC5E,QAAA;AACF,IAAA;AAEA,IAAA,OAAOM,eAAeM,MAAM,EAAA;AAC9B;;;;"}

package/dist/server/server/src/services/action.mjs

@@ -1,4 +1,3 @@
-import { isNil } from 'lodash/fp';
 import { errors } from '@strapi/utils';
 import { getService } from '../utils/index.mjs';
 import constants from './constants.mjs';
@@ -12,7 +11,7 @@ const { NotFoundError } = errors;
  * @returns {object[]}
  */ const getAllowedActionsForRole = async (roleId)=>{
     const { actionProvider } = getService('permission');
-    if (!isNil(roleId)) {
+    if (roleId != null) {
         const role = await getService('role').findOne({
             id: roleId
         });

package/dist/server/server/src/services/action.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"action.mjs","sources":["../../../../../server/src/services/action.ts"],"sourcesContent":["import { isNil } from 'lodash/fp';\nimport { errors } from '@strapi/utils';\nimport { getService } from '../utils';\nimport constants from './constants';\nimport type { AdminRole } from '../../../shared/contracts/shared';\n\nconst { AUTHOR_CODE, PUBLISH_ACTION } = constants;\n\nconst { NotFoundError } = errors;\n// TODO: move actionProvider here instead of in the permission service\n\n/**\n * Returns actions available for a role.\n * @param {string|number} roleId\n * @returns {object[]}\n */\nconst getAllowedActionsForRole = async (roleId?: string) => {\n  const { actionProvider } = getService('permission');\n\n  if (!isNil(roleId)) {\n    const role: AdminRole = await getService('role').findOne({ id: roleId });\n\n    if (!role) {\n      throw new NotFoundError('role.notFound');\n    }\n\n    if (role.code === AUTHOR_CODE) {\n      return actionProvider.values().filter(({ actionId }: any) => actionId !== PUBLISH_ACTION);\n    }\n  }\n\n  return actionProvider.values();\n};\n\nexport { getAllowedActionsForRole };\n"],"names":["AUTHOR_CODE","PUBLISH_ACTION","constants","NotFoundError","errors","getAllowedActionsForRole","roleId","actionProvider","getService","isNil","role","findOne","id","code","values","filter","actionId"],"mappings":";;;;;AAMA,MAAM,EAAEA,WAAW,EAAEC,cAAc,EAAE,GAAGC,SAAAA;AAExC,MAAM,EAAEC,aAAa,EAAE,GAAGC,MAAAA;AAC1B;AAEA;;;;IAKA,MAAMC,2BAA2B,OAAOC,MAAAA,GAAAA;AACtC,IAAA,MAAM,EAAEC,cAAc,EAAE,GAAGC,UAAAA,CAAW,YAAA,CAAA;IAEtC,IAAI,CAACC,MAAMH,MAAAA,CAAAA,EAAS;AAClB,QAAA,MAAMI,IAAAA,GAAkB,MAAMF,UAAAA,CAAW,MAAA,CAAA,CAAQG,OAAO,CAAC;YAAEC,EAAAA,EAAIN;AAAO,SAAA,CAAA;AAEtE,QAAA,IAAI,CAACI,IAAAA,EAAM;AACT,YAAA,MAAM,IAAIP,aAAAA,CAAc,eAAA,CAAA;AAC1B,QAAA;QAEA,IAAIO,IAAAA,CAAKG,IAAI,KAAKb,WAAAA,EAAa;YAC7B,OAAOO,cAAAA,CAAeO,MAAM,EAAA,CAAGC,MAAM,CAAC,CAAC,EAAEC,QAAQ,EAAO,GAAKA,QAAAA,KAAaf,cAAAA,CAAAA;AAC5E,QAAA;AACF,IAAA;AAEA,IAAA,OAAOM,eAAeO,MAAM,EAAA;AAC9B;;;;"}
+{"version":3,"file":"action.mjs","sources":["../../../../../server/src/services/action.ts"],"sourcesContent":["import { errors } from '@strapi/utils';\nimport { getService } from '../utils';\nimport constants from './constants';\nimport type { AdminRole } from '../../../shared/contracts/shared';\n\nconst { AUTHOR_CODE, PUBLISH_ACTION } = constants;\n\nconst { NotFoundError } = errors;\n// TODO: move actionProvider here instead of in the permission service\n\n/**\n * Returns actions available for a role.\n * @param {string|number} roleId\n * @returns {object[]}\n */\nconst getAllowedActionsForRole = async (roleId?: string) => {\n  const { actionProvider } = getService('permission');\n\n  if (roleId != null) {\n    const role: AdminRole = await getService('role').findOne({ id: roleId });\n\n    if (!role) {\n      throw new NotFoundError('role.notFound');\n    }\n\n    if (role.code === AUTHOR_CODE) {\n      return actionProvider.values().filter(({ actionId }: any) => actionId !== PUBLISH_ACTION);\n    }\n  }\n\n  return actionProvider.values();\n};\n\nexport { getAllowedActionsForRole };\n"],"names":["AUTHOR_CODE","PUBLISH_ACTION","constants","NotFoundError","errors","getAllowedActionsForRole","roleId","actionProvider","getService","role","findOne","id","code","values","filter","actionId"],"mappings":";;;;AAKA,MAAM,EAAEA,WAAW,EAAEC,cAAc,EAAE,GAAGC,SAAAA;AAExC,MAAM,EAAEC,aAAa,EAAE,GAAGC,MAAAA;AAC1B;AAEA;;;;IAKA,MAAMC,2BAA2B,OAAOC,MAAAA,GAAAA;AACtC,IAAA,MAAM,EAAEC,cAAc,EAAE,GAAGC,UAAAA,CAAW,YAAA,CAAA;AAEtC,IAAA,IAAIF,UAAU,IAAA,EAAM;AAClB,QAAA,MAAMG,IAAAA,GAAkB,MAAMD,UAAAA,CAAW,MAAA,CAAA,CAAQE,OAAO,CAAC;YAAEC,EAAAA,EAAIL;AAAO,SAAA,CAAA;AAEtE,QAAA,IAAI,CAACG,IAAAA,EAAM;AACT,YAAA,MAAM,IAAIN,aAAAA,CAAc,eAAA,CAAA;AAC1B,QAAA;QAEA,IAAIM,IAAAA,CAAKG,IAAI,KAAKZ,WAAAA,EAAa;YAC7B,OAAOO,cAAAA,CAAeM,MAAM,EAAA,CAAGC,MAAM,CAAC,CAAC,EAAEC,QAAQ,EAAO,GAAKA,QAAAA,KAAad,cAAAA,CAAAA;AAC5E,QAAA;AACF,IAAA;AAEA,IAAA,OAAOM,eAAeM,MAAM,EAAA;AAC9B;;;;"}