@strapi/admin 4.2.0-beta.2 → 4.2.0

package/scripts/build.js

@@ -3,11 +3,7 @@
 const path = require('path');
 const webpack = require('webpack');
 const { isObject } = require('lodash');
-// eslint-disable-next-line node/no-extraneous-require
-const SpeedMeasurePlugin = require('speed-measure-webpack-plugin');
-
 const webpackConfig = require('../webpack.config');
-const getPluginsPath = require('../utils/get-plugins-path');
 const {
   getCorePluginsPath,
   getPluginToInstallPath,
@@ -16,39 +12,29 @@ const {
 
 const PLUGINS_TO_INSTALL = ['i18n', 'users-permissions'];
 
-// Wrapper that outputs the webpack speed
-const smp = new SpeedMeasurePlugin();
-
 const buildAdmin = async () => {
   const entry = path.join(__dirname, '..', 'admin', 'src');
   const dest = path.join(__dirname, '..', 'build');
-  const tsConfigFilePath = path.join(__dirname, '..', 'admin', 'src', 'tsconfig.json');
-
   const corePlugins = getCorePluginsPath();
   const plugins = getPluginToInstallPath(PLUGINS_TO_INSTALL);
   const allPlugins = { ...corePlugins, ...plugins };
-  const pluginsPath = getPluginsPath();
 
   await createPluginsFile(allPlugins);
 
   const args = {
     entry,
     dest,
-    cacheDir: path.join(__dirname, '..'),
-    pluginsPath,
+    cacheDir: path.resolve(__dirname, '..'),
+    pluginsPath: [path.resolve(__dirname, '../../../../packages')],
     env: 'production',
     optimize: true,
     options: {
       backend: 'http://localhost:1337',
       adminPath: '/admin/',
     },
-    tsConfigFilePath,
   };
 
-  const config =
-    process.env.MESURE_BUILD_SPEED === 'true' ? smp.wrap(webpackConfig(args)) : webpackConfig(args);
-
-  const compiler = webpack(config);
+  const compiler = webpack(webpackConfig(args));
 
   console.log('Building the admin panel');
 

package/server/config/admin-actions.js

@@ -146,5 +146,19 @@ 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

@@ -5,10 +5,14 @@ const execa = require('execa');
 const _ = require('lodash');
 const { exists } = require('fs-extra');
 const { ValidationError } = require('@strapi/utils').errors;
-const { isUsingTypeScript } = require('@strapi/typescript-utils');
 // 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-_]+$/;
@@ -40,6 +44,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();
     // set to null if telemetryDisabled flag not avaialble in package.json
     const telemetryDisabled = strapi.config.get('packageJsonStrapi.telemetryDisabled', null);
 
@@ -47,23 +52,35 @@ module.exports = {
       uuid = false;
     }
 
-    return { data: { uuid, hasAdmin } };
-  },
-
-  async telemetryProperties() {
-    const useTypescriptOnServer = await isUsingTypeScript(strapi.dirs.app.root);
-    const useTypescriptOnAdmin = await isUsingTypeScript(
-      path.join(strapi.dirs.app.root, 'src', 'admin')
-    );
-
     return {
       data: {
-        useTypescriptOnServer,
-        useTypescriptOnAdmin,
+        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 });
+  },
+
   async information() {
     const currentEnvironment = strapi.config.get('environment');
     const autoReload = strapi.config.get('autoReload', false);

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/policies/index.js

@@ -3,5 +3,4 @@
 module.exports = {
   isAuthenticatedAdmin: require('./isAuthenticatedAdmin'),
   hasPermissions: require('./hasPermissions'),
-  isTelemetryEnabled: require('./isTelemetryEnabled'),
 };

package/server/routes/admin.js

@@ -7,6 +7,34 @@ 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',
@@ -21,15 +49,6 @@ module.exports = [
       policies: ['admin::isAuthenticatedAdmin'],
     },
   },
-  {
-    method: 'GET',
-    path: '/telemetry-properties',
-    handler: 'admin.telemetryProperties',
-    config: {
-      auth: false,
-      policies: ['admin::isTelemetryEnabled'],
-    },
-  },
   {
     method: 'GET',
     path: '/plugins',

package/server/routes/serve-admin-panel.js

@@ -5,7 +5,7 @@ const fse = require('fs-extra');
 const koaStatic = require('koa-static');
 
 const registerAdminPanelRoute = ({ strapi }) => {
-  let buildDir = resolve(strapi.dirs.dist.root, 'build');
+  let buildDir = resolve(strapi.dirs.root, 'build');
 
   if (!fse.pathExistsSync(buildDir)) {
     buildDir = resolve(__dirname, '../../build');

package/server/services/index.js

@@ -13,4 +13,5 @@ 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/project-settings.js

@@ -0,0 +1,173 @@
+'use strict';
+
+const fs = require('fs');
+const { pick } = require('lodash');
+
+const PROJECT_SETTINGS_FILE_INPUTS = ['menuLogo'];
+const DEFAULT_PROJECT_SETTINGS = {
+  menuLogo: null,
+};
+
+const parseFilesData = async files => {
+  const formatedFilesData = {};
+
+  await Promise.all(
+    PROJECT_SETTINGS_FILE_INPUTS.map(async inputName => {
+      const file = files[inputName];
+
+      // Skip empty file inputs
+      if (!file) {
+        return;
+      }
+
+      const getStream = () => fs.createReadStream(file.path);
+
+      // Add formated data for the upload provider
+      formatedFilesData[inputName] = strapi
+        .plugin('upload')
+        .service('upload')
+        .formatFileInfo({
+          filename: file.name,
+          type: file.type,
+          size: file.size,
+        });
+
+      // Add image dimensions
+      Object.assign(
+        formatedFilesData[inputName],
+        await strapi
+          .plugin('upload')
+          .service('image-manipulation')
+          .getDimensions({ getStream })
+      );
+
+      // Add file path, and stream
+      Object.assign(formatedFilesData[inputName], {
+        stream: getStream(),
+        tmpPath: file.path,
+        provider: strapi.config.get('plugin.upload').provider,
+      });
+    })
+  );
+
+  return formatedFilesData;
+};
+
+const getProjectSettings = async () => {
+  const store = strapi.store({ type: 'core', name: 'admin' });
+  const projectSettings = {
+    ...DEFAULT_PROJECT_SETTINGS,
+    ...(await store.get({ key: 'project-settings' })),
+  };
+
+  // Filter file input fields
+  PROJECT_SETTINGS_FILE_INPUTS.forEach(inputName => {
+    if (!projectSettings[inputName]) {
+      return;
+    }
+
+    projectSettings[inputName] = pick(projectSettings[inputName], [
+      'name',
+      'url',
+      'width',
+      'height',
+      'ext',
+      'size',
+    ]);
+  });
+
+  return projectSettings;
+};
+
+const uploadFiles = async (files = {}) => {
+  // Call the provider upload function for each file
+  return Promise.all(
+    Object.values(files)
+      .filter(file => file.stream instanceof fs.ReadStream)
+      .map(file => strapi.plugin('upload').provider.uploadStream(file))
+  );
+};
+
+const deleteOldFiles = async ({ previousSettings, newSettings }) => {
+  return Promise.all(
+    PROJECT_SETTINGS_FILE_INPUTS.map(async inputName => {
+      // Skip if the store doesn't contain project settings
+      if (!previousSettings) {
+        return;
+      }
+
+      // Skip if there was no previous file
+      if (!previousSettings[inputName]) {
+        return;
+      }
+
+      // Skip if the file was not changed
+      if (
+        newSettings[inputName] &&
+        previousSettings[inputName].hash === newSettings[inputName].hash
+      ) {
+        return;
+      }
+
+      // Skip if the file was not uploaded with the current provider
+      if (strapi.config.get('plugin.upload').provider !== previousSettings[inputName].provider) {
+        return;
+      }
+
+      // There was a previous file and an new file was uploaded
+      // Remove the previous file
+      strapi.plugin('upload').provider.delete(previousSettings[inputName]);
+    })
+  );
+};
+
+const updateProjectSettings = async newSettings => {
+  const store = strapi.store({ type: 'core', name: 'admin' });
+  const previousSettings = await store.get({ key: 'project-settings' });
+  const files = pick(newSettings, PROJECT_SETTINGS_FILE_INPUTS);
+
+  await uploadFiles(files);
+
+  PROJECT_SETTINGS_FILE_INPUTS.forEach(inputName => {
+    // If the user input exists but is not a formdata "file" remove it
+    if (newSettings[inputName] !== undefined && !(typeof newSettings[inputName] === 'object')) {
+      newSettings[inputName] = null;
+      return;
+    }
+
+    // If the user input is undefined reuse previous setting (do not update field)
+    if (!newSettings[inputName]) {
+      newSettings[inputName] = previousSettings[inputName];
+      return;
+    }
+
+    // Update the file
+    newSettings[inputName] = pick(newSettings[inputName], [
+      'name',
+      'hash',
+      'url',
+      'width',
+      'height',
+      'ext',
+      'size',
+      'provider',
+    ]);
+  });
+
+  // No await to proceed asynchronously
+  deleteOldFiles({ previousSettings, newSettings });
+
+  await store.set({
+    key: 'project-settings',
+    value: { ...previousSettings, ...newSettings },
+  });
+
+  return getProjectSettings();
+};
+
+module.exports = {
+  deleteOldFiles,
+  parseFilesData,
+  getProjectSettings,
+  updateProjectSettings,
+};

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,6 +6,7 @@ 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;
@@ -16,6 +17,7 @@ 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/server/validation/project-settings.js

@@ -0,0 +1,39 @@
+'use strict';
+
+const { yup, validateYupSchemaSync } = require('@strapi/utils');
+
+const MAX_IMAGE_WIDTH = 750;
+const MAX_IMAGE_HEIGHT = MAX_IMAGE_WIDTH;
+const MAX_IMAGE_FILE_SIZE = 1024 * 1024; // 1Mo
+const ALLOWED_IMAGE_FILE_TYPES = ['image/jpeg', 'image/png', 'image/svg+xml'];
+
+const updateProjectSettings = yup
+  .object({
+    menuLogo: yup.string(),
+  })
+  .noUnknown();
+
+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),
+    }),
+  })
+  .noUnknown();
+
+const updateProjectSettingsImagesDimensions = yup.object({
+  menuLogo: yup.object({
+    width: yup.number().max(MAX_IMAGE_WIDTH),
+    height: yup.number().max(MAX_IMAGE_HEIGHT),
+  }),
+});
+
+module.exports = {
+  validateUpdateProjectSettings: validateYupSchemaSync(updateProjectSettings),
+  validateUpdateProjectSettingsFiles: validateYupSchemaSync(updateProjectSettingsFiles),
+  validateUpdateProjectSettingsImagesDimensions: validateYupSchemaSync(
+    updateProjectSettingsImagesDimensions
+  ),
+};

package/webpack.config.js

@@ -4,7 +4,6 @@ const path = require('path');
 const fse = require('fs-extra');
 const webpack = require('webpack');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
-const ForkTsCheckerPlugin = require('fork-ts-checker-webpack-plugin');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 const { ESBuildMinifyPlugin } = require('esbuild-loader');
 const WebpackBar = require('webpackbar');
@@ -15,12 +14,12 @@ const getClientEnvironment = require('./env');
 const EE_REGEX = /from.* ['"]ee_else_ce\//;
 
 module.exports = ({
+  entry,
   cacheDir,
+  pluginsPath,
   dest,
-  entry,
   env,
   optimize,
-  pluginsPath,
   options = {
     backend: 'http://localhost:1337',
     adminPath: '/admin/',
@@ -30,7 +29,6 @@ module.exports = ({
     eeRoot: './ee/admin',
     ceRoot: './admin/src',
   },
-  tsConfigFilePath,
 }) => {
   const isProduction = env === 'production';
 
@@ -51,9 +49,6 @@ module.exports = ({
       ]
     : [];
 
-  // Directly inject a polyfill in the webpack entry point before the entry point
-  // FIXME: I have noticed a bug regarding the helper-plugin and esbuild-loader
-  // The only I could fix it was to inject the babel polyfill
   const babelPolyfill = '@babel/polyfill/dist/polyfill.min.js';
 
   return {
@@ -84,16 +79,6 @@ module.exports = ({
     },
     module: {
       rules: [
-        {
-          test: /\.tsx?$/,
-          loader: require.resolve('esbuild-loader'),
-          include: [cacheDir, ...pluginsPath],
-          exclude: /node_modules/,
-          options: {
-            loader: 'tsx',
-            target: 'es2015',
-          },
-        },
         {
           test: /\.m?jsx?$/,
           include: cacheDir,
@@ -109,10 +94,6 @@ module.exports = ({
                 try {
                   const fileContent = fse.readFileSync(filePath).toString();
 
-                  if (fileContent.match(/from.* ['"]ee_else_ce\//)) {
-                    return true;
-                  }
-
                   return EE_REGEX.test(fileContent);
                 } catch (e) {
                   return false;
@@ -209,7 +190,7 @@ module.exports = ({
     resolve: {
       alias,
       symlinks: false,
-      extensions: ['.js', '.jsx', '.react.js', '.ts', '.tsx'],
+      extensions: ['.js', '.jsx', '.react.js'],
       mainFields: ['browser', 'jsnext:main', 'main'],
       modules: ['node_modules', path.resolve(__dirname, 'node_modules')],
     },
@@ -217,16 +198,12 @@ module.exports = ({
       new HtmlWebpackPlugin({
         inject: true,
         template: path.resolve(__dirname, 'index.html'),
+        // FIXME
+        // favicon: path.resolve(__dirname, 'admin/src/favicon.ico'),
       }),
       new webpack.DefinePlugin(envVariables),
 
       new NodePolyfillPlugin(),
-
-      new ForkTsCheckerPlugin({
-        typescript: {
-          configFile: tsConfigFilePath,
-        },
-      }),
       ...webpackPlugins,
     ],
   };

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/App/constants.js

@@ -1 +0,0 @@
-export const SET_APP_RUNTIME_STATUS = 'StrapiAdmin/APP/SET_APP_RUNTIME_STATUS';

package/admin/src/tsconfig.json

@@ -1,10 +0,0 @@
-{
-  "extends": "@strapi/typescript-utils/lib/configs/admin",
-
-  "include": [
-    "./",
-    "../../../**/admin/src/**/*",
-    "../../../../plugins/documentation/admin/src/**/*"
-  ],
-  "exclude": ["node_modules", "**/*.test.js", "*.js"]
-}