@strapi/admin 5.56.0 → 5.58.0

package/dist/server/server/src/validation/common-validators.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var utils = require('@strapi/utils');
 var _ = require('lodash');
-var fp = require('lodash/fp');
 var index$1 = require('../utils/index.js');
 var index = require('../domain/action/index.js');
 var checkFieldsAreCorrectlyNested = require('./common-functions/check-fields-are-correctly-nested.js');
@@ -53,10 +52,10 @@ const permissionsAreEquals = (a, b)=>a.action === b.action && (a.subject === b.s
 const checkNoDuplicatedPermissions = (permissions)=>!Array.isArray(permissions) || permissions.every((permA, i)=>permissions.slice(i + 1).every((permB)=>!permissionsAreEquals(permA, permB)));
 const checkNilFields = (action)=>function checkNilActionFields(fields) {
         // If the parent has no action field, then we ignore this test
-        if (fp.isNil(action)) {
+        if (action == null) {
             return true;
         }
-        return index.appliesToProperty('fields', action) || fp.isNil(fields);
+        return index.appliesToProperty('fields', action) || fields == null;
     };
 const fieldsPropertyValidation = (action)=>utils.yup.array().of(utils.yup.string()).nullable().test('field-nested', 'Fields format are incorrect (bad nesting).', checkFieldsAreCorrectlyNested).test('field-nested', 'Fields format are incorrect (duplicates).', checkFieldsDontHaveDuplicates).test('fields-restriction', // eslint-disable-next-line no-template-curly-in-string -- Yup interpolation placeholder
     'The permission at ${path} must have fields set to null or undefined', // @ts-expect-error yup types
@@ -64,7 +63,7 @@ const fieldsPropertyValidation = (action)=>utils.yup.array().of(utils.yup.string
 const permission = utils.yup.object().shape({
     action: utils.yup.string().required().test('action-validity', 'action is not an existing permission action', function checkActionValidity(actionId) {
         // If the action field is Nil, ignore the test and let the required check handle the error
-        if (fp.isNil(actionId)) {
+        if (actionId == null) {
             return true;
         }
         const action = getActionFromProvider(actionId);
@@ -77,10 +76,10 @@ const permission = utils.yup.object().shape({
         if (!action) {
             return true;
         }
-        if (fp.isNil(action.subjects)) {
-            return fp.isNil(subject);
+        if (action.subjects == null) {
+            return subject == null;
         }
-        if (fp.isArray(action.subjects) && !fp.isNil(subject)) {
+        if (Array.isArray(action.subjects) && subject != null) {
             return action.subjects.includes(subject);
         }
         return false;
@@ -89,15 +88,15 @@ const permission = utils.yup.object().shape({
     'Invalid property set at ${path}', function checkPropertiesStructure(properties) {
         // @ts-expect-error yup types
         const action = getActionFromProvider(this.options.parent.action);
-        const hasNoProperties = fp.isEmpty(properties) || fp.isNil(properties);
-        if (!fp.has('options.applyToProperties', action)) {
+        const hasNoProperties = _.isEmpty(properties) || properties == null;
+        if (!_.has(action, 'options.applyToProperties')) {
             return hasNoProperties;
         }
         if (hasNoProperties) {
             return true;
         }
         const { applyToProperties } = action.options;
-        if (!fp.isArray(applyToProperties)) {
+        if (!Array.isArray(applyToProperties)) {
             return false;
         }
         return Object.keys(properties).every((property)=>applyToProperties.includes(property));

package/dist/server/server/src/validation/common-validators.js.map

@@ -1 +1 @@
-{"version":3,"file":"common-validators.js","sources":["../../../../../server/src/validation/common-validators.ts"],"sourcesContent":["import { yup } from '@strapi/utils';\nimport _ from 'lodash';\nimport { isEmpty, has, isNil, isArray } from 'lodash/fp';\nimport { getService } from '../utils';\nimport actionDomain, { type Action } from '../domain/action';\nimport { checkFieldsAreCorrectlyNested, checkFieldsDontHaveDuplicates } from './common-functions';\nimport actions from '../domain/action/index';\n\nconst { actionFields } = actions;\n\nconst getActionFromProvider = (actionId: string) => {\n  return getService('permission').actionProvider.get(actionId);\n};\n\nexport const email = yup.string().email().lowercase();\n\nexport const firstname = yup.string().trim().min(1);\n\nexport const lastname = yup.string();\n\nexport const username = yup.string().min(1);\n\nexport const password = yup\n  .string()\n  .min(8)\n  // eslint-disable-next-line no-template-curly-in-string -- Yup interpolation placeholder\n  .test('required-byte-size', '${path} must be less than 73 bytes', function checkByteSize(value) {\n    if (!value) return true;\n\n    const byteSize = new TextEncoder().encode(value).length;\n    return byteSize <= 72;\n  })\n  // eslint-disable-next-line no-template-curly-in-string -- Yup interpolation placeholder\n  .matches(/[a-z]/, '${path} must contain at least one lowercase character')\n  // eslint-disable-next-line no-template-curly-in-string -- Yup interpolation placeholder\n  .matches(/[A-Z]/, '${path} must contain at least one uppercase character')\n  // eslint-disable-next-line no-template-curly-in-string -- Yup interpolation placeholder\n  .matches(/\\d/, '${path} must contain at least one number');\n\nexport const roles = yup.array(yup.strapiID()).min(1);\n\nconst isAPluginName = yup\n  .string()\n  .test('is-a-plugin-name', 'is not a plugin name', function checkPluginName(value) {\n    return [undefined, 'admin', ...Object.keys(strapi.plugins)].includes(value)\n      ? true\n      : this.createError({ path: this.path, message: `${this.path} is not an existing plugin` });\n  });\n\nexport const arrayOfConditionNames = yup\n  .array()\n  .of(yup.string())\n  .test('is-an-array-of-conditions', 'is not a plugin name', function checkConditionNames(value) {\n    const ids = strapi.service('admin::permission').conditionProvider.keys();\n    return _.isUndefined(value) || _.difference(value, ids).length === 0\n      ? true\n      : this.createError({ path: this.path, message: `contains conditions that don't exist` });\n  });\n\nexport const permissionsAreEquals = (a: any, b: any) =>\n  a.action === b.action && (a.subject === b.subject || (_.isNil(a.subject) && _.isNil(b.subject)));\n\nconst checkNoDuplicatedPermissions = (permissions: unknown) =>\n  !Array.isArray(permissions) ||\n  permissions.every((permA, i) =>\n    permissions.slice(i + 1).every((permB) => !permissionsAreEquals(permA, permB))\n  );\n\nconst checkNilFields = (action: Action) =>\n  function checkNilActionFields(fields: typeof actionFields) {\n    // If the parent has no action field, then we ignore this test\n    if (isNil(action)) {\n      return true;\n    }\n\n    return actionDomain.appliesToProperty('fields', action) || isNil(fields);\n  };\n\nconst fieldsPropertyValidation = (action: Action) =>\n  yup\n    .array()\n    .of(yup.string())\n    .nullable()\n    .test(\n      'field-nested',\n      'Fields format are incorrect (bad nesting).',\n      checkFieldsAreCorrectlyNested\n    )\n    .test(\n      'field-nested',\n      'Fields format are incorrect (duplicates).',\n      checkFieldsDontHaveDuplicates\n    )\n    .test(\n      'fields-restriction',\n      // eslint-disable-next-line no-template-curly-in-string -- Yup interpolation placeholder\n      'The permission at ${path} must have fields set to null or undefined',\n      // @ts-expect-error yup types\n      checkNilFields(action)\n    );\n\nexport const permission = yup\n  .object()\n  .shape({\n    action: yup\n      .string()\n      .required()\n      .test(\n        'action-validity',\n        'action is not an existing permission action',\n        function checkActionValidity(actionId) {\n          // If the action field is Nil, ignore the test and let the required check handle the error\n          if (isNil(actionId)) {\n            return true;\n          }\n\n          const action = getActionFromProvider(actionId);\n\n          return action !== undefined && action !== null;\n        }\n      ),\n    actionParameters: yup.object().nullable(),\n    subject: yup\n      .string()\n      .nullable()\n      .test(\n        'subject-validity',\n        'Invalid subject submitted',\n        function checkSubjectValidity(subject) {\n          // @ts-expect-error yup types\n          const action = getActionFromProvider(this.options.parent.action);\n\n          if (!action) {\n            return true;\n          }\n\n          if (isNil(action.subjects)) {\n            return isNil(subject);\n          }\n\n          if (isArray(action.subjects) && !isNil(subject)) {\n            return action.subjects.includes(subject);\n          }\n\n          return false;\n        }\n      ),\n    properties: yup\n      .object()\n      .test(\n        'properties-structure',\n        // eslint-disable-next-line no-template-curly-in-string -- Yup interpolation placeholder\n        'Invalid property set at ${path}',\n        function checkPropertiesStructure(properties) {\n          // @ts-expect-error yup types\n          const action = getActionFromProvider(this.options.parent.action) as any;\n          const hasNoProperties = isEmpty(properties) || isNil(properties);\n\n          if (!has('options.applyToProperties', action)) {\n            return hasNoProperties;\n          }\n\n          if (hasNoProperties) {\n            return true;\n          }\n\n          const { applyToProperties } = action.options;\n\n          if (!isArray(applyToProperties)) {\n            return false;\n          }\n\n          return Object.keys(properties).every((property) => applyToProperties.includes(property));\n        }\n      )\n      .test(\n        'fields-property',\n        // eslint-disable-next-line no-template-curly-in-string -- Yup interpolation placeholder\n        'Invalid fields property at ${path}',\n        async function checkFieldsProperty(properties = {}) {\n          // @ts-expect-error yup types\n          const action = getActionFromProvider(this.options.parent.action) as any;\n\n          if (!action || !properties) {\n            return true;\n          }\n\n          if (!actionDomain.appliesToProperty('fields', action)) {\n            return true;\n          }\n\n          try {\n            await fieldsPropertyValidation(action).validate(properties.fields, {\n              strict: true,\n              abortEarly: false,\n            });\n            return true;\n          } catch (e: any) {\n            // Propagate fieldsPropertyValidation error with updated path\n            throw this.createError({\n              message: e.message,\n              path: `${this.path}.fields`,\n            });\n          }\n        }\n      ),\n    conditions: yup.array().of(yup.string()),\n  })\n  .noUnknown();\n\nexport const updatePermissions = yup\n  .object()\n  .shape({\n    permissions: yup\n      .array()\n      .required()\n      .of(permission)\n      .test(\n        'duplicated-permissions',\n        'Some permissions are duplicated (same action and subject)',\n        checkNoDuplicatedPermissions\n      ),\n  })\n  .required()\n  .noUnknown();\n\nexport default {\n  email,\n  firstname,\n  lastname,\n  username,\n  password,\n  roles,\n  isAPluginName,\n  arrayOfConditionNames,\n  permission,\n  updatePermissions,\n};\n"],"names":["actionFields","actions","getActionFromProvider","actionId","getService","actionProvider","get","email","yup","string","lowercase","firstname","trim","min","lastname","username","password","test","checkByteSize","value","byteSize","TextEncoder","encode","length","matches","roles","array","strapiID","isAPluginName","checkPluginName","undefined","Object","keys","strapi","plugins","includes","createError","path","message","of","checkConditionNames","ids","service","conditionProvider","_","isUndefined","difference","permissionsAreEquals","a","b","action","subject","isNil","checkNoDuplicatedPermissions","permissions","Array","isArray","every","permA","i","slice","permB","checkNilFields","checkNilActionFields","fields","actionDomain","appliesToProperty","fieldsPropertyValidation","nullable","checkFieldsAreCorrectlyNested","checkFieldsDontHaveDuplicates","permission","object","shape","required","checkActionValidity","actionParameters","checkSubjectValidity","options","parent","subjects","properties","checkPropertiesStructure","hasNoProperties","isEmpty","has","applyToProperties","property","checkFieldsProperty","validate","strict","abortEarly","e","conditions","noUnknown","updatePermissions","arrayOfConditionNames"],"mappings":"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"}
+{"version":3,"file":"common-validators.js","sources":["../../../../../server/src/validation/common-validators.ts"],"sourcesContent":["import { yup } from '@strapi/utils';\nimport _, { isEmpty, has } from 'lodash';\n\nimport { getService } from '../utils';\nimport actionDomain, { type Action } from '../domain/action';\nimport { checkFieldsAreCorrectlyNested, checkFieldsDontHaveDuplicates } from './common-functions';\nimport actions from '../domain/action/index';\n\nconst { actionFields } = actions;\n\nconst getActionFromProvider = (actionId: string) => {\n  return getService('permission').actionProvider.get(actionId);\n};\n\nexport const email = yup.string().email().lowercase();\n\nexport const firstname = yup.string().trim().min(1);\n\nexport const lastname = yup.string();\n\nexport const username = yup.string().min(1);\n\nexport const password = yup\n  .string()\n  .min(8)\n  // eslint-disable-next-line no-template-curly-in-string -- Yup interpolation placeholder\n  .test('required-byte-size', '${path} must be less than 73 bytes', function checkByteSize(value) {\n    if (!value) return true;\n\n    const byteSize = new TextEncoder().encode(value).length;\n    return byteSize <= 72;\n  })\n  // eslint-disable-next-line no-template-curly-in-string -- Yup interpolation placeholder\n  .matches(/[a-z]/, '${path} must contain at least one lowercase character')\n  // eslint-disable-next-line no-template-curly-in-string -- Yup interpolation placeholder\n  .matches(/[A-Z]/, '${path} must contain at least one uppercase character')\n  // eslint-disable-next-line no-template-curly-in-string -- Yup interpolation placeholder\n  .matches(/\\d/, '${path} must contain at least one number');\n\nexport const roles = yup.array(yup.strapiID()).min(1);\n\nconst isAPluginName = yup\n  .string()\n  .test('is-a-plugin-name', 'is not a plugin name', function checkPluginName(value) {\n    return [undefined, 'admin', ...Object.keys(strapi.plugins)].includes(value)\n      ? true\n      : this.createError({ path: this.path, message: `${this.path} is not an existing plugin` });\n  });\n\nexport const arrayOfConditionNames = yup\n  .array()\n  .of(yup.string())\n  .test('is-an-array-of-conditions', 'is not a plugin name', function checkConditionNames(value) {\n    const ids = strapi.service('admin::permission').conditionProvider.keys();\n    return _.isUndefined(value) || _.difference(value, ids).length === 0\n      ? true\n      : this.createError({ path: this.path, message: `contains conditions that don't exist` });\n  });\n\nexport const permissionsAreEquals = (a: any, b: any) =>\n  a.action === b.action && (a.subject === b.subject || (_.isNil(a.subject) && _.isNil(b.subject)));\n\nconst checkNoDuplicatedPermissions = (permissions: unknown) =>\n  !Array.isArray(permissions) ||\n  permissions.every((permA, i) =>\n    permissions.slice(i + 1).every((permB) => !permissionsAreEquals(permA, permB))\n  );\n\nconst checkNilFields = (action: Action) =>\n  function checkNilActionFields(fields: typeof actionFields) {\n    // If the parent has no action field, then we ignore this test\n    if (action == null) {\n      return true;\n    }\n\n    return actionDomain.appliesToProperty('fields', action) || fields == null;\n  };\n\nconst fieldsPropertyValidation = (action: Action) =>\n  yup\n    .array()\n    .of(yup.string())\n    .nullable()\n    .test(\n      'field-nested',\n      'Fields format are incorrect (bad nesting).',\n      checkFieldsAreCorrectlyNested\n    )\n    .test(\n      'field-nested',\n      'Fields format are incorrect (duplicates).',\n      checkFieldsDontHaveDuplicates\n    )\n    .test(\n      'fields-restriction',\n      // eslint-disable-next-line no-template-curly-in-string -- Yup interpolation placeholder\n      'The permission at ${path} must have fields set to null or undefined',\n      // @ts-expect-error yup types\n      checkNilFields(action)\n    );\n\nexport const permission = yup\n  .object()\n  .shape({\n    action: yup\n      .string()\n      .required()\n      .test(\n        'action-validity',\n        'action is not an existing permission action',\n        function checkActionValidity(actionId) {\n          // If the action field is Nil, ignore the test and let the required check handle the error\n          if (actionId == null) {\n            return true;\n          }\n\n          const action = getActionFromProvider(actionId);\n\n          return action !== undefined && action !== null;\n        }\n      ),\n    actionParameters: yup.object().nullable(),\n    subject: yup\n      .string()\n      .nullable()\n      .test(\n        'subject-validity',\n        'Invalid subject submitted',\n        function checkSubjectValidity(subject) {\n          // @ts-expect-error yup types\n          const action = getActionFromProvider(this.options.parent.action);\n\n          if (!action) {\n            return true;\n          }\n\n          if (action.subjects == null) {\n            return subject == null;\n          }\n\n          if (Array.isArray(action.subjects) && subject != null) {\n            return action.subjects.includes(subject);\n          }\n\n          return false;\n        }\n      ),\n    properties: yup\n      .object()\n      .test(\n        'properties-structure',\n        // eslint-disable-next-line no-template-curly-in-string -- Yup interpolation placeholder\n        'Invalid property set at ${path}',\n        function checkPropertiesStructure(properties) {\n          // @ts-expect-error yup types\n          const action = getActionFromProvider(this.options.parent.action) as any;\n          const hasNoProperties = isEmpty(properties) || properties == null;\n\n          if (!has(action, 'options.applyToProperties')) {\n            return hasNoProperties;\n          }\n\n          if (hasNoProperties) {\n            return true;\n          }\n\n          const { applyToProperties } = action.options;\n\n          if (!Array.isArray(applyToProperties)) {\n            return false;\n          }\n\n          return Object.keys(properties).every((property) => applyToProperties.includes(property));\n        }\n      )\n      .test(\n        'fields-property',\n        // eslint-disable-next-line no-template-curly-in-string -- Yup interpolation placeholder\n        'Invalid fields property at ${path}',\n        async function checkFieldsProperty(properties = {}) {\n          // @ts-expect-error yup types\n          const action = getActionFromProvider(this.options.parent.action) as any;\n\n          if (!action || !properties) {\n            return true;\n          }\n\n          if (!actionDomain.appliesToProperty('fields', action)) {\n            return true;\n          }\n\n          try {\n            await fieldsPropertyValidation(action).validate(properties.fields, {\n              strict: true,\n              abortEarly: false,\n            });\n            return true;\n          } catch (e: any) {\n            // Propagate fieldsPropertyValidation error with updated path\n            throw this.createError({\n              message: e.message,\n              path: `${this.path}.fields`,\n            });\n          }\n        }\n      ),\n    conditions: yup.array().of(yup.string()),\n  })\n  .noUnknown();\n\nexport const updatePermissions = yup\n  .object()\n  .shape({\n    permissions: yup\n      .array()\n      .required()\n      .of(permission)\n      .test(\n        'duplicated-permissions',\n        'Some permissions are duplicated (same action and subject)',\n        checkNoDuplicatedPermissions\n      ),\n  })\n  .required()\n  .noUnknown();\n\nexport default {\n  email,\n  firstname,\n  lastname,\n  username,\n  password,\n  roles,\n  isAPluginName,\n  arrayOfConditionNames,\n  permission,\n  updatePermissions,\n};\n"],"names":["actionFields","actions","getActionFromProvider","actionId","getService","actionProvider","get","email","yup","string","lowercase","firstname","trim","min","lastname","username","password","test","checkByteSize","value","byteSize","TextEncoder","encode","length","matches","roles","array","strapiID","isAPluginName","checkPluginName","undefined","Object","keys","strapi","plugins","includes","createError","path","message","of","checkConditionNames","ids","service","conditionProvider","_","isUndefined","difference","permissionsAreEquals","a","b","action","subject","isNil","checkNoDuplicatedPermissions","permissions","Array","isArray","every","permA","i","slice","permB","checkNilFields","checkNilActionFields","fields","actionDomain","appliesToProperty","fieldsPropertyValidation","nullable","checkFieldsAreCorrectlyNested","checkFieldsDontHaveDuplicates","permission","object","shape","required","checkActionValidity","actionParameters","checkSubjectValidity","options","parent","subjects","properties","checkPropertiesStructure","hasNoProperties","isEmpty","has","applyToProperties","property","checkFieldsProperty","validate","strict","abortEarly","e","conditions","noUnknown","updatePermissions","arrayOfConditionNames"],"mappings":"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"}

package/dist/server/server/src/validation/common-validators.mjs

@@ -1,12 +1,11 @@
 import { yup } from '@strapi/utils';
-import ___default from 'lodash';
-import { isEmpty, isNil, has, isArray } from 'lodash/fp';
+import ___default, { isEmpty, has } from 'lodash';
 import { getService } from '../utils/index.mjs';
-import actionDomain from '../domain/action/index.mjs';
+import domain from '../domain/action/index.mjs';
 import checkFieldsAreCorrectlyNested from './common-functions/check-fields-are-correctly-nested.mjs';
 import checkFieldsDontHaveDuplicates from './common-functions/check-fields-dont-have-duplicates.mjs';
 
-const { actionFields } = actionDomain;
+const { actionFields } = domain;
 const getActionFromProvider = (actionId)=>{
     return getService('permission').actionProvider.get(actionId);
 };
@@ -45,10 +44,10 @@ const permissionsAreEquals = (a, b)=>a.action === b.action && (a.subject === b.s
 const checkNoDuplicatedPermissions = (permissions)=>!Array.isArray(permissions) || permissions.every((permA, i)=>permissions.slice(i + 1).every((permB)=>!permissionsAreEquals(permA, permB)));
 const checkNilFields = (action)=>function checkNilActionFields(fields) {
         // If the parent has no action field, then we ignore this test
-        if (isNil(action)) {
+        if (action == null) {
             return true;
         }
-        return actionDomain.appliesToProperty('fields', action) || isNil(fields);
+        return domain.appliesToProperty('fields', action) || fields == null;
     };
 const fieldsPropertyValidation = (action)=>yup.array().of(yup.string()).nullable().test('field-nested', 'Fields format are incorrect (bad nesting).', checkFieldsAreCorrectlyNested).test('field-nested', 'Fields format are incorrect (duplicates).', checkFieldsDontHaveDuplicates).test('fields-restriction', // eslint-disable-next-line no-template-curly-in-string -- Yup interpolation placeholder
     'The permission at ${path} must have fields set to null or undefined', // @ts-expect-error yup types
@@ -56,7 +55,7 @@ const fieldsPropertyValidation = (action)=>yup.array().of(yup.string()).nullable
 const permission = yup.object().shape({
     action: yup.string().required().test('action-validity', 'action is not an existing permission action', function checkActionValidity(actionId) {
         // If the action field is Nil, ignore the test and let the required check handle the error
-        if (isNil(actionId)) {
+        if (actionId == null) {
             return true;
         }
         const action = getActionFromProvider(actionId);
@@ -69,10 +68,10 @@ const permission = yup.object().shape({
         if (!action) {
             return true;
         }
-        if (isNil(action.subjects)) {
-            return isNil(subject);
+        if (action.subjects == null) {
+            return subject == null;
         }
-        if (isArray(action.subjects) && !isNil(subject)) {
+        if (Array.isArray(action.subjects) && subject != null) {
             return action.subjects.includes(subject);
         }
         return false;
@@ -81,15 +80,15 @@ const permission = yup.object().shape({
     'Invalid property set at ${path}', function checkPropertiesStructure(properties) {
         // @ts-expect-error yup types
         const action = getActionFromProvider(this.options.parent.action);
-        const hasNoProperties = isEmpty(properties) || isNil(properties);
-        if (!has('options.applyToProperties', action)) {
+        const hasNoProperties = isEmpty(properties) || properties == null;
+        if (!has(action, 'options.applyToProperties')) {
             return hasNoProperties;
         }
         if (hasNoProperties) {
             return true;
         }
         const { applyToProperties } = action.options;
-        if (!isArray(applyToProperties)) {
+        if (!Array.isArray(applyToProperties)) {
             return false;
         }
         return Object.keys(properties).every((property)=>applyToProperties.includes(property));
@@ -100,7 +99,7 @@ const permission = yup.object().shape({
         if (!action || !properties) {
             return true;
         }
-        if (!actionDomain.appliesToProperty('fields', action)) {
+        if (!domain.appliesToProperty('fields', action)) {
             return true;
         }
         try {

package/dist/server/server/src/validation/common-validators.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"common-validators.mjs","sources":["../../../../../server/src/validation/common-validators.ts"],"sourcesContent":["import { yup } from '@strapi/utils';\nimport _ from 'lodash';\nimport { isEmpty, has, isNil, isArray } from 'lodash/fp';\nimport { getService } from '../utils';\nimport actionDomain, { type Action } from '../domain/action';\nimport { checkFieldsAreCorrectlyNested, checkFieldsDontHaveDuplicates } from './common-functions';\nimport actions from '../domain/action/index';\n\nconst { actionFields } = actions;\n\nconst getActionFromProvider = (actionId: string) => {\n  return getService('permission').actionProvider.get(actionId);\n};\n\nexport const email = yup.string().email().lowercase();\n\nexport const firstname = yup.string().trim().min(1);\n\nexport const lastname = yup.string();\n\nexport const username = yup.string().min(1);\n\nexport const password = yup\n  .string()\n  .min(8)\n  // eslint-disable-next-line no-template-curly-in-string -- Yup interpolation placeholder\n  .test('required-byte-size', '${path} must be less than 73 bytes', function checkByteSize(value) {\n    if (!value) return true;\n\n    const byteSize = new TextEncoder().encode(value).length;\n    return byteSize <= 72;\n  })\n  // eslint-disable-next-line no-template-curly-in-string -- Yup interpolation placeholder\n  .matches(/[a-z]/, '${path} must contain at least one lowercase character')\n  // eslint-disable-next-line no-template-curly-in-string -- Yup interpolation placeholder\n  .matches(/[A-Z]/, '${path} must contain at least one uppercase character')\n  // eslint-disable-next-line no-template-curly-in-string -- Yup interpolation placeholder\n  .matches(/\\d/, '${path} must contain at least one number');\n\nexport const roles = yup.array(yup.strapiID()).min(1);\n\nconst isAPluginName = yup\n  .string()\n  .test('is-a-plugin-name', 'is not a plugin name', function checkPluginName(value) {\n    return [undefined, 'admin', ...Object.keys(strapi.plugins)].includes(value)\n      ? true\n      : this.createError({ path: this.path, message: `${this.path} is not an existing plugin` });\n  });\n\nexport const arrayOfConditionNames = yup\n  .array()\n  .of(yup.string())\n  .test('is-an-array-of-conditions', 'is not a plugin name', function checkConditionNames(value) {\n    const ids = strapi.service('admin::permission').conditionProvider.keys();\n    return _.isUndefined(value) || _.difference(value, ids).length === 0\n      ? true\n      : this.createError({ path: this.path, message: `contains conditions that don't exist` });\n  });\n\nexport const permissionsAreEquals = (a: any, b: any) =>\n  a.action === b.action && (a.subject === b.subject || (_.isNil(a.subject) && _.isNil(b.subject)));\n\nconst checkNoDuplicatedPermissions = (permissions: unknown) =>\n  !Array.isArray(permissions) ||\n  permissions.every((permA, i) =>\n    permissions.slice(i + 1).every((permB) => !permissionsAreEquals(permA, permB))\n  );\n\nconst checkNilFields = (action: Action) =>\n  function checkNilActionFields(fields: typeof actionFields) {\n    // If the parent has no action field, then we ignore this test\n    if (isNil(action)) {\n      return true;\n    }\n\n    return actionDomain.appliesToProperty('fields', action) || isNil(fields);\n  };\n\nconst fieldsPropertyValidation = (action: Action) =>\n  yup\n    .array()\n    .of(yup.string())\n    .nullable()\n    .test(\n      'field-nested',\n      'Fields format are incorrect (bad nesting).',\n      checkFieldsAreCorrectlyNested\n    )\n    .test(\n      'field-nested',\n      'Fields format are incorrect (duplicates).',\n      checkFieldsDontHaveDuplicates\n    )\n    .test(\n      'fields-restriction',\n      // eslint-disable-next-line no-template-curly-in-string -- Yup interpolation placeholder\n      'The permission at ${path} must have fields set to null or undefined',\n      // @ts-expect-error yup types\n      checkNilFields(action)\n    );\n\nexport const permission = yup\n  .object()\n  .shape({\n    action: yup\n      .string()\n      .required()\n      .test(\n        'action-validity',\n        'action is not an existing permission action',\n        function checkActionValidity(actionId) {\n          // If the action field is Nil, ignore the test and let the required check handle the error\n          if (isNil(actionId)) {\n            return true;\n          }\n\n          const action = getActionFromProvider(actionId);\n\n          return action !== undefined && action !== null;\n        }\n      ),\n    actionParameters: yup.object().nullable(),\n    subject: yup\n      .string()\n      .nullable()\n      .test(\n        'subject-validity',\n        'Invalid subject submitted',\n        function checkSubjectValidity(subject) {\n          // @ts-expect-error yup types\n          const action = getActionFromProvider(this.options.parent.action);\n\n          if (!action) {\n            return true;\n          }\n\n          if (isNil(action.subjects)) {\n            return isNil(subject);\n          }\n\n          if (isArray(action.subjects) && !isNil(subject)) {\n            return action.subjects.includes(subject);\n          }\n\n          return false;\n        }\n      ),\n    properties: yup\n      .object()\n      .test(\n        'properties-structure',\n        // eslint-disable-next-line no-template-curly-in-string -- Yup interpolation placeholder\n        'Invalid property set at ${path}',\n        function checkPropertiesStructure(properties) {\n          // @ts-expect-error yup types\n          const action = getActionFromProvider(this.options.parent.action) as any;\n          const hasNoProperties = isEmpty(properties) || isNil(properties);\n\n          if (!has('options.applyToProperties', action)) {\n            return hasNoProperties;\n          }\n\n          if (hasNoProperties) {\n            return true;\n          }\n\n          const { applyToProperties } = action.options;\n\n          if (!isArray(applyToProperties)) {\n            return false;\n          }\n\n          return Object.keys(properties).every((property) => applyToProperties.includes(property));\n        }\n      )\n      .test(\n        'fields-property',\n        // eslint-disable-next-line no-template-curly-in-string -- Yup interpolation placeholder\n        'Invalid fields property at ${path}',\n        async function checkFieldsProperty(properties = {}) {\n          // @ts-expect-error yup types\n          const action = getActionFromProvider(this.options.parent.action) as any;\n\n          if (!action || !properties) {\n            return true;\n          }\n\n          if (!actionDomain.appliesToProperty('fields', action)) {\n            return true;\n          }\n\n          try {\n            await fieldsPropertyValidation(action).validate(properties.fields, {\n              strict: true,\n              abortEarly: false,\n            });\n            return true;\n          } catch (e: any) {\n            // Propagate fieldsPropertyValidation error with updated path\n            throw this.createError({\n              message: e.message,\n              path: `${this.path}.fields`,\n            });\n          }\n        }\n      ),\n    conditions: yup.array().of(yup.string()),\n  })\n  .noUnknown();\n\nexport const updatePermissions = yup\n  .object()\n  .shape({\n    permissions: yup\n      .array()\n      .required()\n      .of(permission)\n      .test(\n        'duplicated-permissions',\n        'Some permissions are duplicated (same action and subject)',\n        checkNoDuplicatedPermissions\n      ),\n  })\n  .required()\n  .noUnknown();\n\nexport default {\n  email,\n  firstname,\n  lastname,\n  username,\n  password,\n  roles,\n  isAPluginName,\n  arrayOfConditionNames,\n  permission,\n  updatePermissions,\n};\n"],"names":["actionFields","actions","getActionFromProvider","actionId","getService","actionProvider","get","email","yup","string","lowercase","firstname","trim","min","lastname","username","password","test","checkByteSize","value","byteSize","TextEncoder","encode","length","matches","roles","array","strapiID","isAPluginName","checkPluginName","undefined","Object","keys","strapi","plugins","includes","createError","path","message","of","checkConditionNames","ids","service","conditionProvider","_","isUndefined","difference","permissionsAreEquals","a","b","action","subject","isNil","checkNoDuplicatedPermissions","permissions","Array","isArray","every","permA","i","slice","permB","checkNilFields","checkNilActionFields","fields","actionDomain","appliesToProperty","fieldsPropertyValidation","nullable","checkFieldsAreCorrectlyNested","checkFieldsDontHaveDuplicates","permission","object","shape","required","checkActionValidity","actionParameters","checkSubjectValidity","options","parent","subjects","properties","checkPropertiesStructure","hasNoProperties","isEmpty","has","applyToProperties","property","checkFieldsProperty","validate","strict","abortEarly","e","conditions","noUnknown","updatePermissions","arrayOfConditionNames"],"mappings":"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"}
+{"version":3,"file":"common-validators.mjs","sources":["../../../../../server/src/validation/common-validators.ts"],"sourcesContent":["import { yup } from '@strapi/utils';\nimport _, { isEmpty, has } from 'lodash';\n\nimport { getService } from '../utils';\nimport actionDomain, { type Action } from '../domain/action';\nimport { checkFieldsAreCorrectlyNested, checkFieldsDontHaveDuplicates } from './common-functions';\nimport actions from '../domain/action/index';\n\nconst { actionFields } = actions;\n\nconst getActionFromProvider = (actionId: string) => {\n  return getService('permission').actionProvider.get(actionId);\n};\n\nexport const email = yup.string().email().lowercase();\n\nexport const firstname = yup.string().trim().min(1);\n\nexport const lastname = yup.string();\n\nexport const username = yup.string().min(1);\n\nexport const password = yup\n  .string()\n  .min(8)\n  // eslint-disable-next-line no-template-curly-in-string -- Yup interpolation placeholder\n  .test('required-byte-size', '${path} must be less than 73 bytes', function checkByteSize(value) {\n    if (!value) return true;\n\n    const byteSize = new TextEncoder().encode(value).length;\n    return byteSize <= 72;\n  })\n  // eslint-disable-next-line no-template-curly-in-string -- Yup interpolation placeholder\n  .matches(/[a-z]/, '${path} must contain at least one lowercase character')\n  // eslint-disable-next-line no-template-curly-in-string -- Yup interpolation placeholder\n  .matches(/[A-Z]/, '${path} must contain at least one uppercase character')\n  // eslint-disable-next-line no-template-curly-in-string -- Yup interpolation placeholder\n  .matches(/\\d/, '${path} must contain at least one number');\n\nexport const roles = yup.array(yup.strapiID()).min(1);\n\nconst isAPluginName = yup\n  .string()\n  .test('is-a-plugin-name', 'is not a plugin name', function checkPluginName(value) {\n    return [undefined, 'admin', ...Object.keys(strapi.plugins)].includes(value)\n      ? true\n      : this.createError({ path: this.path, message: `${this.path} is not an existing plugin` });\n  });\n\nexport const arrayOfConditionNames = yup\n  .array()\n  .of(yup.string())\n  .test('is-an-array-of-conditions', 'is not a plugin name', function checkConditionNames(value) {\n    const ids = strapi.service('admin::permission').conditionProvider.keys();\n    return _.isUndefined(value) || _.difference(value, ids).length === 0\n      ? true\n      : this.createError({ path: this.path, message: `contains conditions that don't exist` });\n  });\n\nexport const permissionsAreEquals = (a: any, b: any) =>\n  a.action === b.action && (a.subject === b.subject || (_.isNil(a.subject) && _.isNil(b.subject)));\n\nconst checkNoDuplicatedPermissions = (permissions: unknown) =>\n  !Array.isArray(permissions) ||\n  permissions.every((permA, i) =>\n    permissions.slice(i + 1).every((permB) => !permissionsAreEquals(permA, permB))\n  );\n\nconst checkNilFields = (action: Action) =>\n  function checkNilActionFields(fields: typeof actionFields) {\n    // If the parent has no action field, then we ignore this test\n    if (action == null) {\n      return true;\n    }\n\n    return actionDomain.appliesToProperty('fields', action) || fields == null;\n  };\n\nconst fieldsPropertyValidation = (action: Action) =>\n  yup\n    .array()\n    .of(yup.string())\n    .nullable()\n    .test(\n      'field-nested',\n      'Fields format are incorrect (bad nesting).',\n      checkFieldsAreCorrectlyNested\n    )\n    .test(\n      'field-nested',\n      'Fields format are incorrect (duplicates).',\n      checkFieldsDontHaveDuplicates\n    )\n    .test(\n      'fields-restriction',\n      // eslint-disable-next-line no-template-curly-in-string -- Yup interpolation placeholder\n      'The permission at ${path} must have fields set to null or undefined',\n      // @ts-expect-error yup types\n      checkNilFields(action)\n    );\n\nexport const permission = yup\n  .object()\n  .shape({\n    action: yup\n      .string()\n      .required()\n      .test(\n        'action-validity',\n        'action is not an existing permission action',\n        function checkActionValidity(actionId) {\n          // If the action field is Nil, ignore the test and let the required check handle the error\n          if (actionId == null) {\n            return true;\n          }\n\n          const action = getActionFromProvider(actionId);\n\n          return action !== undefined && action !== null;\n        }\n      ),\n    actionParameters: yup.object().nullable(),\n    subject: yup\n      .string()\n      .nullable()\n      .test(\n        'subject-validity',\n        'Invalid subject submitted',\n        function checkSubjectValidity(subject) {\n          // @ts-expect-error yup types\n          const action = getActionFromProvider(this.options.parent.action);\n\n          if (!action) {\n            return true;\n          }\n\n          if (action.subjects == null) {\n            return subject == null;\n          }\n\n          if (Array.isArray(action.subjects) && subject != null) {\n            return action.subjects.includes(subject);\n          }\n\n          return false;\n        }\n      ),\n    properties: yup\n      .object()\n      .test(\n        'properties-structure',\n        // eslint-disable-next-line no-template-curly-in-string -- Yup interpolation placeholder\n        'Invalid property set at ${path}',\n        function checkPropertiesStructure(properties) {\n          // @ts-expect-error yup types\n          const action = getActionFromProvider(this.options.parent.action) as any;\n          const hasNoProperties = isEmpty(properties) || properties == null;\n\n          if (!has(action, 'options.applyToProperties')) {\n            return hasNoProperties;\n          }\n\n          if (hasNoProperties) {\n            return true;\n          }\n\n          const { applyToProperties } = action.options;\n\n          if (!Array.isArray(applyToProperties)) {\n            return false;\n          }\n\n          return Object.keys(properties).every((property) => applyToProperties.includes(property));\n        }\n      )\n      .test(\n        'fields-property',\n        // eslint-disable-next-line no-template-curly-in-string -- Yup interpolation placeholder\n        'Invalid fields property at ${path}',\n        async function checkFieldsProperty(properties = {}) {\n          // @ts-expect-error yup types\n          const action = getActionFromProvider(this.options.parent.action) as any;\n\n          if (!action || !properties) {\n            return true;\n          }\n\n          if (!actionDomain.appliesToProperty('fields', action)) {\n            return true;\n          }\n\n          try {\n            await fieldsPropertyValidation(action).validate(properties.fields, {\n              strict: true,\n              abortEarly: false,\n            });\n            return true;\n          } catch (e: any) {\n            // Propagate fieldsPropertyValidation error with updated path\n            throw this.createError({\n              message: e.message,\n              path: `${this.path}.fields`,\n            });\n          }\n        }\n      ),\n    conditions: yup.array().of(yup.string()),\n  })\n  .noUnknown();\n\nexport const updatePermissions = yup\n  .object()\n  .shape({\n    permissions: yup\n      .array()\n      .required()\n      .of(permission)\n      .test(\n        'duplicated-permissions',\n        'Some permissions are duplicated (same action and subject)',\n        checkNoDuplicatedPermissions\n      ),\n  })\n  .required()\n  .noUnknown();\n\nexport default {\n  email,\n  firstname,\n  lastname,\n  username,\n  password,\n  roles,\n  isAPluginName,\n  arrayOfConditionNames,\n  permission,\n  updatePermissions,\n};\n"],"names":["actionFields","actions","getActionFromProvider","actionId","getService","actionProvider","get","email","yup","string","lowercase","firstname","trim","min","lastname","username","password","test","checkByteSize","value","byteSize","TextEncoder","encode","length","matches","roles","array","strapiID","isAPluginName","checkPluginName","undefined","Object","keys","strapi","plugins","includes","createError","path","message","of","checkConditionNames","ids","service","conditionProvider","_","isUndefined","difference","permissionsAreEquals","a","b","action","subject","isNil","checkNoDuplicatedPermissions","permissions","Array","isArray","every","permA","i","slice","permB","checkNilFields","checkNilActionFields","fields","actionDomain","appliesToProperty","fieldsPropertyValidation","nullable","checkFieldsAreCorrectlyNested","checkFieldsDontHaveDuplicates","permission","object","shape","required","checkActionValidity","actionParameters","checkSubjectValidity","options","parent","subjects","properties","checkPropertiesStructure","hasNoProperties","isEmpty","has","applyToProperties","property","checkFieldsProperty","validate","strict","abortEarly","e","conditions","noUnknown","updatePermissions","arrayOfConditionNames"],"mappings":"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"}

package/dist/server/server/src/validation/user.js

@@ -1,6 +1,5 @@
 'use strict';
 
-var fp = require('lodash/fp');
 var utils = require('@strapi/utils');
 var commonValidators = require('./common-validators.js');
 
@@ -17,7 +16,7 @@ const profileUpdateSchema = utils.yup.object().shape({
     lastname: commonValidators.default.lastname.nullable(),
     username: commonValidators.default.username.nullable(),
     password: commonValidators.default.password.notNull(),
-    currentPassword: utils.yup.string().when('password', (password, schema)=>!fp.isUndefined(password) ? schema.required() : schema).notNull(),
+    currentPassword: utils.yup.string().when('password', (password, schema)=>password !== undefined ? schema.required() : schema).notNull(),
     preferedLanguage: utils.yup.string().nullable()
 }).noUnknown();
 const userUpdateSchema = utils.yup.object().shape({

package/dist/server/server/src/validation/user.js.map

@@ -1 +1 @@
-{"version":3,"file":"user.js","sources":["../../../../../server/src/validation/user.ts"],"sourcesContent":["import { isUndefined } from 'lodash/fp';\nimport { yup, validateYupSchema } from '@strapi/utils';\nimport validators from './common-validators';\n\nconst userCreationSchema = yup\n  .object()\n  .shape({\n    email: validators.email.required(),\n    firstname: validators.firstname.required(),\n    lastname: validators.lastname,\n    roles: validators.roles.min(1),\n    preferedLanguage: yup.string().nullable(),\n  })\n  .noUnknown();\n\nconst profileUpdateSchema = yup\n  .object()\n  .shape({\n    email: validators.email.notNull(),\n    firstname: validators.firstname.notNull(),\n    lastname: validators.lastname.nullable(),\n    username: validators.username.nullable(),\n    password: validators.password.notNull(),\n    currentPassword: yup\n      .string()\n      .when('password', (password: string, schema: any) =>\n        !isUndefined(password) ? schema.required() : schema\n      )\n      .notNull(),\n    preferedLanguage: yup.string().nullable(),\n  })\n  .noUnknown();\n\nconst userUpdateSchema = yup\n  .object()\n  .shape({\n    email: validators.email.notNull(),\n    firstname: validators.firstname.notNull(),\n    lastname: validators.lastname.nullable(),\n    username: validators.username.nullable(),\n    password: validators.password.notNull(),\n    isActive: yup.bool().notNull(),\n    roles: validators.roles.min(1).notNull(),\n  })\n  .noUnknown();\n\nconst usersDeleteSchema = yup\n  .object()\n  .shape({\n    ids: yup.array().of(yup.strapiID()).min(1).required(),\n  })\n  .noUnknown();\n\nexport const validateUserCreationInput = validateYupSchema(userCreationSchema);\nexport const validateProfileUpdateInput = validateYupSchema(profileUpdateSchema);\nexport const validateUserUpdateInput = validateYupSchema(userUpdateSchema);\nexport const validateUsersDeleteInput = validateYupSchema(usersDeleteSchema);\nexport const schemas = {\n  userCreationSchema,\n  usersDeleteSchema,\n  userUpdateSchema,\n};\n\nexport default {\n  validateUserCreationInput,\n  validateProfileUpdateInput,\n  validateUserUpdateInput,\n  validateUsersDeleteInput,\n  schemas,\n};\n"],"names":["userCreationSchema","yup","object","shape","email","validators","required","firstname","lastname","roles","min","preferedLanguage","string","nullable","noUnknown","profileUpdateSchema","notNull","username","password","currentPassword","when","schema","isUndefined","userUpdateSchema","isActive","bool","usersDeleteSchema","ids","array","of","strapiID","validateUserCreationInput","validateYupSchema","validateProfileUpdateInput","validateUserUpdateInput","validateUsersDeleteInput","schemas"],"mappings":";;;;;;AAIA,MAAMA,kBAAAA,GAAqBC,SAAAA,CACxBC,MAAM,EAAA,CACNC,KAAK,CAAC;IACLC,KAAAA,EAAOC,wBAAAA,CAAWD,KAAK,CAACE,QAAQ,EAAA;IAChCC,SAAAA,EAAWF,wBAAAA,CAAWE,SAAS,CAACD,QAAQ,EAAA;AACxCE,IAAAA,QAAAA,EAAUH,yBAAWG,QAAQ;AAC7BC,IAAAA,KAAAA,EAAOJ,wBAAAA,CAAWI,KAAK,CAACC,GAAG,CAAC,CAAA,CAAA;IAC5BC,gBAAAA,EAAkBV,SAAAA,CAAIW,MAAM,EAAA,CAAGC,QAAQ;AACzC,CAAA,CAAA,CACCC,SAAS,EAAA;AAEZ,MAAMC,mBAAAA,GAAsBd,SAAAA,CACzBC,MAAM,EAAA,CACNC,KAAK,CAAC;IACLC,KAAAA,EAAOC,wBAAAA,CAAWD,KAAK,CAACY,OAAO,EAAA;IAC/BT,SAAAA,EAAWF,wBAAAA,CAAWE,SAAS,CAACS,OAAO,EAAA;IACvCR,QAAAA,EAAUH,wBAAAA,CAAWG,QAAQ,CAACK,QAAQ,EAAA;IACtCI,QAAAA,EAAUZ,wBAAAA,CAAWY,QAAQ,CAACJ,QAAQ,EAAA;IACtCK,QAAAA,EAAUb,wBAAAA,CAAWa,QAAQ,CAACF,OAAO,EAAA;AACrCG,IAAAA,eAAAA,EAAiBlB,UACdW,MAAM,EAAA,CACNQ,IAAI,CAAC,YAAY,CAACF,QAAAA,EAAkBG,MAAAA,GACnC,CAACC,eAAYJ,QAAAA,CAAAA,GAAYG,MAAAA,CAAOf,QAAQ,EAAA,GAAKe,QAE9CL,OAAO,EAAA;IACVL,gBAAAA,EAAkBV,SAAAA,CAAIW,MAAM,EAAA,CAAGC,QAAQ;AACzC,CAAA,CAAA,CACCC,SAAS,EAAA;AAEZ,MAAMS,gBAAAA,GAAmBtB,SAAAA,CACtBC,MAAM,EAAA,CACNC,KAAK,CAAC;IACLC,KAAAA,EAAOC,wBAAAA,CAAWD,KAAK,CAACY,OAAO,EAAA;IAC/BT,SAAAA,EAAWF,wBAAAA,CAAWE,SAAS,CAACS,OAAO,EAAA;IACvCR,QAAAA,EAAUH,wBAAAA,CAAWG,QAAQ,CAACK,QAAQ,EAAA;IACtCI,QAAAA,EAAUZ,wBAAAA,CAAWY,QAAQ,CAACJ,QAAQ,EAAA;IACtCK,QAAAA,EAAUb,wBAAAA,CAAWa,QAAQ,CAACF,OAAO,EAAA;IACrCQ,QAAAA,EAAUvB,SAAAA,CAAIwB,IAAI,EAAA,CAAGT,OAAO,EAAA;AAC5BP,IAAAA,KAAAA,EAAOJ,yBAAWI,KAAK,CAACC,GAAG,CAAC,GAAGM,OAAO;AACxC,CAAA,CAAA,CACCF,SAAS,EAAA;AAEZ,MAAMY,iBAAAA,GAAoBzB,SAAAA,CACvBC,MAAM,EAAA,CACNC,KAAK,CAAC;IACLwB,GAAAA,EAAK1B,SAAAA,CAAI2B,KAAK,EAAA,CAAGC,EAAE,CAAC5B,SAAAA,CAAI6B,QAAQ,EAAA,CAAA,CAAIpB,GAAG,CAAC,CAAA,CAAA,CAAGJ,QAAQ;AACrD,CAAA,CAAA,CACCQ,SAAS,EAAA;AAEL,MAAMiB,yBAAAA,GAA4BC,uBAAAA,CAAkBhC,kBAAAA;AACpD,MAAMiC,0BAAAA,GAA6BD,uBAAAA,CAAkBjB,mBAAAA;AACrD,MAAMmB,uBAAAA,GAA0BF,uBAAAA,CAAkBT,gBAAAA;AAClD,MAAMY,wBAAAA,GAA2BH,uBAAAA,CAAkBN,iBAAAA;MAC7CU,OAAAA,GAAU;AACrBpC,IAAAA,kBAGF;;;;;;;;"}
+{"version":3,"file":"user.js","sources":["../../../../../server/src/validation/user.ts"],"sourcesContent":["import { yup, validateYupSchema } from '@strapi/utils';\nimport validators from './common-validators';\n\nconst userCreationSchema = yup\n  .object()\n  .shape({\n    email: validators.email.required(),\n    firstname: validators.firstname.required(),\n    lastname: validators.lastname,\n    roles: validators.roles.min(1),\n    preferedLanguage: yup.string().nullable(),\n  })\n  .noUnknown();\n\nconst profileUpdateSchema = yup\n  .object()\n  .shape({\n    email: validators.email.notNull(),\n    firstname: validators.firstname.notNull(),\n    lastname: validators.lastname.nullable(),\n    username: validators.username.nullable(),\n    password: validators.password.notNull(),\n    currentPassword: yup\n      .string()\n      .when('password', (password: string, schema: any) =>\n        password !== undefined ? schema.required() : schema\n      )\n      .notNull(),\n    preferedLanguage: yup.string().nullable(),\n  })\n  .noUnknown();\n\nconst userUpdateSchema = yup\n  .object()\n  .shape({\n    email: validators.email.notNull(),\n    firstname: validators.firstname.notNull(),\n    lastname: validators.lastname.nullable(),\n    username: validators.username.nullable(),\n    password: validators.password.notNull(),\n    isActive: yup.bool().notNull(),\n    roles: validators.roles.min(1).notNull(),\n  })\n  .noUnknown();\n\nconst usersDeleteSchema = yup\n  .object()\n  .shape({\n    ids: yup.array().of(yup.strapiID()).min(1).required(),\n  })\n  .noUnknown();\n\nexport const validateUserCreationInput = validateYupSchema(userCreationSchema);\nexport const validateProfileUpdateInput = validateYupSchema(profileUpdateSchema);\nexport const validateUserUpdateInput = validateYupSchema(userUpdateSchema);\nexport const validateUsersDeleteInput = validateYupSchema(usersDeleteSchema);\nexport const schemas = {\n  userCreationSchema,\n  usersDeleteSchema,\n  userUpdateSchema,\n};\n\nexport default {\n  validateUserCreationInput,\n  validateProfileUpdateInput,\n  validateUserUpdateInput,\n  validateUsersDeleteInput,\n  schemas,\n};\n"],"names":["userCreationSchema","yup","object","shape","email","validators","required","firstname","lastname","roles","min","preferedLanguage","string","nullable","noUnknown","profileUpdateSchema","notNull","username","password","currentPassword","when","schema","undefined","userUpdateSchema","isActive","bool","usersDeleteSchema","ids","array","of","strapiID","validateUserCreationInput","validateYupSchema","validateProfileUpdateInput","validateUserUpdateInput","validateUsersDeleteInput","schemas"],"mappings":";;;;;AAGA,MAAMA,kBAAAA,GAAqBC,SAAAA,CACxBC,MAAM,EAAA,CACNC,KAAK,CAAC;IACLC,KAAAA,EAAOC,wBAAAA,CAAWD,KAAK,CAACE,QAAQ,EAAA;IAChCC,SAAAA,EAAWF,wBAAAA,CAAWE,SAAS,CAACD,QAAQ,EAAA;AACxCE,IAAAA,QAAAA,EAAUH,yBAAWG,QAAQ;AAC7BC,IAAAA,KAAAA,EAAOJ,wBAAAA,CAAWI,KAAK,CAACC,GAAG,CAAC,CAAA,CAAA;IAC5BC,gBAAAA,EAAkBV,SAAAA,CAAIW,MAAM,EAAA,CAAGC,QAAQ;AACzC,CAAA,CAAA,CACCC,SAAS,EAAA;AAEZ,MAAMC,mBAAAA,GAAsBd,SAAAA,CACzBC,MAAM,EAAA,CACNC,KAAK,CAAC;IACLC,KAAAA,EAAOC,wBAAAA,CAAWD,KAAK,CAACY,OAAO,EAAA;IAC/BT,SAAAA,EAAWF,wBAAAA,CAAWE,SAAS,CAACS,OAAO,EAAA;IACvCR,QAAAA,EAAUH,wBAAAA,CAAWG,QAAQ,CAACK,QAAQ,EAAA;IACtCI,QAAAA,EAAUZ,wBAAAA,CAAWY,QAAQ,CAACJ,QAAQ,EAAA;IACtCK,QAAAA,EAAUb,wBAAAA,CAAWa,QAAQ,CAACF,OAAO,EAAA;AACrCG,IAAAA,eAAAA,EAAiBlB,SAAAA,CACdW,MAAM,EAAA,CACNQ,IAAI,CAAC,UAAA,EAAY,CAACF,QAAAA,EAAkBG,MAAAA,GACnCH,aAAaI,SAAAA,GAAYD,MAAAA,CAAOf,QAAQ,EAAA,GAAKe,QAE9CL,OAAO,EAAA;IACVL,gBAAAA,EAAkBV,SAAAA,CAAIW,MAAM,EAAA,CAAGC,QAAQ;AACzC,CAAA,CAAA,CACCC,SAAS,EAAA;AAEZ,MAAMS,gBAAAA,GAAmBtB,SAAAA,CACtBC,MAAM,EAAA,CACNC,KAAK,CAAC;IACLC,KAAAA,EAAOC,wBAAAA,CAAWD,KAAK,CAACY,OAAO,EAAA;IAC/BT,SAAAA,EAAWF,wBAAAA,CAAWE,SAAS,CAACS,OAAO,EAAA;IACvCR,QAAAA,EAAUH,wBAAAA,CAAWG,QAAQ,CAACK,QAAQ,EAAA;IACtCI,QAAAA,EAAUZ,wBAAAA,CAAWY,QAAQ,CAACJ,QAAQ,EAAA;IACtCK,QAAAA,EAAUb,wBAAAA,CAAWa,QAAQ,CAACF,OAAO,EAAA;IACrCQ,QAAAA,EAAUvB,SAAAA,CAAIwB,IAAI,EAAA,CAAGT,OAAO,EAAA;AAC5BP,IAAAA,KAAAA,EAAOJ,yBAAWI,KAAK,CAACC,GAAG,CAAC,GAAGM,OAAO;AACxC,CAAA,CAAA,CACCF,SAAS,EAAA;AAEZ,MAAMY,iBAAAA,GAAoBzB,SAAAA,CACvBC,MAAM,EAAA,CACNC,KAAK,CAAC;IACLwB,GAAAA,EAAK1B,SAAAA,CAAI2B,KAAK,EAAA,CAAGC,EAAE,CAAC5B,SAAAA,CAAI6B,QAAQ,EAAA,CAAA,CAAIpB,GAAG,CAAC,CAAA,CAAA,CAAGJ,QAAQ;AACrD,CAAA,CAAA,CACCQ,SAAS,EAAA;AAEL,MAAMiB,yBAAAA,GAA4BC,uBAAAA,CAAkBhC,kBAAAA;AACpD,MAAMiC,0BAAAA,GAA6BD,uBAAAA,CAAkBjB,mBAAAA;AACrD,MAAMmB,uBAAAA,GAA0BF,uBAAAA,CAAkBT,gBAAAA;AAClD,MAAMY,wBAAAA,GAA2BH,uBAAAA,CAAkBN,iBAAAA;MAC7CU,OAAAA,GAAU;AACrBpC,IAAAA,kBAGF;;;;;;;;"}

package/dist/server/server/src/validation/user.mjs

@@ -1,4 +1,3 @@
-import { isUndefined } from 'lodash/fp';
 import { yup, validateYupSchema } from '@strapi/utils';
 import validators from './common-validators.mjs';
 
@@ -15,7 +14,7 @@ const profileUpdateSchema = yup.object().shape({
     lastname: validators.lastname.nullable(),
     username: validators.username.nullable(),
     password: validators.password.notNull(),
-    currentPassword: yup.string().when('password', (password, schema)=>!isUndefined(password) ? schema.required() : schema).notNull(),
+    currentPassword: yup.string().when('password', (password, schema)=>password !== undefined ? schema.required() : schema).notNull(),
     preferedLanguage: yup.string().nullable()
 }).noUnknown();
 const userUpdateSchema = yup.object().shape({

package/dist/server/server/src/validation/user.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"user.mjs","sources":["../../../../../server/src/validation/user.ts"],"sourcesContent":["import { isUndefined } from 'lodash/fp';\nimport { yup, validateYupSchema } from '@strapi/utils';\nimport validators from './common-validators';\n\nconst userCreationSchema = yup\n  .object()\n  .shape({\n    email: validators.email.required(),\n    firstname: validators.firstname.required(),\n    lastname: validators.lastname,\n    roles: validators.roles.min(1),\n    preferedLanguage: yup.string().nullable(),\n  })\n  .noUnknown();\n\nconst profileUpdateSchema = yup\n  .object()\n  .shape({\n    email: validators.email.notNull(),\n    firstname: validators.firstname.notNull(),\n    lastname: validators.lastname.nullable(),\n    username: validators.username.nullable(),\n    password: validators.password.notNull(),\n    currentPassword: yup\n      .string()\n      .when('password', (password: string, schema: any) =>\n        !isUndefined(password) ? schema.required() : schema\n      )\n      .notNull(),\n    preferedLanguage: yup.string().nullable(),\n  })\n  .noUnknown();\n\nconst userUpdateSchema = yup\n  .object()\n  .shape({\n    email: validators.email.notNull(),\n    firstname: validators.firstname.notNull(),\n    lastname: validators.lastname.nullable(),\n    username: validators.username.nullable(),\n    password: validators.password.notNull(),\n    isActive: yup.bool().notNull(),\n    roles: validators.roles.min(1).notNull(),\n  })\n  .noUnknown();\n\nconst usersDeleteSchema = yup\n  .object()\n  .shape({\n    ids: yup.array().of(yup.strapiID()).min(1).required(),\n  })\n  .noUnknown();\n\nexport const validateUserCreationInput = validateYupSchema(userCreationSchema);\nexport const validateProfileUpdateInput = validateYupSchema(profileUpdateSchema);\nexport const validateUserUpdateInput = validateYupSchema(userUpdateSchema);\nexport const validateUsersDeleteInput = validateYupSchema(usersDeleteSchema);\nexport const schemas = {\n  userCreationSchema,\n  usersDeleteSchema,\n  userUpdateSchema,\n};\n\nexport default {\n  validateUserCreationInput,\n  validateProfileUpdateInput,\n  validateUserUpdateInput,\n  validateUsersDeleteInput,\n  schemas,\n};\n"],"names":["userCreationSchema","yup","object","shape","email","validators","required","firstname","lastname","roles","min","preferedLanguage","string","nullable","noUnknown","profileUpdateSchema","notNull","username","password","currentPassword","when","schema","isUndefined","userUpdateSchema","isActive","bool","usersDeleteSchema","ids","array","of","strapiID","validateUserCreationInput","validateYupSchema","validateProfileUpdateInput","validateUserUpdateInput","validateUsersDeleteInput","schemas"],"mappings":";;;;AAIA,MAAMA,kBAAAA,GAAqBC,GAAAA,CACxBC,MAAM,EAAA,CACNC,KAAK,CAAC;IACLC,KAAAA,EAAOC,UAAAA,CAAWD,KAAK,CAACE,QAAQ,EAAA;IAChCC,SAAAA,EAAWF,UAAAA,CAAWE,SAAS,CAACD,QAAQ,EAAA;AACxCE,IAAAA,QAAAA,EAAUH,WAAWG,QAAQ;AAC7BC,IAAAA,KAAAA,EAAOJ,UAAAA,CAAWI,KAAK,CAACC,GAAG,CAAC,CAAA,CAAA;IAC5BC,gBAAAA,EAAkBV,GAAAA,CAAIW,MAAM,EAAA,CAAGC,QAAQ;AACzC,CAAA,CAAA,CACCC,SAAS,EAAA;AAEZ,MAAMC,mBAAAA,GAAsBd,GAAAA,CACzBC,MAAM,EAAA,CACNC,KAAK,CAAC;IACLC,KAAAA,EAAOC,UAAAA,CAAWD,KAAK,CAACY,OAAO,EAAA;IAC/BT,SAAAA,EAAWF,UAAAA,CAAWE,SAAS,CAACS,OAAO,EAAA;IACvCR,QAAAA,EAAUH,UAAAA,CAAWG,QAAQ,CAACK,QAAQ,EAAA;IACtCI,QAAAA,EAAUZ,UAAAA,CAAWY,QAAQ,CAACJ,QAAQ,EAAA;IACtCK,QAAAA,EAAUb,UAAAA,CAAWa,QAAQ,CAACF,OAAO,EAAA;AACrCG,IAAAA,eAAAA,EAAiBlB,IACdW,MAAM,EAAA,CACNQ,IAAI,CAAC,YAAY,CAACF,QAAAA,EAAkBG,MAAAA,GACnC,CAACC,YAAYJ,QAAAA,CAAAA,GAAYG,MAAAA,CAAOf,QAAQ,EAAA,GAAKe,QAE9CL,OAAO,EAAA;IACVL,gBAAAA,EAAkBV,GAAAA,CAAIW,MAAM,EAAA,CAAGC,QAAQ;AACzC,CAAA,CAAA,CACCC,SAAS,EAAA;AAEZ,MAAMS,gBAAAA,GAAmBtB,GAAAA,CACtBC,MAAM,EAAA,CACNC,KAAK,CAAC;IACLC,KAAAA,EAAOC,UAAAA,CAAWD,KAAK,CAACY,OAAO,EAAA;IAC/BT,SAAAA,EAAWF,UAAAA,CAAWE,SAAS,CAACS,OAAO,EAAA;IACvCR,QAAAA,EAAUH,UAAAA,CAAWG,QAAQ,CAACK,QAAQ,EAAA;IACtCI,QAAAA,EAAUZ,UAAAA,CAAWY,QAAQ,CAACJ,QAAQ,EAAA;IACtCK,QAAAA,EAAUb,UAAAA,CAAWa,QAAQ,CAACF,OAAO,EAAA;IACrCQ,QAAAA,EAAUvB,GAAAA,CAAIwB,IAAI,EAAA,CAAGT,OAAO,EAAA;AAC5BP,IAAAA,KAAAA,EAAOJ,WAAWI,KAAK,CAACC,GAAG,CAAC,GAAGM,OAAO;AACxC,CAAA,CAAA,CACCF,SAAS,EAAA;AAEZ,MAAMY,iBAAAA,GAAoBzB,GAAAA,CACvBC,MAAM,EAAA,CACNC,KAAK,CAAC;IACLwB,GAAAA,EAAK1B,GAAAA,CAAI2B,KAAK,EAAA,CAAGC,EAAE,CAAC5B,GAAAA,CAAI6B,QAAQ,EAAA,CAAA,CAAIpB,GAAG,CAAC,CAAA,CAAA,CAAGJ,QAAQ;AACrD,CAAA,CAAA,CACCQ,SAAS,EAAA;AAEL,MAAMiB,yBAAAA,GAA4BC,iBAAAA,CAAkBhC,kBAAAA;AACpD,MAAMiC,0BAAAA,GAA6BD,iBAAAA,CAAkBjB,mBAAAA;AACrD,MAAMmB,uBAAAA,GAA0BF,iBAAAA,CAAkBT,gBAAAA;AAClD,MAAMY,wBAAAA,GAA2BH,iBAAAA,CAAkBN,iBAAAA;MAC7CU,OAAAA,GAAU;AACrBpC,IAAAA,kBAGF;;;;"}
+{"version":3,"file":"user.mjs","sources":["../../../../../server/src/validation/user.ts"],"sourcesContent":["import { yup, validateYupSchema } from '@strapi/utils';\nimport validators from './common-validators';\n\nconst userCreationSchema = yup\n  .object()\n  .shape({\n    email: validators.email.required(),\n    firstname: validators.firstname.required(),\n    lastname: validators.lastname,\n    roles: validators.roles.min(1),\n    preferedLanguage: yup.string().nullable(),\n  })\n  .noUnknown();\n\nconst profileUpdateSchema = yup\n  .object()\n  .shape({\n    email: validators.email.notNull(),\n    firstname: validators.firstname.notNull(),\n    lastname: validators.lastname.nullable(),\n    username: validators.username.nullable(),\n    password: validators.password.notNull(),\n    currentPassword: yup\n      .string()\n      .when('password', (password: string, schema: any) =>\n        password !== undefined ? schema.required() : schema\n      )\n      .notNull(),\n    preferedLanguage: yup.string().nullable(),\n  })\n  .noUnknown();\n\nconst userUpdateSchema = yup\n  .object()\n  .shape({\n    email: validators.email.notNull(),\n    firstname: validators.firstname.notNull(),\n    lastname: validators.lastname.nullable(),\n    username: validators.username.nullable(),\n    password: validators.password.notNull(),\n    isActive: yup.bool().notNull(),\n    roles: validators.roles.min(1).notNull(),\n  })\n  .noUnknown();\n\nconst usersDeleteSchema = yup\n  .object()\n  .shape({\n    ids: yup.array().of(yup.strapiID()).min(1).required(),\n  })\n  .noUnknown();\n\nexport const validateUserCreationInput = validateYupSchema(userCreationSchema);\nexport const validateProfileUpdateInput = validateYupSchema(profileUpdateSchema);\nexport const validateUserUpdateInput = validateYupSchema(userUpdateSchema);\nexport const validateUsersDeleteInput = validateYupSchema(usersDeleteSchema);\nexport const schemas = {\n  userCreationSchema,\n  usersDeleteSchema,\n  userUpdateSchema,\n};\n\nexport default {\n  validateUserCreationInput,\n  validateProfileUpdateInput,\n  validateUserUpdateInput,\n  validateUsersDeleteInput,\n  schemas,\n};\n"],"names":["userCreationSchema","yup","object","shape","email","validators","required","firstname","lastname","roles","min","preferedLanguage","string","nullable","noUnknown","profileUpdateSchema","notNull","username","password","currentPassword","when","schema","undefined","userUpdateSchema","isActive","bool","usersDeleteSchema","ids","array","of","strapiID","validateUserCreationInput","validateYupSchema","validateProfileUpdateInput","validateUserUpdateInput","validateUsersDeleteInput","schemas"],"mappings":";;;AAGA,MAAMA,kBAAAA,GAAqBC,GAAAA,CACxBC,MAAM,EAAA,CACNC,KAAK,CAAC;IACLC,KAAAA,EAAOC,UAAAA,CAAWD,KAAK,CAACE,QAAQ,EAAA;IAChCC,SAAAA,EAAWF,UAAAA,CAAWE,SAAS,CAACD,QAAQ,EAAA;AACxCE,IAAAA,QAAAA,EAAUH,WAAWG,QAAQ;AAC7BC,IAAAA,KAAAA,EAAOJ,UAAAA,CAAWI,KAAK,CAACC,GAAG,CAAC,CAAA,CAAA;IAC5BC,gBAAAA,EAAkBV,GAAAA,CAAIW,MAAM,EAAA,CAAGC,QAAQ;AACzC,CAAA,CAAA,CACCC,SAAS,EAAA;AAEZ,MAAMC,mBAAAA,GAAsBd,GAAAA,CACzBC,MAAM,EAAA,CACNC,KAAK,CAAC;IACLC,KAAAA,EAAOC,UAAAA,CAAWD,KAAK,CAACY,OAAO,EAAA;IAC/BT,SAAAA,EAAWF,UAAAA,CAAWE,SAAS,CAACS,OAAO,EAAA;IACvCR,QAAAA,EAAUH,UAAAA,CAAWG,QAAQ,CAACK,QAAQ,EAAA;IACtCI,QAAAA,EAAUZ,UAAAA,CAAWY,QAAQ,CAACJ,QAAQ,EAAA;IACtCK,QAAAA,EAAUb,UAAAA,CAAWa,QAAQ,CAACF,OAAO,EAAA;AACrCG,IAAAA,eAAAA,EAAiBlB,GAAAA,CACdW,MAAM,EAAA,CACNQ,IAAI,CAAC,UAAA,EAAY,CAACF,QAAAA,EAAkBG,MAAAA,GACnCH,aAAaI,SAAAA,GAAYD,MAAAA,CAAOf,QAAQ,EAAA,GAAKe,QAE9CL,OAAO,EAAA;IACVL,gBAAAA,EAAkBV,GAAAA,CAAIW,MAAM,EAAA,CAAGC,QAAQ;AACzC,CAAA,CAAA,CACCC,SAAS,EAAA;AAEZ,MAAMS,gBAAAA,GAAmBtB,GAAAA,CACtBC,MAAM,EAAA,CACNC,KAAK,CAAC;IACLC,KAAAA,EAAOC,UAAAA,CAAWD,KAAK,CAACY,OAAO,EAAA;IAC/BT,SAAAA,EAAWF,UAAAA,CAAWE,SAAS,CAACS,OAAO,EAAA;IACvCR,QAAAA,EAAUH,UAAAA,CAAWG,QAAQ,CAACK,QAAQ,EAAA;IACtCI,QAAAA,EAAUZ,UAAAA,CAAWY,QAAQ,CAACJ,QAAQ,EAAA;IACtCK,QAAAA,EAAUb,UAAAA,CAAWa,QAAQ,CAACF,OAAO,EAAA;IACrCQ,QAAAA,EAAUvB,GAAAA,CAAIwB,IAAI,EAAA,CAAGT,OAAO,EAAA;AAC5BP,IAAAA,KAAAA,EAAOJ,WAAWI,KAAK,CAACC,GAAG,CAAC,GAAGM,OAAO;AACxC,CAAA,CAAA,CACCF,SAAS,EAAA;AAEZ,MAAMY,iBAAAA,GAAoBzB,GAAAA,CACvBC,MAAM,EAAA,CACNC,KAAK,CAAC;IACLwB,GAAAA,EAAK1B,GAAAA,CAAI2B,KAAK,EAAA,CAAGC,EAAE,CAAC5B,GAAAA,CAAI6B,QAAQ,EAAA,CAAA,CAAIpB,GAAG,CAAC,CAAA,CAAA,CAAGJ,QAAQ;AACrD,CAAA,CAAA,CACCQ,SAAS,EAAA;AAEL,MAAMiB,yBAAAA,GAA4BC,iBAAAA,CAAkBhC,kBAAAA;AACpD,MAAMiC,0BAAAA,GAA6BD,iBAAAA,CAAkBjB,mBAAAA;AACrD,MAAMmB,uBAAAA,GAA0BF,iBAAAA,CAAkBT,gBAAAA;AAClD,MAAMY,wBAAAA,GAA2BH,iBAAAA,CAAkBN,iBAAAA;MAC7CU,OAAAA,GAAU;AACrBpC,IAAAA,kBAGF;;;;"}

package/dist/server/shared/utils/get-project-type.js

@@ -0,0 +1,49 @@
+'use strict';
+
+/**
+ * Resolves the plan label from the license information returned by the
+ * `/admin/project-type` endpoint (browser) or `strapi.ee` (server).
+ *
+ * This labels the edition that is running: it follows `isEE`, so a lapsed license reads
+ * Community. Browser tracking and NPS report this label and the startup table applies the same
+ * rule; server metrics also label the running edition, but never say Growth. For the plan a
+ * license was issued for, lapsed or not (the Plan card, the Support card and the debug dump),
+ * use `getLicensedPlan` below.
+ *
+ * The label is intentionally limited to three values:
+ * - `Community`  when there is no license (Community Edition).
+ * - `Growth`     when the licensed plan price id contains "growth".
+ * - `Enterprise` for any other licensed plan.
+ */ const getProjectType = ({ isEE, planPriceId })=>{
+    if (!isEE) {
+        return 'Community';
+    }
+    if (planPriceId?.toLowerCase().includes('growth')) {
+        return 'Growth';
+    }
+    return 'Enterprise';
+};
+// The statuses a license can be in once it has been read. `none` (never licensed) is left out
+// on purpose, and so is a missing status, which a mixed-version install can produce.
+const LICENSED_STATUSES = [
+    'active',
+    'expired',
+    'unknown'
+];
+/**
+ * Resolves the plan a license was issued for, including one that has lapsed or can no longer
+ * be read, so Support links, the Plan card and the debug dump can still name it. It unlocks
+ * nothing: feature gating stays on `isEE`.
+ *
+ * A plan is only reported when a type was verified at some point (live, or retained once the
+ * license lapsed) AND the status is licensed. A corrupt license file sets `unknown` before any
+ * type is stored, and with no price id `getProjectType` would fall through to Enterprise, so
+ * both conditions are required. Every caller that derives a plan should go through here.
+ */ const getLicensedPlan = ({ licenseStatus, type, planPriceId })=>getProjectType({
+        isEE: Boolean(type) && LICENSED_STATUSES.includes(licenseStatus ?? ''),
+        planPriceId: planPriceId ?? undefined
+    });
+
+exports.getLicensedPlan = getLicensedPlan;
+exports.getProjectType = getProjectType;
+//# sourceMappingURL=get-project-type.js.map

package/dist/server/shared/utils/get-project-type.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-project-type.js","sources":["../../../../shared/utils/get-project-type.ts"],"sourcesContent":["type ProjectType = 'Community' | 'Growth' | 'Enterprise';\n\n/**\n * Resolves the plan label from the license information returned by the\n * `/admin/project-type` endpoint (browser) or `strapi.ee` (server).\n *\n * This labels the edition that is running: it follows `isEE`, so a lapsed license reads\n * Community. Browser tracking and NPS report this label and the startup table applies the same\n * rule; server metrics also label the running edition, but never say Growth. For the plan a\n * license was issued for, lapsed or not (the Plan card, the Support card and the debug dump),\n * use `getLicensedPlan` below.\n *\n * The label is intentionally limited to three values:\n * - `Community`  when there is no license (Community Edition).\n * - `Growth`     when the licensed plan price id contains \"growth\".\n * - `Enterprise` for any other licensed plan.\n */\nconst getProjectType = ({\n  isEE,\n  planPriceId,\n}: {\n  isEE: boolean;\n  planPriceId?: string;\n}): ProjectType => {\n  if (!isEE) {\n    return 'Community';\n  }\n\n  if (planPriceId?.toLowerCase().includes('growth')) {\n    return 'Growth';\n  }\n\n  return 'Enterprise';\n};\n\n// The statuses a license can be in once it has been read. `none` (never licensed) is left out\n// on purpose, and so is a missing status, which a mixed-version install can produce.\nconst LICENSED_STATUSES: readonly string[] = ['active', 'expired', 'unknown'];\n\n/**\n * Resolves the plan a license was issued for, including one that has lapsed or can no longer\n * be read, so Support links, the Plan card and the debug dump can still name it. It unlocks\n * nothing: feature gating stays on `isEE`.\n *\n * A plan is only reported when a type was verified at some point (live, or retained once the\n * license lapsed) AND the status is licensed. A corrupt license file sets `unknown` before any\n * type is stored, and with no price id `getProjectType` would fall through to Enterprise, so\n * both conditions are required. Every caller that derives a plan should go through here.\n */\nconst getLicensedPlan = ({\n  licenseStatus,\n  type,\n  planPriceId,\n}: {\n  licenseStatus: string | null | undefined;\n  type: string | null | undefined;\n  planPriceId?: string | null;\n}): ProjectType =>\n  getProjectType({\n    isEE: Boolean(type) && LICENSED_STATUSES.includes(licenseStatus ?? ''),\n    planPriceId: planPriceId ?? undefined,\n  });\n\nexport { getLicensedPlan, getProjectType };\nexport type { ProjectType };\n"],"names":["getProjectType","isEE","planPriceId","toLowerCase","includes","LICENSED_STATUSES","getLicensedPlan","licenseStatus","type","Boolean","undefined"],"mappings":";;AAEA;;;;;;;;;;;;;;AAcC,UACKA,cAAAA,GAAiB,CAAC,EACtBC,IAAI,EACJC,WAAW,EAIZ,GAAA;AACC,IAAA,IAAI,CAACD,IAAAA,EAAM;QACT,OAAO,WAAA;AACT,IAAA;IAEA,IAAIC,WAAAA,EAAaC,WAAAA,EAAAA,CAAcC,QAAAA,CAAS,QAAA,CAAA,EAAW;QACjD,OAAO,QAAA;AACT,IAAA;IAEA,OAAO,YAAA;AACT;AAEA;AACA;AACA,MAAMC,iBAAAA,GAAuC;AAAC,IAAA,QAAA;AAAU,IAAA,SAAA;AAAW,IAAA;AAAU,CAAA;AAE7E;;;;;;;;;IAUA,MAAMC,eAAAA,GAAkB,CAAC,EACvBC,aAAa,EACbC,IAAI,EACJN,WAAW,EAKZ,GACCF,cAAAA,CAAe;AACbC,QAAAA,IAAAA,EAAMQ,OAAAA,CAAQD,IAAAA,CAAAA,IAASH,iBAAAA,CAAkBD,QAAQ,CAACG,aAAAA,IAAiB,EAAA,CAAA;AACnEL,QAAAA,WAAAA,EAAaA,WAAAA,IAAeQ;AAC9B,KAAA;;;;;"}

package/dist/server/shared/utils/get-project-type.mjs

@@ -0,0 +1,46 @@
+/**
+ * Resolves the plan label from the license information returned by the
+ * `/admin/project-type` endpoint (browser) or `strapi.ee` (server).
+ *
+ * This labels the edition that is running: it follows `isEE`, so a lapsed license reads
+ * Community. Browser tracking and NPS report this label and the startup table applies the same
+ * rule; server metrics also label the running edition, but never say Growth. For the plan a
+ * license was issued for, lapsed or not (the Plan card, the Support card and the debug dump),
+ * use `getLicensedPlan` below.
+ *
+ * The label is intentionally limited to three values:
+ * - `Community`  when there is no license (Community Edition).
+ * - `Growth`     when the licensed plan price id contains "growth".
+ * - `Enterprise` for any other licensed plan.
+ */ const getProjectType = ({ isEE, planPriceId })=>{
+    if (!isEE) {
+        return 'Community';
+    }
+    if (planPriceId?.toLowerCase().includes('growth')) {
+        return 'Growth';
+    }
+    return 'Enterprise';
+};
+// The statuses a license can be in once it has been read. `none` (never licensed) is left out
+// on purpose, and so is a missing status, which a mixed-version install can produce.
+const LICENSED_STATUSES = [
+    'active',
+    'expired',
+    'unknown'
+];
+/**
+ * Resolves the plan a license was issued for, including one that has lapsed or can no longer
+ * be read, so Support links, the Plan card and the debug dump can still name it. It unlocks
+ * nothing: feature gating stays on `isEE`.
+ *
+ * A plan is only reported when a type was verified at some point (live, or retained once the
+ * license lapsed) AND the status is licensed. A corrupt license file sets `unknown` before any
+ * type is stored, and with no price id `getProjectType` would fall through to Enterprise, so
+ * both conditions are required. Every caller that derives a plan should go through here.
+ */ const getLicensedPlan = ({ licenseStatus, type, planPriceId })=>getProjectType({
+        isEE: Boolean(type) && LICENSED_STATUSES.includes(licenseStatus ?? ''),
+        planPriceId: planPriceId ?? undefined
+    });
+
+export { getLicensedPlan, getProjectType };
+//# sourceMappingURL=get-project-type.mjs.map

package/dist/server/shared/utils/get-project-type.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-project-type.mjs","sources":["../../../../shared/utils/get-project-type.ts"],"sourcesContent":["type ProjectType = 'Community' | 'Growth' | 'Enterprise';\n\n/**\n * Resolves the plan label from the license information returned by the\n * `/admin/project-type` endpoint (browser) or `strapi.ee` (server).\n *\n * This labels the edition that is running: it follows `isEE`, so a lapsed license reads\n * Community. Browser tracking and NPS report this label and the startup table applies the same\n * rule; server metrics also label the running edition, but never say Growth. For the plan a\n * license was issued for, lapsed or not (the Plan card, the Support card and the debug dump),\n * use `getLicensedPlan` below.\n *\n * The label is intentionally limited to three values:\n * - `Community`  when there is no license (Community Edition).\n * - `Growth`     when the licensed plan price id contains \"growth\".\n * - `Enterprise` for any other licensed plan.\n */\nconst getProjectType = ({\n  isEE,\n  planPriceId,\n}: {\n  isEE: boolean;\n  planPriceId?: string;\n}): ProjectType => {\n  if (!isEE) {\n    return 'Community';\n  }\n\n  if (planPriceId?.toLowerCase().includes('growth')) {\n    return 'Growth';\n  }\n\n  return 'Enterprise';\n};\n\n// The statuses a license can be in once it has been read. `none` (never licensed) is left out\n// on purpose, and so is a missing status, which a mixed-version install can produce.\nconst LICENSED_STATUSES: readonly string[] = ['active', 'expired', 'unknown'];\n\n/**\n * Resolves the plan a license was issued for, including one that has lapsed or can no longer\n * be read, so Support links, the Plan card and the debug dump can still name it. It unlocks\n * nothing: feature gating stays on `isEE`.\n *\n * A plan is only reported when a type was verified at some point (live, or retained once the\n * license lapsed) AND the status is licensed. A corrupt license file sets `unknown` before any\n * type is stored, and with no price id `getProjectType` would fall through to Enterprise, so\n * both conditions are required. Every caller that derives a plan should go through here.\n */\nconst getLicensedPlan = ({\n  licenseStatus,\n  type,\n  planPriceId,\n}: {\n  licenseStatus: string | null | undefined;\n  type: string | null | undefined;\n  planPriceId?: string | null;\n}): ProjectType =>\n  getProjectType({\n    isEE: Boolean(type) && LICENSED_STATUSES.includes(licenseStatus ?? ''),\n    planPriceId: planPriceId ?? undefined,\n  });\n\nexport { getLicensedPlan, getProjectType };\nexport type { ProjectType };\n"],"names":["getProjectType","isEE","planPriceId","toLowerCase","includes","LICENSED_STATUSES","getLicensedPlan","licenseStatus","type","Boolean","undefined"],"mappings":"AAEA;;;;;;;;;;;;;;AAcC,UACKA,cAAAA,GAAiB,CAAC,EACtBC,IAAI,EACJC,WAAW,EAIZ,GAAA;AACC,IAAA,IAAI,CAACD,IAAAA,EAAM;QACT,OAAO,WAAA;AACT,IAAA;IAEA,IAAIC,WAAAA,EAAaC,WAAAA,EAAAA,CAAcC,QAAAA,CAAS,QAAA,CAAA,EAAW;QACjD,OAAO,QAAA;AACT,IAAA;IAEA,OAAO,YAAA;AACT;AAEA;AACA;AACA,MAAMC,iBAAAA,GAAuC;AAAC,IAAA,QAAA;AAAU,IAAA,SAAA;AAAW,IAAA;AAAU,CAAA;AAE7E;;;;;;;;;IAUA,MAAMC,eAAAA,GAAkB,CAAC,EACvBC,aAAa,EACbC,IAAI,EACJN,WAAW,EAKZ,GACCF,cAAAA,CAAe;AACbC,QAAAA,IAAAA,EAAMQ,OAAAA,CAAQD,IAAAA,CAAAA,IAASH,iBAAAA,CAAkBD,QAAQ,CAACG,aAAAA,IAAiB,EAAA,CAAA;AACnEL,QAAAA,WAAAA,EAAaA,WAAAA,IAAeQ;AAC9B,KAAA;;;;"}

package/dist/server/src/audit-logs/auth.d.ts

@@ -0,0 +1,72 @@
+import type { Data, Modules } from '@strapi/types';
+import { emitAudit } from '@strapi/utils';
+import { type AdminUserSnapshot } from './admin-users';
+/**
+ * Event hub events bound to the `admin.auth.events` config callbacks
+ * (`onConnectionError`, `onSSOAutoRegistration`). Their names and payloads are public.
+ */
+export declare const AUTH_EVENTS: {
+    readonly LOGIN_FAILURE: "admin.auth.error";
+    readonly AUTO_REGISTRATION: "admin.auth.autoRegistration";
+};
+/** One fixed value per emit site. */
+export type LoginFailureReason = 'login_not_allowed' | 'unexpected_error' | 'invalid_credentials' | 'account_inactive' | 'sso_connection_error' | 'sso_registration_disabled' | 'sso_role_misconfigured';
+/**
+ * Payload of `admin.auth.error`, also passed to the `onConnectionError` callback.
+ * The audit log stores `provider`, `reason` and the account, never `error`.
+ */
+export interface LoginFailureEvent {
+    error: Error;
+    provider: string;
+    reason: LoginFailureReason;
+    /** The account the login was for, when known. */
+    user?: {
+        id: Data.ID;
+        email: string;
+    };
+}
+/** Payload of `admin.auth.autoRegistration`: the created `admin::user` row, roles populated. */
+export interface AutoRegistrationEvent {
+    user: {
+        id: Data.ID;
+        email?: string | null;
+        roles?: AdminUserSnapshot['roles'];
+    };
+    provider: string;
+}
+export interface LoginFailureDetails {
+    provider: string;
+    reason: LoginFailureReason;
+}
+export interface AutoRegistrationDetails {
+    provider: string;
+    roles: Data.ID[];
+}
+type AuditStrapi = Parameters<typeof emitAudit>[0]['strapi'];
+/**
+ * Emits without waiting: listeners bound to the event, such as the `onConnectionError`
+ * config callback, run before the audit subscriber and must not hold the login.
+ */
+export declare const emitLoginFailure: ({ strapi }: {
+    strapi: AuditStrapi;
+}, event: LoginFailureEvent) => void;
+/**
+ * Whether the audit log records a failed login. Not recorded: failures anyone can produce
+ * from outside before any verification, a local login for an email with no account and an
+ * SSO connection with no valid profile.
+ */
+export declare const isRecordedLoginFailure: (event: LoginFailureEvent) => boolean;
+/**
+ * The part of the audit-logs lifecycle service used here.
+ * The full service type lives in the Admin EE package.
+ */
+interface AuditLogsLifecycle {
+    registerEvent<TDetails>(name: string, transform: Modules.AuditLogs.EventTransformer<TDetails>, options?: {
+        allowUnknownActor?: boolean;
+        alwaysUnknownActor?: boolean;
+        shouldRecord?: (...args: any[]) => boolean;
+    }): void;
+}
+export declare const registerAuthAuditEvents: (auditLogsLifecycle: AuditLogsLifecycle) => void;
+export {};
+//# sourceMappingURL=auth.d.ts.map

package/dist/server/src/audit-logs/auth.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../../../server/src/audit-logs/auth.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE1C,OAAO,EAAqC,KAAK,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAE1F;;;GAGG;AACH,eAAO,MAAM,WAAW;;;CAGd,CAAC;AAEX,qCAAqC;AACrC,MAAM,MAAM,kBAAkB,GAC1B,mBAAmB,GACnB,kBAAkB,GAClB,qBAAqB,GACrB,kBAAkB,GAClB,sBAAsB,GACtB,2BAA2B,GAC3B,wBAAwB,CAAC;AAE7B;;;GAGG;AACH,MAAM,WAAW,iBAAiB;IAChC,KAAK,EAAE,KAAK,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,kBAAkB,CAAC;IAC3B,iDAAiD;IACjD,IAAI,CAAC,EAAE;QAAE,EAAE,EAAE,IAAI,CAAC,EAAE,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;CACvC;AAED,gGAAgG;AAChG,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE;QAAE,EAAE,EAAE,IAAI,CAAC,EAAE,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,KAAK,CAAC,EAAE,iBAAiB,CAAC,OAAO,CAAC,CAAA;KAAE,CAAC;IACjF,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,mBAAmB;IAClC,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,kBAAkB,CAAC;CAC5B;AAED,MAAM,WAAW,uBAAuB;IACtC,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC;CAClB;AAED,KAAK,WAAW,GAAG,UAAU,CAAC,OAAO,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;AAE7D;;;GAGG;AACH,eAAO,MAAM,gBAAgB,GAC3B,YAAY;IAAE,MAAM,EAAE,WAAW,CAAA;CAAE,EACnC,OAAO,iBAAiB,KACvB,IASF,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,sBAAsB,GAAI,OAAO,iBAAiB,YAC0B,CAAC;AAE1F;;;GAGG;AACH,UAAU,kBAAkB;IAC1B,aAAa,CAAC,QAAQ,EACpB,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,OAAO,CAAC,SAAS,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EACvD,OAAO,CAAC,EAAE;QACR,iBAAiB,CAAC,EAAE,OAAO,CAAC;QAC5B,kBAAkB,CAAC,EAAE,OAAO,CAAC;QAC7B,YAAY,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC;KAC5C,GACA,IAAI,CAAC;CACT;AAQD,eAAO,MAAM,uBAAuB,GAAI,oBAAoB,kBAAkB,SAkB7E,CAAC"}

package/dist/server/src/audit-logs/tokens.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tokens.d.ts","sourceRoot":"","sources":["../../../../server/src/audit-logs/tokens.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tokens.d.ts","sourceRoot":"","sources":["../../../../server/src/audit-logs/tokens.ts"],"names":[],"mappings":"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"}

package/dist/server/src/bootstrap.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bootstrap.d.ts","sourceRoot":"","sources":["../../../server/src/bootstrap.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;yBAoIpB,YAAY;IAAE,MAAM,EAAE,IAAI,CAAC,MAAM,CAAA;CAAE;AAAzD,wBAoFE"}
+{"version":3,"file":"bootstrap.d.ts","sourceRoot":"","sources":["../../../server/src/bootstrap.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;yBAoIpB,YAAY;IAAE,MAAM,EAAE,IAAI,CAAC,MAAM,CAAA;CAAE;AAAzD,wBAoFE"}

package/dist/server/src/config/admin-actions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"admin-actions.d.ts","sourceRoot":"","sources":["../../../../server/src/config/admin-actions.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;IA+QnB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEF,wBAEE"}
+{"version":3,"file":"admin-actions.d.ts","sourceRoot":"","sources":["../../../../server/src/config/admin-actions.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;IAsRnB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEF,wBAEE"}

package/dist/server/src/controllers/admin-token.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"admin-token.d.ts","sourceRoot":"","sources":["../../../../server/src/controllers/admin-token.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,KAAK,CAAC;;gBAoDf,OAAO;oBAkCH,OAAO;cAqBb,OAAO;gBAUL,OAAO;aAoBV,OAAO;gBA2BJ,OAAO;6BAsCM,OAAO;;AA1JxC,wBAqLE"}
+{"version":3,"file":"admin-token.d.ts","sourceRoot":"","sources":["../../../../server/src/controllers/admin-token.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,KAAK,CAAC;;gBAqDf,OAAO;oBAkCH,OAAO;cAqBb,OAAO;gBAUL,OAAO;aAoBV,OAAO;gBA2BJ,OAAO;6BAsCM,OAAO;;AA1JxC,wBAqLE"}