@strapi/admin 4.20.3 → 4.20.4

package/dist/server/index.mjs

@@ -1,4 +1,4 @@
-import { merge, map, uniq, difference, isNil, castArray, pick, curry, pipe, prop, includes, isArray, set, omit, isEmpty, has, defaults, remove, eq, get, differenceWith, differenceBy, toLower, isFunction, some, flatMap, isObject, cloneDeep, getOr, intersection, isPlainObject, matchesProperty, propEq, xor, startsWith, isString, values, sumBy, trim, isUndefined, mapKeys } from "lodash/fp";
+import { merge, map, uniq, difference, isNil, castArray, pick, curry, pipe, prop, includes, isArray, set, omit, isEmpty, has, defaults, remove, eq, get, differenceWith, differenceBy, toLower, isFunction, some, flatMap, isObject, cloneDeep, getOr, intersection, isPlainObject, matchesProperty, propEq, xor, startsWith, isString, isNumber, values, sumBy, trim, isUndefined, mapKeys } from "lodash/fp";
 import utils$1, { pipeAsync, errors, yup, validateYupSchema, policy, getAbsoluteAdminUrl, stringIncludes, hooks as hooks$1, generateTimestampCode, validateYupSchemaSync, providerFactory, sanitize, contentTypes, traverse, traverseEntity, validate, env, stringEquals } from "@strapi/utils";
 import "@strapi/types";
 import path, { resolve, basename, join, extname } from "path";
@@ -3450,11 +3450,17 @@ const assertCustomTokenPermissionsValidity = (type, permissions2) => {
     }
   }
 };
-const assertValidLifespan$1 = (lifespan) => {
+const isValidLifespan$1 = (lifespan) => {
   if (isNil(lifespan)) {
-    return;
+    return true;
   }
-  if (!Object.values(constants$3.API_TOKEN_LIFESPANS).includes(lifespan)) {
+  if (!isNumber(lifespan) || !Object.values(constants$3.API_TOKEN_LIFESPANS).includes(lifespan)) {
+    return false;
+  }
+  return true;
+};
+const assertValidLifespan$1 = (lifespan) => {
+  if (!isValidLifespan$1(lifespan)) {
     throw new ValidationError$2(
       `lifespan must be one of the following values: 
       ${Object.values(constants$3.API_TOKEN_LIFESPANS).join(", ")}`
@@ -3488,7 +3494,7 @@ const hash$1 = (accessKey) => {
   return crypto.createHmac("sha512", strapi.config.get("admin.apiToken.salt")).update(accessKey).digest("hex");
 };
 const getExpirationFields$1 = (lifespan) => {
-  const isValidNumber = Number.isFinite(lifespan) && lifespan > 0;
+  const isValidNumber = isNumber(lifespan) && Number.isFinite(lifespan) && lifespan > 0;
   if (!isValidNumber && !isNil(lifespan)) {
     throw new ValidationError$2("lifespan must be a positive number or null");
   }
@@ -3703,7 +3709,7 @@ const create = async (attributes) => {
   const accessKey = hasAccessKey(attributes) ? validateAccessKey(attributes.accessKey) : generateRandomAccessKey();
   delete attributes.accessKey;
   assertTokenPermissionsValidity(attributes);
-  assertValidLifespan(attributes);
+  assertValidLifespan(attributes.lifespan);
   const result = await strapi.db.transaction(async () => {
     const transferToken2 = await strapi.query(TRANSFER_TOKEN_UID).create({
       select: SELECT_FIELDS,
@@ -3737,7 +3743,7 @@ const update = async (id, attributes) => {
     throw new NotFoundError("Token not found");
   }
   assertTokenPermissionsValidity(attributes);
-  assertValidLifespan(attributes);
+  assertValidLifespan(attributes.lifespan);
   return strapi.db.transaction(async () => {
     const updatedToken = await strapi.query(TRANSFER_TOKEN_UID).update({
       select: SELECT_FIELDS,
@@ -3827,7 +3833,7 @@ const regenerate = async (id) => {
   };
 };
 const getExpirationFields = (lifespan) => {
-  const isValidNumber = Number.isFinite(lifespan) && lifespan !== null && lifespan > 0;
+  const isValidNumber = isNumber(lifespan) && Number.isFinite(lifespan) && lifespan > 0;
   if (!isValidNumber && !isNil(lifespan)) {
     throw new ValidationError$1("lifespan must be a positive number or null");
   }
@@ -3873,11 +3879,17 @@ const assertTokenPermissionsValidity = (attributes) => {
     throw new ValidationError$1(`Unknown permissions provided: ${invalidPermissions.join(", ")}`);
   }
 };
-const assertValidLifespan = ({ lifespan }) => {
+const isValidLifespan = (lifespan) => {
   if (isNil(lifespan)) {
-    return;
+    return true;
   }
-  if (!Object.values(constants$3.TRANSFER_TOKEN_LIFESPANS).includes(lifespan)) {
+  if (!isNumber(lifespan) || !Object.values(constants$3.TRANSFER_TOKEN_LIFESPANS).includes(lifespan)) {
+    return false;
+  }
+  return true;
+};
+const assertValidLifespan = (lifespan) => {
+  if (!isValidLifespan(lifespan)) {
     throw new ValidationError$1(
       `lifespan must be one of the following values: 
       ${Object.values(constants$3.TRANSFER_TOKEN_LIFESPANS).join(", ")}`