@strapi/admin 4.6.0-beta.2 → 4.6.1

package/ee/server/routes/index.js

@@ -1,17 +1,13 @@
 'use strict';
 
-// eslint-disable-next-line node/no-extraneous-require
 const { features } = require('@strapi/strapi/lib/utils/ee');
-const featuresRoutes = require('./features-routes');
 
-const getFeaturesRoutes = () => {
-  return Object.entries(featuresRoutes).flatMap(([featureName, featureRoutes]) => {
-    if (features.isEnabled(featureName)) {
-      return featureRoutes;
-    }
+const enableFeatureMiddleware = (featureName) => (ctx, next) => {
+  if (features.isEnabled(featureName)) {
+    return next();
+  }
 
-    return [];
-  });
+  ctx.status = 404;
 };
 
 module.exports = [
@@ -63,5 +59,93 @@ module.exports = [
       ],
     },
   },
-  ...getFeaturesRoutes(),
+
+  // SSO
+  {
+    method: 'GET',
+    path: '/providers',
+    handler: 'authentication.getProviders',
+    config: {
+      middlewares: [enableFeatureMiddleware('sso')],
+      auth: false,
+    },
+  },
+  {
+    method: 'GET',
+    path: '/connect/:provider',
+    handler: 'authentication.providerLogin',
+    config: {
+      middlewares: [enableFeatureMiddleware('sso')],
+      auth: false,
+    },
+  },
+  {
+    method: 'POST',
+    path: '/connect/:provider',
+    handler: 'authentication.providerLogin',
+    config: {
+      middlewares: [enableFeatureMiddleware('sso')],
+      auth: false,
+    },
+  },
+  {
+    method: 'GET',
+    path: '/providers/options',
+    handler: 'authentication.getProviderLoginOptions',
+    config: {
+      middlewares: [enableFeatureMiddleware('sso')],
+      policies: [
+        'admin::isAuthenticatedAdmin',
+        { name: 'admin::hasPermissions', config: { actions: ['admin::provider-login.read'] } },
+      ],
+    },
+  },
+  {
+    method: 'PUT',
+    path: '/providers/options',
+    handler: 'authentication.updateProviderLoginOptions',
+    config: {
+      middlewares: [enableFeatureMiddleware('sso')],
+      policies: [
+        'admin::isAuthenticatedAdmin',
+        { name: 'admin::hasPermissions', config: { actions: ['admin::provider-login.update'] } },
+      ],
+    },
+  },
+
+  // Audit logs
+  {
+    method: 'GET',
+    path: '/audit-logs',
+    handler: 'auditLogs.findMany',
+    config: {
+      middlewares: [enableFeatureMiddleware('audit-logs')],
+      policies: [
+        'admin::isAuthenticatedAdmin',
+        {
+          name: 'admin::hasPermissions',
+          config: {
+            actions: ['admin::audit-logs.read'],
+          },
+        },
+      ],
+    },
+  },
+  {
+    method: 'GET',
+    path: '/audit-logs/:id',
+    handler: 'auditLogs.findOne',
+    config: {
+      middlewares: [enableFeatureMiddleware('audit-logs')],
+      policies: [
+        'admin::isAuthenticatedAdmin',
+        {
+          name: 'admin::hasPermissions',
+          config: {
+            actions: ['admin::audit-logs.read'],
+          },
+        },
+      ],
+    },
+  },
 ];

package/ee/server/services/audit-logs.js

@@ -2,6 +2,9 @@
 
 const localProvider = require('@strapi/provider-audit-logs-local');
 const { scheduleJob } = require('node-schedule');
+const { features } = require('@strapi/strapi/lib/utils/ee');
+
+const DEFAULT_RETENTION_DAYS = 90;
 
 const defaultEvents = [
   'entry.create',
@@ -12,6 +15,9 @@ const defaultEvents = [
   'media.create',
   'media.update',
   'media.delete',
+  'media-folder.create',
+  'media-folder.update',
+  'media-folder.delete',
   'user.create',
   'user.update',
   'user.delete',
@@ -52,6 +58,16 @@ const createAuditLogsService = (strapi) => {
   const eventMap = getEventMap(defaultEvents);
 
   const processEvent = (name, ...args) => {
+    const state = strapi.requestContext.get()?.state;
+
+    // Ignore events with auth strategies different from admin
+    const isUsingAdminAuth = state?.auth?.strategy.name === 'admin';
+    const user = state?.user;
+
+    if (!isUsingAdminAuth || !user) {
+      return null;
+    }
+
     const getPayload = eventMap[name];
 
     // Ignore the event if it's not in the map
@@ -59,11 +75,17 @@ const createAuditLogsService = (strapi) => {
       return null;
     }
 
+    // Ignore some events based on payload
+    const ignoredUids = ['plugin::upload.file', 'plugin::upload.folder'];
+    if (ignoredUids.includes(args[0]?.uid)) {
+      return null;
+    }
+
     return {
       action: name,
       date: new Date().toISOString(),
       payload: getPayload(...args) || {},
-      userId: strapi.requestContext.get()?.state?.user?.id,
+      userId: user.id,
     };
   };
 
@@ -77,9 +99,15 @@ const createAuditLogsService = (strapi) => {
 
   return {
     async register() {
+      const retentionDays =
+        features.get('audit-logs')?.options.retentionDays ?? DEFAULT_RETENTION_DAYS;
       this._provider = await localProvider.register({ strapi });
       this._eventHubUnsubscribe = strapi.eventHub.subscribe(handleEvent.bind(this));
-      this._deleteExpiredJob = scheduleJob('0 0 * * *', this._provider.deleteExpiredEvents);
+      this._deleteExpiredJob = scheduleJob('0 0 * * *', () => {
+        const expirationDate = new Date(Date.now() - retentionDays * 24 * 60 * 60 * 1000);
+        this._provider.deleteExpiredEvents(expirationDate);
+      });
+
       return this;
     },
 

package/ee/server/services/passport/sso.js

@@ -1,13 +1,25 @@
 'use strict';
 
+const ee = require('@strapi/strapi/ee');
 const { authEventsMapper } = require('../../../../server/services/passport');
 const createProviderRegistry = require('./provider-registry');
 
 const providerRegistry = createProviderRegistry();
+const errorMessage = 'SSO is disabled. Its functionnalities cannot be accessed.';
 
-const getStrategyCallbackURL = (providerName) => `/admin/connect/${providerName}`;
+const getStrategyCallbackURL = (providerName) => {
+  if (!ee.features.isEnabled('sso')) {
+    throw new Error(errorMessage);
+  }
+
+  return `/admin/connect/${providerName}`;
+};
 
 const syncProviderRegistryWithConfig = () => {
+  if (!ee.features.isEnabled('sso')) {
+    throw new Error(errorMessage);
+  }
+
   const { providers = [] } = strapi.config.get('admin.auth', {});
 
   providerRegistry.registerMany(providers);

package/ee/server/services/passport.js

@@ -25,8 +25,5 @@ const getPassportStrategies = () => {
 
 module.exports = {
   getPassportStrategies,
+  ...sso,
 };
-
-if (features.isEnabled('sso')) {
-  Object.assign(module.exports, sso);
-}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/admin",
-  "version": "4.6.0-beta.2",
+  "version": "4.6.1",
   "description": "Strapi Admin",
   "repository": {
     "type": "git",
@@ -38,30 +38,25 @@
     "test:front:ce:cov": "cross-env IS_EE=false jest --config ./jest.config.front.js --coverage"
   },
   "dependencies": {
-    "@babel/core": "7.18.10",
-    "@babel/plugin-transform-runtime": "7.18.10",
-    "@babel/preset-env": "7.18.10",
-    "@babel/preset-react": "7.18.6",
-    "@babel/runtime": "7.18.9",
+    "@babel/core": "^7.20.12",
+    "@babel/plugin-transform-runtime": "^7.19.6",
+    "@babel/preset-env": "^7.20.2",
+    "@babel/preset-react": "^7.18.6",
+    "@babel/runtime": "^7.20.13",
     "@casl/ability": "^5.4.3",
     "@fingerprintjs/fingerprintjs": "3.3.6",
-    "@fortawesome/fontawesome-free": "^5.15.3",
-    "@fortawesome/fontawesome-svg-core": "6.2.0",
-    "@fortawesome/free-brands-svg-icons": "^5.15.3",
-    "@fortawesome/free-solid-svg-icons": "^5.15.3",
-    "@fortawesome/react-fontawesome": "^0.2.0",
     "@pmmmwh/react-refresh-webpack-plugin": "0.5.10",
-    "@strapi/babel-plugin-switch-ee-ce": "4.6.0-beta.2",
-    "@strapi/data-transfer": "4.6.0-beta.2",
-    "@strapi/design-system": "0.0.0-jsoninput.0",
-    "@strapi/helper-plugin": "4.6.0-beta.2",
-    "@strapi/icons": "1.4.2",
-    "@strapi/permissions": "4.6.0-beta.2",
-    "@strapi/provider-audit-logs-local": "4.6.0-beta.2",
-    "@strapi/typescript-utils": "4.6.0-beta.2",
-    "@strapi/utils": "4.6.0-beta.2",
+    "@strapi/babel-plugin-switch-ee-ce": "4.6.1",
+    "@strapi/data-transfer": "4.6.1",
+    "@strapi/design-system": "1.6.3",
+    "@strapi/helper-plugin": "4.6.1",
+    "@strapi/icons": "1.6.3",
+    "@strapi/permissions": "4.6.1",
+    "@strapi/provider-audit-logs-local": "4.6.1",
+    "@strapi/typescript-utils": "4.6.1",
+    "@strapi/utils": "4.6.1",
     "axios": "1.2.2",
-    "babel-loader": "8.2.5",
+    "babel-loader": "^9.1.2",
     "babel-plugin-styled-components": "2.0.2",
     "bcryptjs": "2.4.3",
     "browserslist-to-esbuild": "1.2.0",
@@ -69,10 +64,10 @@
     "chokidar": "^3.5.1",
     "codemirror": "^5.65.11",
     "cross-env": "^7.0.3",
-    "css-loader": "6.7.2",
+    "css-loader": "^6.7.3",
     "date-fns": "2.29.3",
     "dotenv": "8.5.1",
-    "esbuild-loader": "^2.20.0",
+    "esbuild-loader": "^2.21.0",
     "execa": "^1.0.0",
     "fast-deep-equal": "3.1.3",
     "find-root": "1.1.0",
@@ -82,9 +77,9 @@
     "highlight.js": "^10.4.1",
     "history": "^4.9.0",
     "hoist-non-react-statics": "^3.3.0",
-    "html-loader": "3.1.2",
+    "html-loader": "^4.2.0",
     "html-webpack-plugin": "5.5.0",
-    "immer": "9.0.15",
+    "immer": "9.0.19",
     "invariant": "^2.2.4",
     "js-cookie": "2.2.1",
     "jsonwebtoken": "9.0.0",
@@ -104,7 +99,7 @@
     "markdown-it-sub": "^1.0.0",
     "markdown-it-sup": "1.0.0",
     "match-sorter": "^4.0.2",
-    "mini-css-extract-plugin": "2.4.4",
+    "mini-css-extract-plugin": "2.7.2",
     "msw": "0.49.1",
     "node-polyfill-webpack-plugin": "2.0.1",
     "node-schedule": "2.1.0",
@@ -120,7 +115,7 @@
     "react-error-boundary": "3.1.4",
     "react-fast-compare": "^3.2.0",
     "react-helmet": "^6.1.0",
-    "react-intl": "5.25.1",
+    "react-intl": "6.2.7",
     "react-is": "^17.0.2",
     "react-query": "3.24.3",
     "react-redux": "7.2.8",
@@ -137,9 +132,9 @@
     "style-loader": "3.3.1",
     "styled-components": "5.3.3",
     "typescript": "4.6.2",
-    "webpack": "^5.74.0",
-    "webpack-cli": "^4.10.0",
-    "webpack-dev-server": "^4.9.3",
+    "webpack": "^5.75.0",
+    "webpack-cli": "^5.0.1",
+    "webpack-dev-server": "^4.11.1",
     "webpackbar": "^5.0.2",
     "yup": "^0.32.9"
   },
@@ -152,7 +147,7 @@
     "glob": "8.0.3",
     "react-test-renderer": "^17.0.2",
     "speed-measure-webpack-plugin": "1.5.0",
-    "webpack-bundle-analyzer": "^4.6.1"
+    "webpack-bundle-analyzer": "^4.7.0"
   },
   "peerDependencies": {
     "@strapi/strapi": "^4.3.4"
@@ -170,5 +165,5 @@
       }
     }
   },
-  "gitHead": "b852090f931cd21868c4016f24db2f9fdfc7a7ab"
+  "gitHead": "17a7845e3d453ea2e7911bda6ec25ed196dd5f16"
 }

package/server/controllers/admin.js

@@ -1,6 +1,8 @@
 'use strict';
 
 const path = require('path');
+
+const { map, values, sumBy, pipe, flatMap, propEq } = require('lodash/fp');
 const execa = require('execa');
 const _ = require('lodash');
 const { exists } = require('fs-extra');
@@ -37,7 +39,7 @@ module.exports = {
   async getProjectType() {
     // FIXME
     try {
-      return { data: { isEE: strapi.EE, features: ee.features.getEnabled() } };
+      return { data: { isEE: strapi.EE, features: ee.features.list() } };
     } catch (err) {
       return { data: { isEE: false, features: [] } };
     }
@@ -46,7 +48,7 @@ module.exports = {
   async init() {
     let uuid = strapi.config.get('uuid', false);
     const hasAdmin = await getService('user').exists();
-    const { menuLogo } = await getService('project-settings').getProjectSettings();
+    const { menuLogo, authLogo } = await getService('project-settings').getProjectSettings();
     // set to null if telemetryDisabled flag not avaialble in package.json
     const telemetryDisabled = strapi.config.get('packageJsonStrapi.telemetryDisabled', null);
 
@@ -59,6 +61,7 @@ module.exports = {
         uuid,
         hasAdmin,
         menuLogo: menuLogo ? menuLogo.url : null,
+        authLogo: authLogo ? authLogo.url : null,
       },
     };
   },
@@ -96,11 +99,25 @@ module.exports = {
     );
     const isHostedOnStrapiCloud = env('STRAPI_HOSTING', null) === 'strapi.cloud';
 
+    const numberOfAllContentTypes = _.size(strapi.contentTypes);
+    const numberOfComponents = _.size(strapi.components);
+
+    const getNumberOfDynamicZones = () => {
+      return pipe(
+        map('attributes'),
+        flatMap(values),
+        sumBy(propEq('type', 'dynamiczone'))
+      )(strapi.contentTypes);
+    };
+
     return {
       data: {
         useTypescriptOnServer,
         useTypescriptOnAdmin,
         isHostedOnStrapiCloud,
+        numberOfAllContentTypes, // TODO: V5: This event should be renamed numberOfContentTypes in V5 as the name is already taken to describe the number of content types using i18n.
+        numberOfComponents,
+        numberOfDynamicZones: getNumberOfDynamicZones(),
       },
     };
   },

package/server/register.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const { register: registerDataTransferRoute } = require('@strapi/data-transfer/lib/strapi');
+// const { register: registerDataTransferRoute } = require('@strapi/data-transfer/lib/strapi');
 
 const registerAdminPanelRoute = require('./routes/serve-admin-panel');
 const adminAuthStrategy = require('./strategies/admin');
@@ -17,10 +17,10 @@ module.exports = ({ strapi }) => {
     registerAdminPanelRoute({ strapi });
   }
 
-  if (
-    process.env.STRAPI_EXPERIMENTAL === 'true' &&
-    process.env.STRAPI_DISABLE_REMOTE_DATA_TRANSFER !== 'true'
-  ) {
-    registerDataTransferRoute(strapi);
-  }
+  // if (
+  //   process.env.STRAPI_EXPERIMENTAL === 'true' &&
+  //   process.env.STRAPI_DISABLE_REMOTE_DATA_TRANSFER !== 'true'
+  // ) {
+  //   registerDataTransferRoute(strapi);
+  // }
 };

package/server/services/project-settings.js

@@ -3,10 +3,7 @@
 const fs = require('fs');
 const { pick } = require('lodash');
 
-const PROJECT_SETTINGS_FILE_INPUTS = ['menuLogo'];
-const DEFAULT_PROJECT_SETTINGS = {
-  menuLogo: null,
-};
+const PROJECT_SETTINGS_FILE_INPUTS = ['menuLogo', 'authLogo'];
 
 const parseFilesData = async (files) => {
   const formatedFilesData = {};
@@ -52,8 +49,15 @@ const parseFilesData = async (files) => {
 
 const getProjectSettings = async () => {
   const store = strapi.store({ type: 'core', name: 'admin' });
+
+  // Returns an object with file inputs names as key and null as value
+  const defaultProjectSettings = PROJECT_SETTINGS_FILE_INPUTS.reduce((prev, cur) => {
+    prev[cur] = null;
+    return prev;
+  }, {});
+
   const projectSettings = {
-    ...DEFAULT_PROJECT_SETTINGS,
+    ...defaultProjectSettings,
     ...(await store.get({ key: 'project-settings' })),
   };
 
@@ -133,7 +137,7 @@ const updateProjectSettings = async (newSettings) => {
     }
 
     // If the user input is undefined reuse previous setting (do not update field)
-    if (!newSettings[inputName]) {
+    if (!newSettings[inputName] && previousSettings) {
       newSettings[inputName] = previousSettings[inputName];
       return;
     }

package/server/services/user.js

@@ -98,7 +98,9 @@ const updateById = async (id, attributes) => {
     populate: ['roles'],
   });
 
-  strapi.eventHub.emit('user.update', { user: sanitizeUser(updatedUser) });
+  if (updatedUser) {
+    strapi.eventHub.emit('user.update', { user: sanitizeUser(updatedUser) });
+  }
 
   return updatedUser;
 };

package/server/validation/project-settings.js

@@ -10,26 +10,35 @@ const ALLOWED_IMAGE_FILE_TYPES = ['image/jpeg', 'image/png', 'image/svg+xml'];
 const updateProjectSettings = yup
   .object({
     menuLogo: yup.string(),
+    authLogo: yup.string(),
   })
   .noUnknown();
 
+const updateProjectSettingsLogo = yup.object({
+  name: yup.string(),
+  type: yup.string().oneOf(ALLOWED_IMAGE_FILE_TYPES),
+  size: yup.number().max(MAX_IMAGE_FILE_SIZE),
+});
+
 const updateProjectSettingsFiles = yup
   .object({
-    menuLogo: yup.object({
-      name: yup.string(),
-      type: yup.string().oneOf(ALLOWED_IMAGE_FILE_TYPES),
-      size: yup.number().max(MAX_IMAGE_FILE_SIZE),
-    }),
+    menuLogo: updateProjectSettingsLogo,
+    authLogo: updateProjectSettingsLogo,
   })
   .noUnknown();
 
-const updateProjectSettingsImagesDimensions = yup.object({
-  menuLogo: yup.object({
-    width: yup.number().max(MAX_IMAGE_WIDTH),
-    height: yup.number().max(MAX_IMAGE_HEIGHT),
-  }),
+const logoDimensions = yup.object({
+  width: yup.number().max(MAX_IMAGE_WIDTH),
+  height: yup.number().max(MAX_IMAGE_HEIGHT),
 });
 
+const updateProjectSettingsImagesDimensions = yup
+  .object({
+    menuLogo: logoDimensions,
+    authLogo: logoDimensions,
+  })
+  .noUnknown();
+
 module.exports = {
   validateUpdateProjectSettings: validateYupSchemaSync(updateProjectSettings),
   validateUpdateProjectSettingsFiles: validateYupSchemaSync(updateProjectSettingsFiles),

package/strapi-server.js

@@ -8,7 +8,7 @@ const mergeRoutes = (a, b, key) => {
   return _.isArray(a) && _.isArray(b) && key === 'routes' ? a.concat(b) : undefined;
 };
 
-if (process.env.STRAPI_DISABLE_EE !== 'true' && strapi.EE) {
+if (strapi.EE) {
   const eeAdmin = require('./ee/strapi-server');
 
   module.exports = _.mergeWith({}, admin, eeAdmin, mergeRoutes);

package/admin/src/content-manager/components/InputJSON/FieldWrapper.js

@@ -1,40 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { useIntl } from 'react-intl';
-import { Field } from '@strapi/design-system/Field';
-
-const FieldWrapper = ({ name, hint, error, children, required }) => {
-  const { formatMessage } = useIntl();
-  const errorMessage = error ? formatMessage({ id: error, defaultMessage: error }) : '';
-
-  return (
-    <Field
-      name={name}
-      hint={hint && formatMessage(hint)}
-      error={errorMessage}
-      id={name}
-      required={required}
-    >
-      {children}
-    </Field>
-  );
-};
-
-FieldWrapper.defaultProps = {
-  hint: undefined,
-  error: '',
-  required: false,
-};
-
-FieldWrapper.propTypes = {
-  name: PropTypes.string.isRequired,
-  hint: PropTypes.shape({
-    id: PropTypes.string,
-    defaultMessage: PropTypes.string,
-  }),
-  error: PropTypes.string,
-  children: PropTypes.node.isRequired,
-  required: PropTypes.bool,
-};
-
-export default FieldWrapper;

package/admin/src/content-manager/components/InputJSON/Label.js

@@ -1,35 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { useIntl } from 'react-intl';
-import { FieldLabel } from '@strapi/design-system/Field';
-
-const Label = ({ intlLabel, labelAction, name }) => {
-  const { formatMessage } = useIntl();
-  const label = intlLabel?.id
-    ? formatMessage(
-        { id: intlLabel.id, defaultMessage: intlLabel.defaultMessage },
-        { ...intlLabel.values }
-      )
-    : name;
-
-  return <FieldLabel action={labelAction}>{label}</FieldLabel>;
-};
-
-Label.defaultProps = {
-  id: undefined,
-  intlLabel: undefined,
-  labelAction: undefined,
-};
-
-Label.propTypes = {
-  id: PropTypes.string,
-  intlLabel: PropTypes.shape({
-    id: PropTypes.string.isRequired,
-    defaultMessage: PropTypes.string.isRequired,
-    values: PropTypes.object,
-  }),
-  labelAction: PropTypes.element,
-  name: PropTypes.string.isRequired,
-};
-
-export default Label;

package/admin/src/content-manager/components/InputJSON/components.js

@@ -1,36 +0,0 @@
-import styled from 'styled-components';
-import { Box } from '@strapi/design-system/Box';
-
-/* eslint-disable */
-/* stylelint-disable */
-const EditorWrapper = styled.div`
-  cursor: ${({ disabled }) => (disabled ? 'not-allowed !important' : 'auto')};
-  /* BASICS */
-
-  .colored {
-    background-color: yellow;
-    color: black !important;
-  }
-
-  > div {
-    border-radius: 3px;
-    > div:last-of-type {
-      min-height: 253px;
-      max-height: 506px;
-    }
-  }
-
-  .CodeMirror {
-    /* Set height, width, borders, and global font properties here */
-    font-size: ${14 / 16}rem;
-    direction: ltr;
-    z-index: 0;
-  }
-`;
-
-const StyledBox = styled(Box)`
-  border-radius: ${({ theme }) => theme.borderRadius};
-  border: 1px solid ${({ theme, error }) => (error ? theme.colors.danger600 : 'transparent')};
-`;
-
-export { EditorWrapper, StyledBox };