@strapi/admin 4.12.0 → 4.12.2

package/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/pages/ListView/ListView.js

@@ -169,38 +169,39 @@ export function ReviewWorkflowsListView() {
     <>
       <Layout.Header
         primaryAction={
-          <LinkButton
-            disabled={!canCreate}
-            startIcon={<Plus />}
-            size="S"
-            to="/settings/review-workflows/create"
-            onClick={(event) => {
-              /**
-               * If the current license has a workflow limit:
-               * check if the total count of workflows exceeds that limit. If so,
-               * prevent the navigation and show the limits overlay.
-               *
-               * If the current license does not have a limit (e.g. offline license):
-               * allow the user to navigate to the create-view. In case they exceed the
-               * current hard-limit of 200 they will see an error thrown by the API.
-               */
+          canCreate && (
+            <LinkButton
+              startIcon={<Plus />}
+              size="S"
+              to="/settings/review-workflows/create"
+              onClick={(event) => {
+                /**
+                 * If the current license has a workflow limit:
+                 * check if the total count of workflows exceeds that limit. If so,
+                 * prevent the navigation and show the limits overlay.
+                 *
+                 * If the current license does not have a limit (e.g. offline license):
+                 * allow the user to navigate to the create-view. In case they exceed the
+                 * current hard-limit of 200 they will see an error thrown by the API.
+                 */
 
-              if (
-                limits?.[CHARGEBEE_WORKFLOW_ENTITLEMENT_NAME] &&
-                meta?.workflowCount >= parseInt(limits[CHARGEBEE_WORKFLOW_ENTITLEMENT_NAME], 10)
-              ) {
-                event.preventDefault();
-                setShowLimitModal(true);
-              } else {
-                trackUsage('willCreateWorkflow');
-              }
-            }}
-          >
-            {formatMessage({
-              id: 'Settings.review-workflows.list.page.create',
-              defaultMessage: 'Create new workflow',
-            })}
-          </LinkButton>
+                if (
+                  limits?.[CHARGEBEE_WORKFLOW_ENTITLEMENT_NAME] &&
+                  meta?.workflowCount >= parseInt(limits[CHARGEBEE_WORKFLOW_ENTITLEMENT_NAME], 10)
+                ) {
+                  event.preventDefault();
+                  setShowLimitModal(true);
+                } else {
+                  trackUsage('willCreateWorkflow');
+                }
+              }}
+            >
+              {formatMessage({
+                id: 'Settings.review-workflows.list.page.create',
+                defaultMessage: 'Create new workflow',
+              })}
+            </LinkButton>
+          )
         }
         subtitle={formatMessage({
           id: 'Settings.review-workflows.list.page.subtitle',

package/ee/admin/pages/SettingsPage/pages/SingleSignOn/index.js

@@ -1,4 +1,4 @@
-import React from 'react';
+import * as React from 'react';
 
 import {
   Button,
@@ -28,18 +28,20 @@ import isEqual from 'lodash/isEqual';
 import { useIntl } from 'react-intl';
 import { useSelector } from 'react-redux';
 
-import { useRolesList, useSettingsForm } from '../../../../../../admin/src/hooks';
+import { useSettingsForm } from '../../../../../../admin/src/hooks';
+import { useAdminRoles } from '../../../../../../admin/src/hooks/useAdminRoles';
 import { selectAdminPermissions } from '../../../../../../admin/src/pages/App/selectors';
-import { getRequestUrl } from '../../../../../../admin/src/utils';
 
 import schema from './utils/schema';
 
 export const SingleSignOn = () => {
+  useFocusWhenNavigate();
+
   const { formatMessage } = useIntl();
   const permissions = useSelector(selectAdminPermissions);
 
   const {
-    isLoading: isLoadingForPermissions,
+    isLoading: isLoadingPermissions,
     allowedActions: { canUpdate, canReadRoles },
   } = useRBAC({
     ...permissions.settings.sso,
@@ -47,44 +49,32 @@ export const SingleSignOn = () => {
   });
 
   const [
-    { formErrors, initialData, isLoading, modifiedData, showHeaderButtonLoader },
-    // eslint-disable-next-line no-unused-vars
-    dispatch,
+    { formErrors, initialData, isLoading: isLoadingForm, modifiedData, showHeaderButtonLoader },
+    ,
     { handleChange, handleSubmit },
-  ] = useSettingsForm(getRequestUrl('providers/options'), schema, () => {}, [
+  ] = useSettingsForm('/admin/providers/options', schema, () => {}, [
     'autoRegister',
     'defaultRole',
     'ssoLockedRoles',
   ]);
-  const { roles } = useRolesList(canReadRoles);
-
-  useFocusWhenNavigate();
 
-  const showLoader = isLoadingForPermissions || isLoading;
+  const { roles, isLoading: isLoadingRoles } = useAdminRoles(undefined, {
+    enabled: canReadRoles,
+  });
 
+  const isLoading = isLoadingPermissions || isLoadingRoles || isLoadingForm;
   // TODO: focus() first error field, but it looks like that requires refactoring from useSettingsForm to Formik
 
-  const isHeaderButtonDisabled = isEqual(initialData, modifiedData);
-
   return (
     <Layout>
       <SettingsPageTitle name="SSO" />
       <Main tabIndex={-1}>
-        <form
-          onSubmit={(e) => {
-            if (isHeaderButtonDisabled) {
-              e.preventDefault();
-
-              return;
-            }
-            handleSubmit(e);
-          }}
-        >
+        <form onSubmit={handleSubmit}>
           <HeaderLayout
             primaryAction={
               <Button
                 data-testid="save-button"
-                disabled={isHeaderButtonDisabled}
+                disabled={isEqual(initialData, modifiedData)}
                 loading={showHeaderButtonLoader}
                 startIcon={<Check />}
                 type="submit"
@@ -103,7 +93,7 @@ export const SingleSignOn = () => {
             })}
           />
           <ContentLayout>
-            {showLoader ? (
+            {isLoading ? (
               <LoadingIndicatorPage />
             ) : (
               <Flex

package/ee/server/config/admin-actions.js

@@ -39,24 +39,24 @@ module.exports = {
       subCategory: 'options',
     },
     {
-      uid: 'review-workflows.update',
-      displayName: 'Update',
+      uid: 'review-workflows.read',
+      displayName: 'Read',
       pluginName: 'admin',
       section: 'settings',
       category: 'review workflows',
       subCategory: 'options',
     },
     {
-      uid: 'review-workflows.delete',
-      displayName: 'Delete',
+      uid: 'review-workflows.update',
+      displayName: 'Update',
       pluginName: 'admin',
       section: 'settings',
       category: 'review workflows',
       subCategory: 'options',
     },
     {
-      uid: 'review-workflows.read',
-      displayName: 'Read',
+      uid: 'review-workflows.delete',
+      displayName: 'Delete',
       pluginName: 'admin',
       section: 'settings',
       category: 'review workflows',

package/ee/server/services/review-workflows/entity-service-decorator.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const { isNil, isNull } = require('lodash/fp');
+const { isNil } = require('lodash/fp');
 const { ENTITY_STAGE_ATTRIBUTE } = require('../../constants/workflows');
 const { WORKFLOW_UPDATE_STAGE } = require('../../constants/webhookEvents');
 const { getService } = require('../../utils');
@@ -56,7 +56,7 @@ const decorator = (service) => ({
   async update(uid, entityId, opts = {}) {
     // Prevents the stage from being set to null
     const data = { ...opts.data };
-    if (isNull(data[ENTITY_STAGE_ATTRIBUTE])) {
+    if (isNil(data[ENTITY_STAGE_ATTRIBUTE])) {
       delete data[ENTITY_STAGE_ATTRIBUTE];
       return service.update.call(this, uid, entityId, { ...opts, data });
     }
@@ -66,7 +66,8 @@ const decorator = (service) => ({
     const updatedEntity = await service.update.call(this, uid, entityId, { ...opts, data });
     const updatedStage = updatedEntity[ENTITY_STAGE_ATTRIBUTE];
 
-    if (previousStage?.id && previousStage.id !== updatedStage.id) {
+    // Stage might be null if field is not populated
+    if (updatedStage && previousStage?.id && previousStage.id !== updatedStage.id) {
       const model = strapi.getModel(uid);
 
       strapi.eventHub.emit(WORKFLOW_UPDATE_STAGE, {

package/index.js

@@ -31,6 +31,7 @@ async function build({ appDir, buildDestDir, env, forceBuild, optimize, options,
   const dest = path.resolve(buildDestDir, 'build');
 
   const pluginsPath = Object.keys(plugins).map((pluginName) => plugins[pluginName].pathToPlugin);
+  const enforceSourceMaps = process.env.STRAPI_ENFORCE_SOURCEMAPS === 'true' ?? false;
 
   // Either use the tsconfig file from the generated app or the one inside the .cache folder
   // so we can develop plugins in TS while being in a JS app
@@ -42,6 +43,7 @@ async function build({ appDir, buildDestDir, env, forceBuild, optimize, options,
     appDir,
     cacheDir,
     dest,
+    enforceSourceMaps,
     entry,
     env,
     optimize,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/admin",
-  "version": "4.12.0",
+  "version": "4.12.2",
   "description": "Strapi Admin",
   "repository": {
     "type": "git",
@@ -42,31 +42,31 @@
   "dependencies": {
     "@casl/ability": "^5.4.3",
     "@pmmmwh/react-refresh-webpack-plugin": "0.5.10",
-    "@strapi/data-transfer": "4.12.0",
+    "@strapi/data-transfer": "4.12.2",
     "@strapi/design-system": "1.8.2",
-    "@strapi/helper-plugin": "4.12.0",
+    "@strapi/helper-plugin": "4.12.2",
     "@strapi/icons": "1.8.2",
-    "@strapi/permissions": "4.12.0",
-    "@strapi/provider-audit-logs-local": "4.12.0",
-    "@strapi/typescript-utils": "4.12.0",
-    "@strapi/utils": "4.12.0",
+    "@strapi/permissions": "4.12.2",
+    "@strapi/provider-audit-logs-local": "4.12.2",
+    "@strapi/typescript-utils": "4.12.2",
+    "@strapi/utils": "4.12.2",
     "axios": "1.4.0",
     "bcryptjs": "2.4.3",
     "browserslist": "^4.17.3",
     "browserslist-to-esbuild": "1.2.0",
     "chalk": "^4.1.2",
-    "chokidar": "^3.5.1",
+    "chokidar": "3.5.3",
     "codemirror5": "npm:codemirror@^5.65.11",
     "cross-env": "^7.0.3",
     "css-loader": "^6.8.1",
     "date-fns": "2.30.0",
-    "dotenv": "8.5.1",
+    "dotenv": "14.2.0",
     "esbuild-loader": "^2.21.0",
-    "execa": "^1.0.0",
+    "execa": "5.1.1",
     "fast-deep-equal": "3.1.3",
     "find-root": "1.1.0",
     "fork-ts-checker-webpack-plugin": "7.3.0",
-    "formik": "^2.4.0",
+    "formik": "2.4.0",
     "fractional-indexing": "3.2.0",
     "fs-extra": "10.0.0",
     "highlight.js": "^10.4.1",
@@ -114,10 +114,10 @@
     "react-select": "5.7.0",
     "react-window": "1.8.8",
     "redux": "^4.2.1",
-    "reselect": "^4.1.7",
+    "reselect": "4.1.7",
     "rimraf": "3.0.2",
     "sanitize-html": "2.11.0",
-    "semver": "7.5.2",
+    "semver": "7.5.4",
     "sift": "16.0.1",
     "style-loader": "3.3.1",
     "styled-components": "5.3.3",
@@ -126,7 +126,7 @@
     "webpack-cli": "^5.1.0",
     "webpack-dev-server": "^4.15.0",
     "webpackbar": "^5.0.2",
-    "yup": "^0.32.9"
+    "yup": "0.32.9"
   },
   "devDependencies": {
     "@testing-library/dom": "9.2.0",
@@ -142,7 +142,7 @@
     "@strapi/strapi": "^4.3.4"
   },
   "engines": {
-    "node": ">=14.19.1 <=18.x.x",
+    "node": ">=16.0.0 <=20.x.x",
     "npm": ">=6.0.0"
   },
   "nx": {
@@ -154,5 +154,5 @@
       }
     }
   },
-  "gitHead": "7f8109a1a736c1d997fbb445469b3b59550c7aeb"
+  "gitHead": "b5a0cb4020ee9b170243e458decd5b1babf474e3"
 }

package/scripts/build.js

@@ -54,6 +54,7 @@ const buildAdmin = async () => {
       telemetryDisabled: process.env.STRAPI_TELEMETRY_DISABLED === 'true' ?? false,
     },
     tsConfigFilePath,
+    enforceSourceMaps: process.env.STRAPI_ENFORCE_SOURCEMAPS === 'true' ?? false,
   };
 
   const config =

package/server/controllers/role.js

@@ -49,7 +49,15 @@ module.exports = {
    * @param {KoaContext} ctx - koa context
    */
   async findAll(ctx) {
-    const roles = await getService('role').findAllWithUsersCount();
+    const { query } = ctx.request;
+
+    const permissionsManager = getService('permission').createPermissionsManager({
+      ability: ctx.state.userAbility,
+      model: 'admin::role',
+    });
+    const sanitizedQuery = await permissionsManager.sanitizeQuery(query);
+
+    const roles = await getService('role').findAllWithUsersCount(sanitizedQuery);
 
     ctx.body = {
       data: roles,

package/server/middlewares/rateLimit.js

@@ -1,7 +1,8 @@
 'use strict';
 
+const path = require('path');
 const utils = require('@strapi/utils');
-const { has, toLower } = require('lodash/fp');
+const { isString, has, toLower } = require('lodash/fp');
 
 const { RateLimitError } = utils.errors;
 
@@ -24,11 +25,14 @@ module.exports =
       const rateLimit = require('koa2-ratelimit').RateLimit;
 
       const userEmail = toLower(ctx.request.body.email) || 'unknownEmail';
+      const requestPath = isString(ctx.request.path)
+        ? toLower(path.normalize(ctx.request.path)).replace(/\/$/, '')
+        : 'invalidPath';
 
       const loadConfig = {
         interval: { min: 5 },
         max: 5,
-        prefixKey: `${userEmail}:${ctx.request.path}:${ctx.request.ip}`,
+        prefixKey: `${userEmail}:${requestPath}:${ctx.request.ip}`,
         handler() {
           throw new RateLimitError();
         },

package/server/services/role.js

@@ -110,8 +110,9 @@ const find = (params = {}, populate) => {
  * Find all roles in database
  * @returns {Promise<array>}
  */
-const findAllWithUsersCount = async (populate) => {
-  const roles = await strapi.query('admin::role').findMany({ populate });
+const findAllWithUsersCount = async (params) => {
+  const roles = await strapi.entityService.findMany('admin::role', params);
+
   for (const role of roles) {
     role.usersCount = await getUsersCount(role.id);
   }

package/server/services/transfer/token.js

@@ -1,7 +1,8 @@
 'use strict';
 
-const { map, isArray, omit, uniq, isNil, difference, isEmpty } = require('lodash/fp');
 const crypto = require('crypto');
+const assert = require('assert');
+const { map, isArray, omit, uniq, isNil, difference, isEmpty } = require('lodash/fp');
 
 const {
   errors: { ValidationError, NotFoundError },
@@ -65,6 +66,24 @@ const list = async () => {
   return tokens.map((token) => flattenTokenPermissions(token));
 };
 
+/**
+ * Create a random token's access key
+ * @returns {string}
+ */
+const generateRandomAccessKey = () => crypto.randomBytes(128).toString('hex');
+
+/**
+ * Validate the given access key's format and returns it if valid
+ * @param {string} accessKey
+ * @return {string}
+ */
+const validateAccessKey = (accessKey) => {
+  assert(typeof accessKey === 'string', 'Access key needs to be a string');
+  assert(accessKey.length >= 15, 'Access key needs to have at least 15 characters');
+
+  return accessKey;
+};
+
 /**
  * Create a token and its permissions
  *
@@ -73,11 +92,16 @@ const list = async () => {
  * @param {string} attributes.description
  * @param {number} attributes.lifespan
  * @param {string[]} attributes.permissions
+ * @param {string} [attributes.accessKey]
  *
  * @returns {Promise<TransferToken>}
  */
 const create = async (attributes) => {
-  const accessKey = crypto.randomBytes(128).toString('hex');
+  const accessKey =
+    'accessKey' in attributes ? validateAccessKey(attributes.accessKey) : generateRandomAccessKey();
+
+  // Make sure the access key isn't picked up directly from the attributes for the next steps
+  delete attributes.accessKey;
 
   assertTokenPermissionsValidity(attributes);
   assertValidLifespan(attributes);
@@ -380,8 +404,7 @@ const flattenTokenPermissions = (token) => {
 
 /**
  * Assert that a token's permissions are valid
- *
- * @param {TransferToken} token
+ * @param {object} attributes
  */
 const assertTokenPermissionsValidity = (attributes) => {
   const permissionService = strapi.admin.services.transfer.permission;

package/server/validation/authentication/register.js

@@ -11,7 +11,7 @@ const registrationSchema = yup
       .object()
       .shape({
         firstname: validators.firstname.required(),
-        lastname: validators.lastname,
+        lastname: validators.lastname.nullable(),
         password: validators.password.required(),
       })
       .required()
@@ -32,7 +32,7 @@ const adminRegistrationSchema = yup
   .shape({
     email: validators.email.required(),
     firstname: validators.firstname.required(),
-    lastname: validators.lastname,
+    lastname: validators.lastname.nullable(),
     password: validators.password.required(),
   })
   .required()

package/webpack.config.js

@@ -28,6 +28,7 @@ module.exports = ({
     features: [],
   },
   tsConfigFilePath,
+  enforceSourceMaps,
 }) => {
   const isProduction = env === 'production';
 
@@ -54,7 +55,7 @@ module.exports = ({
   return {
     mode: isProduction ? 'production' : 'development',
     bail: !!isProduction,
-    devtool: isProduction ? false : 'eval-source-map',
+    devtool: isProduction && !enforceSourceMaps ? false : 'source-map',
     experiments: {
       topLevelAwait: true,
     },

package/admin/src/content-manager/components/SingleTypeFormWrapper/utils/getRequestUrl.js

@@ -1,5 +0,0 @@
-import { getRequestUrl } from '../../../utils';
-
-const requestURL = (path) => getRequestUrl(`single-types/${path}`);
-
-export default requestURL;

package/admin/src/content-manager/components/SingleTypeFormWrapper/utils/index.js

@@ -1,2 +0,0 @@
-// eslint-disable-next-line import/prefer-default-export
-export { default as getRequestUrl } from './getRequestUrl';

package/admin/src/content-manager/pages/EditSettingsView/utils/api.js

@@ -1,16 +0,0 @@
-import { getFetchClient } from '@strapi/helper-plugin';
-
-import { getRequestUrl } from '../../../utils';
-
-const putCMSettingsEV = (body, slug, isContentTypeView) => {
-  const { put } = getFetchClient();
-
-  return put(
-    getRequestUrl(
-      isContentTypeView ? `content-types/${slug}/configuration` : `components/${slug}/configuration`
-    ),
-    body
-  );
-};
-
-export default putCMSettingsEV;

package/admin/src/content-manager/pages/ListSettingsView/init.js

@@ -1,9 +0,0 @@
-const init = (initialState, layout) => {
-  return {
-    ...initialState,
-    initialData: layout,
-    modifiedData: layout,
-  };
-};
-
-export default init;

package/admin/src/content-manager/utils/getRequestUrl.js

@@ -1,4 +0,0 @@
-// FIXME when back-end ready
-const getRequestUrl = (path) => `/content-manager/${path}`;
-
-export default getRequestUrl;

package/admin/src/hooks/marketplace/useFetchMarketplacePlugins/index.js

@@ -1,44 +0,0 @@
-import { useNotification } from '@strapi/helper-plugin';
-import qs from 'qs';
-import { useQuery } from 'react-query';
-
-import { MARKETPLACE_API_URL } from '../constants';
-
-const fetchMarketplacePlugins = async (params = {}) => {
-  try {
-    const queryString = qs.stringify(qs.parse(params));
-    const res = await fetch(`${MARKETPLACE_API_URL}/plugins?${queryString}`);
-
-    if (!res.ok) {
-      throw new Error('Failed to fetch marketplace plugins.');
-    }
-
-    const data = await res.json();
-
-    return data;
-  } catch (error) {
-    console.error(error);
-  }
-
-  return null;
-};
-
-const useFetchMarketplacePlugins = (notifyLoad, params) => {
-  const toggleNotification = useNotification();
-
-  return useQuery(['list-marketplace-plugins', params], () => fetchMarketplacePlugins(params), {
-    onSuccess() {
-      if (notifyLoad) {
-        notifyLoad();
-      }
-    },
-    onError() {
-      toggleNotification({
-        type: 'warning',
-        message: { id: 'notification.error', defaultMessage: 'An error occured' },
-      });
-    },
-  });
-};
-
-export default useFetchMarketplacePlugins;

package/admin/src/hooks/marketplace/useFetchMarketplaceProviders/index.js

@@ -1,44 +0,0 @@
-import { useNotification } from '@strapi/helper-plugin';
-import qs from 'qs';
-import { useQuery } from 'react-query';
-
-import { MARKETPLACE_API_URL } from '../constants';
-
-const fetchMarketplaceProviders = async (params = {}) => {
-  try {
-    const queryString = qs.stringify(qs.parse(params));
-    const res = await fetch(`${MARKETPLACE_API_URL}/providers?${queryString}`);
-
-    if (!res.ok) {
-      throw new Error('Failed to fetch marketplace providers.');
-    }
-
-    const data = await res.json();
-
-    return data;
-  } catch (error) {
-    console.error(error);
-  }
-
-  return null;
-};
-
-const useFetchMarketplaceProviders = (notifyLoad, params) => {
-  const toggleNotification = useNotification();
-
-  return useQuery(['list-marketplace-providers', params], () => fetchMarketplaceProviders(params), {
-    onSuccess() {
-      if (notifyLoad) {
-        notifyLoad();
-      }
-    },
-    onError() {
-      toggleNotification({
-        type: 'warning',
-        message: { id: 'notification.error', defaultMessage: 'An error occured' },
-      });
-    },
-  });
-};
-
-export default useFetchMarketplaceProviders;

package/admin/src/hooks/useFetchEnabledPlugins/index.js

@@ -1,24 +0,0 @@
-import { useNotification } from '@strapi/helper-plugin';
-import { useQuery } from 'react-query';
-
-import { fetchEnabledPlugins } from './utils/api';
-
-const useFetchEnabledPlugins = (notifyLoad) => {
-  const toggleNotification = useNotification();
-
-  return useQuery('list-enabled-plugins', () => fetchEnabledPlugins(), {
-    onSuccess() {
-      if (notifyLoad) {
-        notifyLoad();
-      }
-    },
-    onError() {
-      toggleNotification({
-        type: 'warning',
-        message: { id: 'notification.error', defaultMessage: 'An error occured' },
-      });
-    },
-  });
-};
-
-export default useFetchEnabledPlugins;

package/admin/src/hooks/useFetchEnabledPlugins/utils/api.js

@@ -1,10 +0,0 @@
-import { getFetchClient } from '@strapi/helper-plugin';
-
-const fetchEnabledPlugins = async () => {
-  const { get } = getFetchClient();
-  const { data } = await get('/admin/plugins');
-
-  return data;
-};
-
-export { fetchEnabledPlugins };