@strapi/admin 4.1.10-beta.0 → 4.1.12

package/server/config/admin-actions.js

@@ -146,19 +146,5 @@ module.exports = {
       section: 'settings',
       category: 'api tokens',
     },
-    {
-      uid: 'project-settings.update',
-      displayName: 'Update the project level settings',
-      pluginName: 'admin',
-      section: 'settings',
-      category: 'project',
-    },
-    {
-      uid: 'project-settings.read',
-      displayName: 'Read the project level settings',
-      pluginName: 'admin',
-      section: 'settings',
-      category: 'project',
-    },
   ],
 };

package/server/controllers/admin.js

@@ -8,11 +8,6 @@ const { ValidationError } = require('@strapi/utils').errors;
 // eslint-disable-next-line node/no-extraneous-require
 const ee = require('@strapi/strapi/lib/utils/ee');
 
-const {
-  validateUpdateProjectSettings,
-  validateUpdateProjectSettingsFiles,
-  validateUpdateProjectSettingsImagesDimensions,
-} = require('../validation/project-settings');
 const { getService } = require('../utils');
 
 const PLUGIN_NAME_REGEX = /^[A-Za-z][A-Za-z0-9-_]+$/;
@@ -44,7 +39,6 @@ module.exports = {
   async init() {
     let uuid = strapi.config.get('uuid', false);
     const hasAdmin = await getService('user').exists();
-    const { menuLogo } = await getService('project-settings').getProjectSettings();
     // set to null if telemetryDisabled flag not avaialble in package.json
     const telemetryDisabled = strapi.config.get('packageJsonStrapi.telemetryDisabled', null);
 
@@ -52,33 +46,7 @@ module.exports = {
       uuid = false;
     }
 
-    return {
-      data: {
-        uuid,
-        hasAdmin,
-        menuLogo: menuLogo ? menuLogo.url : null,
-      },
-    };
-  },
-
-  async getProjectSettings() {
-    return getService('project-settings').getProjectSettings();
-  },
-
-  async updateProjectSettings(ctx) {
-    const projectSettingsService = getService('project-settings');
-
-    const {
-      request: { files, body },
-    } = ctx;
-
-    await validateUpdateProjectSettings(body);
-    await validateUpdateProjectSettingsFiles(files);
-
-    const formatedFiles = await projectSettingsService.parseFilesData(files);
-    await validateUpdateProjectSettingsImagesDimensions(formatedFiles);
-
-    return projectSettingsService.updateProjectSettings({ ...body, ...formatedFiles });
+    return { data: { uuid, hasAdmin } };
   },
 
   async information() {

package/server/controllers/user.js

@@ -36,6 +36,10 @@ module.exports = {
 
     const userInfo = getService('user').sanitizeUser(createdUser);
 
+    // Note: We need to assign manually the registrationToken to the
+    // final user payload so that it's not removed in the sanitation process.
+    Object.assign(userInfo, { registrationToken: createdUser.registrationToken });
+
     // Send 201 created
     ctx.created({ data: userInfo });
   },

package/server/routes/admin.js

@@ -7,34 +7,6 @@ module.exports = [
     handler: 'admin.init',
     config: { auth: false },
   },
-  {
-    method: 'GET',
-    path: '/project-settings',
-    handler: 'admin.getProjectSettings',
-    config: {
-      policies: [
-        'admin::isAuthenticatedAdmin',
-        {
-          name: 'admin::hasPermissions',
-          config: { actions: ['admin::project-settings.read'] },
-        },
-      ],
-    },
-  },
-  {
-    method: 'POST',
-    path: '/project-settings',
-    handler: 'admin.updateProjectSettings',
-    config: {
-      policies: [
-        'admin::isAuthenticatedAdmin',
-        {
-          name: 'admin::hasPermissions',
-          config: { actions: ['admin::project-settings.update'] },
-        },
-      ],
-    },
-  },
   {
     method: 'GET',
     path: '/project-type',

package/server/services/index.js

@@ -13,5 +13,4 @@ module.exports = {
   auth: require('./auth'),
   action: require('./action'),
   'api-token': require('./api-token'),
-  'project-settings': require('./project-settings'),
 };

package/server/services/permission/permissions-manager/sanitize.js

@@ -14,6 +14,7 @@ const {
   uniq,
   intersection,
   pick,
+  getOr,
 } = require('lodash/fp');
 
 const { contentTypes, traverseEntity, sanitize, pipeAsync } = require('@strapi/utils');
@@ -46,6 +47,8 @@ module.exports = ({ action, ability, model }) => {
     const permittedFields = fields.shouldIncludeAll ? null : getOutputFields(fields.permitted);
 
     return pipeAsync(
+      // Remove fields hidden from the admin
+      traverseEntity(omitHiddenFields, { schema }),
       // Remove unallowed fields from admin::user relations
       traverseEntity(pickAllowedAdminUserFields, { schema }),
       // Remove not allowed fields (RBAC)
@@ -61,6 +64,8 @@ module.exports = ({ action, ability, model }) => {
     const permittedFields = fields.shouldIncludeAll ? null : getInputFields(fields.permitted);
 
     return pipeAsync(
+      // Remove fields hidden from the admin
+      traverseEntity(omitHiddenFields, { schema }),
       // Remove not allowed fields (RBAC)
       traverseEntity(allowedFields(permittedFields), { schema }),
       // Remove roles from createdBy & updateBy fields
@@ -107,8 +112,25 @@ module.exports = ({ action, ability, model }) => {
     return defaults({ subject: asSubject(model, data), action }, options);
   };
 
+  /**
+   * Omit creator fields' (createdBy & updatedBy) roles from the admin API responses
+   */
   const omitCreatorRoles = omit([`${CREATED_BY_ATTRIBUTE}.roles`, `${UPDATED_BY_ATTRIBUTE}.roles`]);
 
+  /**
+   * Visitor used to remove hidden fields from the admin API responses
+   */
+  const omitHiddenFields = ({ key, schema }, { remove }) => {
+    const isHidden = getOr(false, ['config', 'attributes', key, 'hidden'], schema);
+
+    if (isHidden) {
+      remove(key);
+    }
+  };
+
+  /**
+   * Visitor used to only select needed fields from the admin users entities & avoid leaking sensitive information
+   */
   const pickAllowedAdminUserFields = ({ attribute, key, value }, { set }) => {
     const pickAllowedFields = pick(['id', 'firstname', 'lastname', 'username']);
 

package/server/services/user.js

@@ -17,7 +17,7 @@ const sanitizeUserRoles = role => _.pick(role, ['id', 'name', 'description', 'co
  */
 const sanitizeUser = user => {
   return {
-    ..._.omit(user, ['password', 'resetPasswordToken', 'roles']),
+    ..._.omit(user, ['password', 'resetPasswordToken', 'registrationToken', 'roles']),
     roles: user.roles && user.roles.map(sanitizeUserRoles),
   };
 };

package/server/utils/index.d.ts

@@ -6,7 +6,6 @@ import * as metrics from '../services/metrics';
 import * as token from '../services/token';
 import * as auth from '../services/auth';
 import * as apiToken from '../services/api-token';
-import * as projectSettings from '../services/project-settings';
 
 type S = {
   role: typeof role;
@@ -17,7 +16,6 @@ type S = {
   auth: typeof auth;
   metrics: typeof metrics;
   'api-token': typeof apiToken;
-  'project-settings': typeof projectSettings;
 };
 
 export function getService<T extends keyof S>(name: T): S[T];

package/admin/src/components/ConfigurationsProvider/index.js

@@ -1,51 +0,0 @@
-import React, { useReducer, useRef } from 'react';
-import PropTypes from 'prop-types';
-import { ConfigurationsContext } from '../../contexts';
-import reducer, { initialState } from './reducer';
-
-const ConfigurationsProvider = ({
-  children,
-  authLogo,
-  menuLogo: defaultMenuLogo,
-  showReleaseNotification,
-  showTutorials,
-}) => {
-  const [{ menuLogo }, dispatch] = useReducer(reducer, initialState);
-
-  const updateProjectSettings = ({ menuLogo }) => {
-    return dispatch({
-      type: 'UPDATE_PROJECT_SETTINGS',
-      values: {
-        menuLogo: menuLogo || defaultMenuLogo,
-      },
-    });
-  };
-
-  const updateProjectSettingsRef = useRef(updateProjectSettings);
-
-  return (
-    <ConfigurationsContext.Provider
-      value={{
-        logos: {
-          menu: { custom: menuLogo, default: defaultMenuLogo },
-          auth: { custom: null, default: authLogo },
-        },
-        updateProjectSettings: updateProjectSettingsRef.current,
-        showReleaseNotification,
-        showTutorials,
-      }}
-    >
-      {children}
-    </ConfigurationsContext.Provider>
-  );
-};
-
-ConfigurationsProvider.propTypes = {
-  authLogo: PropTypes.string.isRequired,
-  children: PropTypes.element.isRequired,
-  menuLogo: PropTypes.string.isRequired,
-  showReleaseNotification: PropTypes.bool.isRequired,
-  showTutorials: PropTypes.bool.isRequired,
-};
-
-export default ConfigurationsProvider;

package/admin/src/components/ConfigurationsProvider/reducer.js

@@ -1,28 +0,0 @@
-/* eslint-disable consistent-return */
-/*
- *
- * ConfigurationsProvider reducer
- *
- */
-
-import produce from 'immer';
-
-const initialState = {
-  menuLogo: null,
-};
-
-const reducer = (state = initialState, action) =>
-  produce(state, draftState => {
-    switch (action.type) {
-      case 'UPDATE_PROJECT_SETTINGS': {
-        Object.assign(draftState, action.values);
-        break;
-      }
-      default: {
-        return draftState;
-      }
-    }
-  });
-
-export default reducer;
-export { initialState };

package/admin/src/content-manager/components/DynamicComponentCard/index.js

@@ -1,43 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import Wrapper from './Wrapper';
-
-const DynamicComponentCard = ({ children, componentUid, friendlyName, icon, onClick }) => {
-  return (
-    <Wrapper
-      onClick={e => {
-        e.preventDefault();
-        e.stopPropagation();
-
-        onClick(componentUid);
-      }}
-    >
-      <button className="component-icon" type="button">
-        <FontAwesomeIcon icon={icon} />
-      </button>
-
-      <div className="component-uid">
-        <span>{friendlyName}</span>
-      </div>
-      {children}
-    </Wrapper>
-  );
-};
-
-DynamicComponentCard.defaultProps = {
-  children: null,
-  friendlyName: '',
-  onClick: () => {},
-  icon: 'smile',
-};
-
-DynamicComponentCard.propTypes = {
-  children: PropTypes.node,
-  componentUid: PropTypes.string.isRequired,
-  friendlyName: PropTypes.string,
-  icon: PropTypes.string,
-  onClick: PropTypes.func,
-};
-
-export default DynamicComponentCard;

package/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/components/Form/index.js

@@ -1,85 +0,0 @@
-import React, { useReducer, forwardRef, useImperativeHandle } from 'react';
-import PropTypes from 'prop-types';
-import { useIntl } from 'react-intl';
-import { useTracking } from '@strapi/helper-plugin';
-import { Grid, GridItem } from '@strapi/design-system/Grid';
-import { Box } from '@strapi/design-system/Box';
-import { Typography } from '@strapi/design-system/Typography';
-import LogoInput from '../LogoInput';
-import { useConfigurations } from '../../../../../../hooks';
-import reducer, { initialState } from './reducer';
-import init from './init';
-
-const Form = forwardRef(({ projectSettingsStored }, ref) => {
-  const { formatMessage } = useIntl();
-  const { trackUsage } = useTracking();
-  const {
-    logos: { menu },
-  } = useConfigurations();
-  const [{ menuLogo }, dispatch] = useReducer(reducer, initialState, () =>
-    init(initialState, projectSettingsStored)
-  );
-
-  const handleChangeMenuLogo = asset => {
-    dispatch({
-      type: 'SET_CUSTOM_MENU_LOGO',
-      value: asset,
-    });
-  };
-
-  const handleResetMenuLogo = () => {
-    trackUsage('didClickResetLogo');
-
-    dispatch({
-      type: 'RESET_CUSTOM_MENU_LOGO',
-    });
-  };
-
-  useImperativeHandle(ref, () => ({
-    getValues: () => ({ menuLogo: menuLogo.submit }),
-  }));
-
-  return (
-    <Box
-      hasRadius
-      background="neutral0"
-      shadow="tableShadow"
-      paddingTop={6}
-      paddingBottom={6}
-      paddingRight={7}
-      paddingLeft={7}
-    >
-      <Typography variant="delta" as="h3">
-        {formatMessage({
-          id: 'Settings.application.customization',
-          defaultMessage: 'Customization',
-        })}
-      </Typography>
-      <Grid paddingTop={4}>
-        <GridItem col={6} s={12}>
-          <LogoInput
-            onChangeLogo={handleChangeMenuLogo}
-            customLogo={menuLogo.display}
-            defaultLogo={menu.default}
-            onResetMenuLogo={handleResetMenuLogo}
-          />
-        </GridItem>
-      </Grid>
-    </Box>
-  );
-});
-
-Form.defaultProps = {
-  projectSettingsStored: null,
-};
-
-Form.propTypes = {
-  projectSettingsStored: PropTypes.shape({
-    menuLogo: PropTypes.shape({
-      url: PropTypes.string,
-      name: PropTypes.string,
-    }),
-  }),
-};
-
-export default Form;

package/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/components/Form/init.js

@@ -1,13 +0,0 @@
-import merge from 'lodash/merge';
-
-const init = (initialState, projectSettingsStored) => {
-  const copyInitialState = merge(initialState, {
-    menuLogo: {
-      display: projectSettingsStored.menuLogo,
-    },
-  });
-
-  return copyInitialState;
-};
-
-export default init;

package/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/components/Form/reducer.js

@@ -1,43 +0,0 @@
-/* eslint-disable consistent-return */
-/*
- *
- * ApplicationInfosPage Form reducer
- *
- */
-
-import produce from 'immer';
-
-const initialState = {
-  menuLogo: {
-    display: null,
-    submit: {
-      rawFile: null,
-      isReset: false,
-    },
-  },
-};
-
-const reducer = (state = initialState, action) =>
-  produce(state, draftState => {
-    switch (action.type) {
-      case 'SET_CUSTOM_MENU_LOGO': {
-        draftState.menuLogo.display = action.value;
-        draftState.menuLogo.submit.rawFile = action.value.rawFile;
-        break;
-      }
-      case 'RESET_CUSTOM_MENU_LOGO': {
-        draftState.menuLogo.display = null;
-        draftState.menuLogo.submit = {
-          rawFile: null,
-          isReset: true,
-        };
-        break;
-      }
-      default: {
-        return draftState;
-      }
-    }
-  });
-
-export default reducer;
-export { initialState };

package/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/components/LogoInput/index.js

@@ -1,116 +0,0 @@
-import React, { useReducer } from 'react';
-import { useIntl } from 'react-intl';
-import PropTypes from 'prop-types';
-import { CarouselInput, CarouselSlide, CarouselActions } from '@strapi/design-system/CarouselInput';
-import { IconButton } from '@strapi/design-system/IconButton';
-import { Box } from '@strapi/design-system/Box';
-import Plus from '@strapi/icons/Plus';
-import Refresh from '@strapi/icons/Refresh';
-import reducer, { initialState } from './reducer';
-import LogoModalStepper from '../LogoModalStepper';
-import { SIZE, DIMENSION } from '../../utils/constants';
-import stepper from './stepper';
-
-const LogoInput = ({ customLogo, defaultLogo, onChangeLogo, onResetMenuLogo }) => {
-  const [{ currentStep }, dispatch] = useReducer(reducer, initialState);
-  const { Component, next, prev, modalTitle } = stepper[currentStep] || {};
-  const { formatMessage } = useIntl();
-
-  const goTo = to => {
-    dispatch({
-      type: 'GO_TO',
-      to,
-    });
-  };
-
-  return (
-    <>
-      <CarouselInput
-        label={formatMessage({
-          id: 'Settings.application.customization.carousel.title',
-          defaultMessage: 'Logo',
-        })}
-        selectedSlide={0}
-        hint={formatMessage(
-          {
-            id: 'Settings.application.customization.carousel-hint',
-            defaultMessage:
-              'Change the admin panel logo (Max dimension: {dimension}x{dimension}, Max file size: {size}KB)',
-          },
-          { size: SIZE, dimension: DIMENSION }
-        )}
-        previousLabel=""
-        nextLabel=""
-        onNext={() => {}}
-        onPrevious={() => {}}
-        secondaryLabel={customLogo?.name || 'logo.png'}
-        actions={
-          <CarouselActions>
-            <IconButton
-              onClick={() => goTo(customLogo ? 'pending' : 'upload')}
-              label={formatMessage({
-                id: 'Settings.application.customization.carousel.change-action',
-                defaultMessage: 'Change logo',
-              })}
-              icon={<Plus />}
-            />
-            {customLogo && (
-              <IconButton
-                onClick={onResetMenuLogo}
-                label={formatMessage({
-                  id: 'Settings.application.customization.carousel.reset-action',
-                  defaultMessage: 'Reset logo',
-                })}
-                icon={<Refresh />}
-              />
-            )}
-          </CarouselActions>
-        }
-      >
-        <CarouselSlide
-          label={formatMessage({
-            id: 'Settings.application.customization.carousel-slide.label',
-            defaultMessage: 'Logo slide',
-          })}
-        >
-          <Box
-            maxHeight="40%"
-            maxWidth="40%"
-            as="img"
-            src={customLogo?.url || defaultLogo}
-            alt={formatMessage({
-              id: 'Settings.application.customization.carousel.title',
-              defaultMessage: 'Logo',
-            })}
-          />
-        </CarouselSlide>
-      </CarouselInput>
-      <LogoModalStepper
-        Component={Component}
-        currentStep={currentStep}
-        onChangeLogo={onChangeLogo}
-        customLogo={customLogo}
-        goTo={goTo}
-        next={next}
-        prev={prev}
-        modalTitle={modalTitle}
-      />
-    </>
-  );
-};
-
-LogoInput.defaultProps = {
-  customLogo: null,
-};
-
-LogoInput.propTypes = {
-  customLogo: PropTypes.shape({
-    url: PropTypes.string,
-    name: PropTypes.string,
-  }),
-  defaultLogo: PropTypes.string.isRequired,
-  onChangeLogo: PropTypes.func.isRequired,
-  onResetMenuLogo: PropTypes.func.isRequired,
-};
-
-export default LogoInput;

package/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/components/LogoInput/reducer.js

@@ -1,28 +0,0 @@
-/* eslint-disable consistent-return */
-/*
- *
- * LogoInput reducer
- *
- */
-
-import produce from 'immer';
-
-const initialState = {
-  currentStep: undefined,
-};
-
-const reducer = (state = initialState, action) =>
-  produce(state, draftState => {
-    switch (action.type) {
-      case 'GO_TO': {
-        draftState.currentStep = action.to;
-        break;
-      }
-      default: {
-        return draftState;
-      }
-    }
-  });
-
-export default reducer;
-export { initialState };

package/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/components/LogoInput/stepper.js

@@ -1,25 +0,0 @@
-import AddLogoDialog from '../LogoModalStepper/AddLogoDialog';
-import PendingLogoDialog from '../LogoModalStepper/PendingLogoDialog';
-
-const stepper = {
-  upload: {
-    Component: AddLogoDialog,
-    modalTitle: {
-      id: 'Settings.application.customization.modal.upload',
-      defaultMessage: 'Upload logo',
-    },
-    next: 'pending',
-    prev: null,
-  },
-  pending: {
-    Component: PendingLogoDialog,
-    modalTitle: {
-      id: 'Settings.application.customization.modal.pending',
-      defaultMessage: 'Pending logo',
-    },
-    next: null,
-    prev: 'upload',
-  },
-};
-
-export default stepper;