@strapi/admin 4.26.1 → 4.26.2

package/dist/ee/server/index.mjs

@@ -3,7 +3,7 @@ import { resolve, basename, join, extname } from "path";
 import fse from "fs-extra";
 import koaStatic from "koa-static";
 import "@strapi/types";
-import { isNil, castArray, pipe, pickBy, get, keys, differenceWith, isEqual, getOr, has, clamp, difference, set, merge, map, uniq, isEmpty, toLower, isFunction, toString, toNumber, assign, reverse, take, prop, drop, pick, isString, defaultsDeep, forEach, filter, cond, stubTrue, flow, size, mean, max, sum, defaultTo, mapValues, curry, includes, isArray, omit, isUndefined, update, property } from "lodash/fp";
+import { isNil, castArray, pipe, keys, pickBy, get, differenceWith, isEqual, getOr, has, clamp, difference, set, merge, map, uniq, isEmpty, toLower, toString, toNumber, assign, prop, reverse, take, drop, pick, isString, defaultsDeep, forEach, filter, cond, stubTrue, flow, size, sum, max, mean, defaultTo, mapValues, curry, includes, isArray, omit, isUndefined, update, property } from "lodash/fp";
 import { differenceInHours, parseISO, add } from "date-fns";
 import { errors, mapAsync, pipeAsync, getAbsoluteAdminUrl, stringIncludes, reduceAsync, yup, validateYupSchema, env } from "@strapi/utils";
 import semver from "semver";
@@ -101,38 +101,12 @@ const adminAuthStrategy = {
   name: name$1,
   authenticate: authenticate$2
 };
-const DAY_IN_MS = 24 * 60 * 60 * 1e3;
 const constants = {
-  CONTENT_TYPE_SECTION: "contentTypes",
   SUPER_ADMIN_CODE: "strapi-super-admin",
-  EDITOR_CODE: "strapi-editor",
-  AUTHOR_CODE: "strapi-author",
-  READ_ACTION: "plugin::content-manager.explorer.read",
-  CREATE_ACTION: "plugin::content-manager.explorer.create",
-  UPDATE_ACTION: "plugin::content-manager.explorer.update",
-  DELETE_ACTION: "plugin::content-manager.explorer.delete",
-  PUBLISH_ACTION: "plugin::content-manager.explorer.publish",
   API_TOKEN_TYPE: {
     READ_ONLY: "read-only",
     FULL_ACCESS: "full-access",
     CUSTOM: "custom"
-  },
-  // The front-end only displays these values
-  API_TOKEN_LIFESPANS: {
-    UNLIMITED: null,
-    DAYS_7: 7 * DAY_IN_MS,
-    DAYS_30: 30 * DAY_IN_MS,
-    DAYS_90: 90 * DAY_IN_MS
-  },
-  TRANSFER_TOKEN_TYPE: {
-    PUSH: "push",
-    PULL: "pull"
-  },
-  TRANSFER_TOKEN_LIFESPANS: {
-    UNLIMITED: null,
-    DAYS_7: 7 * DAY_IN_MS,
-    DAYS_30: 30 * DAY_IN_MS,
-    DAYS_90: 90 * DAY_IN_MS
   }
 };
 const { UnauthorizedError: UnauthorizedError$1, ForbiddenError: ForbiddenError$1 } = errors;
@@ -1601,25 +1575,7 @@ const authEventsMapper = {
   onConnectionSuccess: "admin.auth.success",
   onConnectionError: "admin.auth.error"
 };
-const valueIsFunctionType = ([, value]) => isFunction(value);
-const keyIsValidEventName = ([key]) => {
-  return Object.keys(strapi.admin.services.passport.authEventsMapper).includes(key);
-};
-const getPassportStrategies$1 = () => [createLocalStrategy(strapi)];
-const registerAuthEvents = () => {
-  const { events = {} } = strapi.config.get("admin.auth", {});
-  const { authEventsMapper: authEventsMapper2 } = strapi.admin.services.passport;
-  const eventList = Object.entries(events).filter(keyIsValidEventName).filter(valueIsFunctionType);
-  for (const [eventName, handler] of eventList) {
-    strapi.eventHub.on(authEventsMapper2[eventName], handler);
-  }
-};
-const init = () => {
-  strapi.admin.services.passport.getPassportStrategies().forEach((strategy) => passport$2.use(strategy));
-  registerAuthEvents();
-  return passport$2.initialize();
-};
-const passport$1 = { init, getPassportStrategies: getPassportStrategies$1, authEventsMapper };
+const passport$1 = { authEventsMapper };
 const createProviderRegistry = () => {
   const registry = /* @__PURE__ */ new Map();
   Object.assign(registry, {
@@ -2659,7 +2615,7 @@ const reviewWorkflows = ({ strapi: strapi2 }) => {
   return {
     async bootstrap() {
       await registerWebhookEvents({ strapi: strapi2 });
-      await initDefaultWorkflow({ workflowsService, stagesService, strapi: strapi2 });
+      await initDefaultWorkflow({ workflowsService, stagesService });
     },
     async register({ options } = { options: {} }) {
       extendReviewWorkflowContentTypes({ strapi: strapi2 });
@@ -3149,12 +3105,18 @@ const role = {
     });
   }
 };
+function mergeValidatedBody(input, validatedPayload) {
+  if (validatedPayload !== null && typeof validatedPayload === "object" && !Array.isArray(validatedPayload)) {
+    return { ...input, ...validatedPayload };
+  }
+  return { ...input };
+}
 const getDefaultActionAttributes = () => ({
   options: {
     applyToProperties: null
   }
 });
-const actionFields = [
+const actionFields$1 = [
   "section",
   "displayName",
   "category",
@@ -3165,7 +3127,7 @@ const actionFields = [
   "actionId",
   "aliases"
 ];
-const sanitizeActionAttributes = pick(actionFields);
+const sanitizeActionAttributes = pick(actionFields$1);
 const computeActionId = (attributes) => {
   const { pluginName, uid } = attributes;
   if (!pluginName) {
@@ -3199,7 +3161,7 @@ const create = pipe(
   merge(getDefaultActionAttributes())
 );
 const actionDomain = {
-  actionFields,
+  actionFields: actionFields$1,
   appliesToProperty,
   appliesToSubject,
   assignActionId,
@@ -3221,8 +3183,7 @@ const checkFieldsAreCorrectlyNested = (fields) => {
     failed = fields.slice(indexA + 1).some(
       (fieldB) => fieldB.startsWith(`${fields[indexA]}.`) || fields[indexA].startsWith(`${fieldB}.`)
     );
-    if (failed)
-      break;
+    if (failed) break;
   }
   return !failed;
 };
@@ -3235,6 +3196,7 @@ const checkFieldsDontHaveDuplicates = (fields) => {
   }
   return _.uniq(fields).length === fields.length;
 };
+const { actionFields } = actionDomain;
 const getActionFromProvider = (actionId) => {
   return getService$1("permission").actionProvider.get(actionId);
 };
@@ -3244,10 +3206,10 @@ const lastname = yup.string();
 const username = yup.string().min(1);
 const password = yup.string().min(8).matches(/[a-z]/, "${path} must contain at least one lowercase character").matches(/[A-Z]/, "${path} must contain at least one uppercase character").matches(/\d/, "${path} must contain at least one number");
 const roles = yup.array(yup.strapiID()).min(1);
-const isAPluginName = yup.string().test("is-a-plugin-name", "is not a plugin name", function(value) {
+yup.string().test("is-a-plugin-name", "is not a plugin name", function(value) {
   return [void 0, "admin", ...Object.keys(strapi.plugins)].includes(value) ? true : this.createError({ path: this.path, message: `${this.path} is not an existing plugin` });
 });
-const arrayOfConditionNames = yup.array().of(yup.string()).test("is-an-array-of-conditions", "is not a plugin name", function(value) {
+yup.array().of(yup.string()).test("is-an-array-of-conditions", "is not a plugin name", function(value) {
   const ids = strapi.admin.services.permission.conditionProvider.keys();
   return _.isUndefined(value) || _.difference(value, ids).length === 0 ? true : this.createError({ path: this.path, message: `contains conditions that don't exist` });
 });
@@ -3337,7 +3299,7 @@ const permission = yup.object().shape({
   ),
   conditions: yup.array().of(yup.string())
 }).noUnknown();
-const updatePermissions = yup.object().shape({
+yup.object().shape({
   permissions: yup.array().required().of(permission).test(
     "duplicated-permissions",
     "Some permissions are duplicated (same action and subject)",
@@ -3350,11 +3312,7 @@ const validators = {
   lastname,
   username,
   password,
-  roles,
-  isAPluginName,
-  arrayOfConditionNames,
-  permission,
-  updatePermissions
+  roles
 };
 const userCreationSchema = yup.object().shape({
   email: validators.email.required(),
@@ -3388,13 +3346,29 @@ const usersDeleteSchema = yup.object().shape({
   ids: yup.array().of(yup.strapiID()).min(1).required()
 }).noUnknown();
 validateYupSchema(userCreationSchema);
+const normalizeUpdateInput = (input) => {
+  if (input === null || typeof input !== "object" || Array.isArray(input)) {
+    return input;
+  }
+  const data = { ...input };
+  if (typeof data.email === "string") {
+    data.email = data.email.toLowerCase();
+  }
+  if (typeof data.firstname === "string") {
+    data.firstname = data.firstname.trim();
+  }
+  return data;
+};
 validateYupSchema(profileUpdateSchema);
-const validateUserUpdateInput = validateYupSchema(userUpdateSchema);
+const runUserUpdateValidation = validateYupSchema(userUpdateSchema);
+const validateUserUpdateInput = async (input) => {
+  const data = normalizeUpdateInput(input);
+  const validated = await runUserUpdateValidation(data);
+  return mergeValidatedBody(data, validated);
+};
 validateYupSchema(usersDeleteSchema);
 const schemas = {
-  userCreationSchema,
-  usersDeleteSchema,
-  userUpdateSchema
+  userCreationSchema
 };
 const ssoUserCreationInputExtension = yup.object().shape({
   useSSORegistration: yup.boolean()
@@ -3446,21 +3420,21 @@ const user = {
   async update(ctx) {
     const { id } = ctx.params;
     const { body: input } = ctx.request;
-    await validateUserUpdateInput(input);
-    if (_.has(input, "email")) {
+    const data = await validateUserUpdateInput(input);
+    if (_.has(data, "email")) {
       const uniqueEmailCheck = await getService("user").exists({
         id: { $ne: id },
-        email: input.email
+        email: data.email
       });
       if (uniqueEmailCheck) {
         throw new ApplicationError("A user with this email address already exists");
       }
     }
     const user2 = await getService("user").findOne(id, null);
-    if (!await hasAdminSeatsAvaialble() && !user2.isActive && input.isActive) {
+    if (!await hasAdminSeatsAvaialble() && !user2.isActive && data.isActive) {
       throw new ForbiddenError("License seat limit reached. You cannot active this user");
     }
-    const updatedUser = await getService("user").updateById(id, input);
+    const updatedUser = await getService("user").updateById(id, data);
     if (!updatedUser) {
       return ctx.notFound("User does not exist");
     }
@@ -3603,10 +3577,8 @@ function getWorkflowsPermissionChecker({ strapi: strapi2 }, userAbility) {
   return strapi2.plugin("content-manager").service("permission-checker").create({ userAbility, model: WORKFLOW_MODEL_UID });
 }
 function formatWorkflowToAdmin(workflow2) {
-  if (!workflow2)
-    return;
-  if (!workflow2.stages)
-    return workflow2;
+  if (!workflow2) return;
+  if (!workflow2.stages) return workflow2;
   const transformPermissions = map(update("role", property("id")));
   const transformStages = map(update("permissions", transformPermissions));
   return update("stages", transformStages, workflow2);