@strapi/admin 4.0.0-beta.12 → 4.0.0-beta.16

package/scripts/build.js

@@ -3,16 +3,28 @@
 const path = require('path');
 const webpack = require('webpack');
 const webpackConfig = require('../webpack.config');
+const {
+  getCorePluginsPath,
+  getPluginToInstallPath,
+  createPluginsFile,
+} = require('./create-plugins-file');
+
+const PLUGINS_TO_INSTALL = ['i18n', 'users-permissions'];
 
 const buildAdmin = async () => {
   const entry = path.join(__dirname, '..', 'admin', 'src');
   const dest = path.join(__dirname, '..', 'build');
+  const corePlugins = getCorePluginsPath();
+  const plugins = getPluginToInstallPath(PLUGINS_TO_INSTALL);
+  const allPlugins = { ...corePlugins, ...plugins };
+
+  await createPluginsFile(allPlugins);
 
   const args = {
     entry,
     dest,
     cacheDir: __dirname,
-    pluginsPath: [path.resolve(__dirname, '../../../..')],
+    pluginsPath: [path.resolve(__dirname, '../../../../packages')],
     env: 'production',
     optimize: true,
     options: {

package/scripts/create-dev-plugins-file.js

@@ -0,0 +1,69 @@
+'use strict';
+
+const { join, resolve, relative } = require('path');
+const { promisify } = require('util');
+// eslint-disable-next-line node/no-extraneous-require
+const glob = promisify(require('glob').glob);
+const fs = require('fs-extra');
+const { getCorePluginsPath, createPluginsFile } = require('./create-plugins-file');
+
+/**
+ * Retrieve all plugins that are inside the plugins folder
+ * @returns Object the plugins
+ */
+const getPluginsPackages = async () => {
+  const pathToPackages = resolve(__dirname, '..', '..', '..', 'plugins', '*');
+  const pluginsPackageDirs = await glob(pathToPackages);
+
+  return pluginsPackageDirs
+    .filter(pluginDir => {
+      return fs.existsSync(join(pluginDir, 'admin', 'src', 'index.js'));
+    })
+    .reduce((acc, current) => {
+      const depName = current
+        .replace(/\\/g, '/')
+        .split('/')
+        .slice(-1)[0];
+
+      const adminEntryPoint = join(__dirname, '..', 'admin', 'src');
+
+      const pathToPlugin = join(relative(adminEntryPoint, current), 'admin', 'src').replace(
+        /\\/g,
+        '/'
+      );
+
+      acc[depName] = pathToPlugin;
+
+      return acc;
+    }, {});
+};
+
+/**
+ * Write the plugins.js file or copy the plugins-dev.js file if it exists
+ */
+const createFile = async () => {
+  const customPluginFile = join(__dirname, '..', 'admin', 'src', 'plugins-dev.js');
+  const pluginFileDest = join(__dirname, '..', 'admin', 'src', 'plugins.js');
+
+  if (fs.existsSync(customPluginFile)) {
+    await fs.copy(customPluginFile, pluginFileDest);
+
+    return;
+  }
+
+  const corePlugins = getCorePluginsPath();
+  const plugins = await getPluginsPackages();
+  const allPlugins = { ...corePlugins, ...plugins };
+
+  return createPluginsFile(allPlugins);
+};
+
+createFile()
+  .then(() => {
+    console.log('plugins.js file created');
+    process.exit();
+  })
+  .catch(err => {
+    console.error(err);
+    process.exit(1);
+  });

package/scripts/create-plugins-file.js

@@ -0,0 +1,92 @@
+'use strict';
+
+const { join, resolve, relative } = require('path');
+const { camelCase } = require('lodash');
+const fs = require('fs-extra');
+
+const CORE_PLUGINS = ['content-type-builder', 'email', 'upload'];
+
+/**
+ * Retrieve the core plugins path
+ * @returns {Object}
+ */
+const getCorePluginsPath = () => {
+  const corePlugins = {};
+
+  for (const dep of CORE_PLUGINS) {
+    const packageAdminPath = join(__dirname, '..', '..', dep, 'admin', 'src');
+
+    const adminEntryPoint = resolve(join(__dirname, '..', 'admin', 'src'));
+    const pathToPlugin = join(relative(adminEntryPoint, packageAdminPath)).replace(/\\/g, '/');
+
+    corePlugins[dep] = pathToPlugin;
+  }
+
+  return corePlugins;
+};
+
+/**
+ * Retrieve the plugins real path
+ * @param {Object[]} pluginsToInstall array of plugins located in the plugins folder
+ * @returns Object of plugin's paths
+ */
+const getPluginToInstallPath = pluginsToInstall => {
+  const plugins = {};
+
+  for (const dep of pluginsToInstall) {
+    const packageAdminPath = join(__dirname, '..', '..', '..', 'plugins', dep, 'admin', 'src');
+
+    const adminEntryPoint = resolve(join(__dirname, '..', 'admin', 'src'));
+    const pathToPlugin = join(relative(adminEntryPoint, packageAdminPath)).replace(/\\/g, '/');
+
+    plugins[dep] = pathToPlugin;
+  }
+
+  return plugins;
+};
+
+/**
+ * Write the plugins.js file
+ * @param {Object} plugins
+ */
+const createPluginsFile = async plugins => {
+  const pluginFileDest = resolve(__dirname, '..', 'admin', 'src', 'plugins.js');
+
+  const allPluginsArray = Object.entries(plugins).map(([plugin, pluginPath]) => {
+    return {
+      shortName: camelCase(plugin),
+      name: plugin,
+      pluginPath,
+    };
+  });
+
+  const content = `
+// To override this file create a plugins-dev.js one and copy the content of the plugin.js one.
+// When starting the app the script will copy the plugins-dev.js into this one instead.
+${allPluginsArray
+  .map(({ shortName, pluginPath }) => {
+    const req = `'${pluginPath}'`;
+
+    return `import ${shortName} from ${req};`;
+  })
+  .join('\n')}
+
+const plugins = {
+${[...allPluginsArray]
+  .map(({ name, shortName }) => {
+    return `  '${name}': ${shortName},`;
+  })
+  .join('\n')}
+};
+  
+export default plugins;
+`;
+
+  return fs.writeFile(pluginFileDest, content);
+};
+
+module.exports = {
+  createPluginsFile,
+  getCorePluginsPath,
+  getPluginToInstallPath,
+};

package/server/controllers/admin.js

@@ -76,8 +76,14 @@ module.exports = {
   },
 
   async plugins(ctx) {
-    // TODO: use name from plugin package.json info
-    const plugins = _.mapValues(strapi.plugins, (_, key) => ({ name: key }));
+    const enabledPlugins = strapi.config.get('enabledPlugins');
+
+    const plugins = Object.entries(enabledPlugins).map(([key, plugin]) => ({
+      name: plugin.info.name || key,
+      displayName: plugin.info.displayName || plugin.info.name || key,
+      description: plugin.info.description || '',
+    }));
+
     ctx.send({ plugins });
   },
 

package/server/services/content-type.js

@@ -35,11 +35,11 @@ const getNestedFields = (
       if (nonAuthorizableFields.includes(key)) return fields;
 
       const fieldPath = prefix ? `${prefix}.${key}` : key;
-      const requiredOrNotNeeded = !requiredOnly || attr.required === true;
+      const shouldBeIncluded = !requiredOnly || attr.required === true;
       const insideExistingFields = existingFields && existingFields.some(startsWith(fieldPath));
 
       if (attr.type === 'component') {
-        if (requiredOrNotNeeded || insideExistingFields) {
+        if (shouldBeIncluded || insideExistingFields) {
           const compoFields = getNestedFields(components[attr.component], {
             nestingLevel: nestingLevel - 1,
             prefix: fieldPath,
@@ -48,7 +48,7 @@ const getNestedFields = (
             existingFields,
           });
 
-          if (requiredOnly && compoFields.length === 0 && attr.required) {
+          if (compoFields.length === 0 && shouldBeIncluded) {
             return fields.concat(fieldPath);
           }
 
@@ -57,7 +57,7 @@ const getNestedFields = (
         return fields;
       }
 
-      if (requiredOrNotNeeded) {
+      if (shouldBeIncluded) {
         return fields.concat(fieldPath);
       }
 

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

@@ -13,9 +13,10 @@ const {
   prop,
   uniq,
   intersection,
+  pick,
 } = require('lodash/fp');
 
-const { contentTypes, traverseEntity, sanitize } = require('@strapi/utils');
+const { contentTypes, traverseEntity, sanitize, pipeAsync } = require('@strapi/utils');
 
 const {
   constants,
@@ -37,20 +38,20 @@ const STATIC_FIELDS = [ID_ATTRIBUTE];
 module.exports = ({ action, ability, model }) => {
   const schema = strapi.getModel(model);
 
-  const { allowedFields, removePassword } = sanitize.visitors;
+  const { allowedFields } = sanitize.visitors;
 
   const createSanitizeOutput = (options = {}) => {
     const { fields } = options;
 
     const permittedFields = fields.shouldIncludeAll ? null : getOutputFields(fields.permitted);
 
-    return sanitize.utils.pipeAsync(
-      // Remove roles from createdBy & updateBy fields
-      omitCreatorRoles,
+    return pipeAsync(
+      // Remove unallowed fields from admin::user relations
+      traverseEntity(pickAllowedAdminUserFields, { schema }),
       // Remove not allowed fields (RBAC)
       traverseEntity(allowedFields(permittedFields), { schema }),
       // Remove all fields of type 'password'
-      traverseEntity(removePassword, { schema })
+      sanitize.sanitizers.sanitizePasswords(schema)
     );
   };
 
@@ -59,7 +60,7 @@ module.exports = ({ action, ability, model }) => {
 
     const permittedFields = fields.shouldIncludeAll ? null : getInputFields(fields.permitted);
 
-    return sanitize.utils.pipeAsync(
+    return pipeAsync(
       // Remove not allowed fields (RBAC)
       traverseEntity(allowedFields(permittedFields), { schema }),
       // Remove roles from createdBy & updateBy fields
@@ -106,6 +107,12 @@ module.exports = ({ action, ability, model }) => {
 
   const omitCreatorRoles = omit([`${CREATED_BY_ATTRIBUTE}.roles`, `${UPDATED_BY_ATTRIBUTE}.roles`]);
 
+  const pickAllowedAdminUserFields = ({ attribute, key, value }, { set }) => {
+    if (attribute.type === 'relation' && attribute.target === 'admin::user') {
+      set(key, pick(['id', 'firstname', 'lastname', 'username'], value));
+    }
+  };
+
   const getInputFields = (fields = []) => {
     const nonVisibleAttributes = getNonVisibleAttributes(schema);
     const writableAttributes = getWritableAttributes(schema);

package/server/services/user.js

@@ -180,6 +180,19 @@ const findOne = async (id, populate = ['roles']) => {
   return strapi.entityService.findOne('admin::user', id, { populate });
 };
 
+/**
+ * Find one user by its email
+ * @param {string} id  email
+ * @param {string || string[] || object} populate
+ * @returns
+ */
+const findOneByEmail = async (email, populate = []) => {
+  return strapi.query('admin::user').findOne({
+    where: { email },
+    populate,
+  });
+};
+
 /** Find many users (paginated)
  * @param query
  * @returns {Promise<user>}
@@ -309,6 +322,7 @@ module.exports = {
   register,
   sanitizeUser,
   findOne,
+  findOneByEmail,
   findPage,
   deleteById,
   deleteByIds,

package/server/strategies/api-token.js

@@ -6,22 +6,32 @@ const { getService } = require('../utils');
 
 const isReadScope = scope => scope.endsWith('find') || scope.endsWith('findOne');
 
-/** @type {import('.').AuthenticateFunction} */
-const authenticate = async ctx => {
-  const apiTokenService = getService('api-token');
-  const { authorization } = ctx.request.header;
+const extractToken = ctx => {
+  if (ctx.request && ctx.request.header && ctx.request.header.authorization) {
+    const parts = ctx.request.header.authorization.split(/\s+/);
 
-  if (!authorization) {
-    return { authenticated: false };
+    if (parts[0].toLowerCase() !== 'bearer' || parts.length !== 2) {
+      return null;
+    }
+
+    return parts[1];
+  }
+  if (ctx.query.access_token) {
+    return ctx.query.access_token;
   }
 
-  const parts = authorization.split(/\s+/);
+  return null;
+};
+
+/** @type {import('.').AuthenticateFunction} */
+const authenticate = async ctx => {
+  const apiTokenService = getService('api-token');
+  const token = extractToken(ctx);
 
-  if (parts[0].toLowerCase() !== 'bearer' || parts.length !== 2) {
+  if (!token) {
     return { authenticated: false };
   }
 
-  const token = parts[1];
   const apiToken = await apiTokenService.getBy({
     accessKey: apiTokenService.hash(token),
   });

package/server/validation/authentication/register.js

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

package/server/validation/common-validators.js

@@ -21,7 +21,7 @@ const email = yup
 
 const firstname = yup.string().min(1);
 
-const lastname = yup.string().min(1);
+const lastname = yup.string();
 
 const username = yup.string().min(1);
 

package/server/validation/user.js

@@ -9,7 +9,7 @@ const userCreationSchema = yup
   .shape({
     email: validators.email.required(),
     firstname: validators.firstname.required(),
-    lastname: validators.lastname.required(),
+    lastname: validators.lastname,
     roles: validators.roles.min(1),
     preferedLanguage: yup.string().nullable(),
   })
@@ -20,7 +20,7 @@ const profileUpdateSchema = yup
   .shape({
     email: validators.email.notNull(),
     firstname: validators.firstname.notNull(),
-    lastname: validators.lastname.notNull(),
+    lastname: validators.lastname.nullable(),
     username: validators.username.nullable(),
     password: validators.password.notNull(),
     currentPassword: yup
@@ -36,7 +36,7 @@ const userUpdateSchema = yup
   .shape({
     email: validators.email.notNull(),
     firstname: validators.firstname.notNull(),
-    lastname: validators.lastname.notNull(),
+    lastname: validators.lastname.nullable(),
     username: validators.username.nullable(),
     password: validators.password.notNull(),
     isActive: yup.bool().notNull(),

package/webpack.alias.js

@@ -7,12 +7,6 @@ const alias = [
   'whatwg-fetch',
   '@fortawesome/fontawesome-svg-core',
   '@fortawesome/free-solid-svg-icons',
-  '@buffetjs/core',
-  '@buffetjs/custom',
-  '@buffetjs/custom',
-  '@buffetjs/utils',
-  '@buffetjs/icons',
-  '@buffetjs/hooks',
   'classnames',
   'history',
   'hoist-non-react-statics',

package/admin/src/content-manager/components/DraggedField/Close/index.js

@@ -1,10 +0,0 @@
-import styled from 'styled-components';
-import { Remove } from '@buffetjs/icons';
-
-const Close = styled(Remove)`
-  > path {
-    fill: #b4b6ba;
-  }
-`;
-
-export default Close;

package/admin/src/content-manager/components/DraggedField/GrabWrapper.js

@@ -1,38 +0,0 @@
-/* eslint-disable */
-
-import styled, { css } from 'styled-components';
-import getColor from './utils/getColor';
-
-const GrabWrapper = styled.div`
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  position: absolute;
-  top: 0px;
-  bottom: 0px;
-  left: 0;
-  padding-left: 10px;
-  border-right: 1px solid
-    ${({ isOverEditBlock, isOverRemove, isSelected }) =>
-      getColor(isOverRemove, isSelected, isOverEditBlock)};
-  cursor: move;
-  z-index: 99;
-
-  ${({ isOverRemove }) =>
-    isOverRemove &&
-    css`
-      g {
-        fill: #ffa784;
-      }
-    `}
-
-  ${({ isSelected, isOverEditBlock }) =>
-    (isSelected || isOverEditBlock) &&
-    css`
-      g {
-        fill: #aed4fb;
-      }
-    `}
-`;
-
-export default GrabWrapper;

package/admin/src/content-manager/components/DraggedField/Link.js

@@ -1,17 +0,0 @@
-import styled from 'styled-components';
-
-const Link = styled.div`
-  position: absolute;
-  bottom: 4px;
-  left: 38px;
-  font-weight: 400;
-  color: #007eff;
-  cursor: pointer;
-  font-size: 13px;
-  svg {
-    margin-right: 7px;
-    font-size: 11px;
-  }
-`;
-
-export default Link;

package/admin/src/content-manager/components/DraggedField/NameWrapper.js

@@ -1,29 +0,0 @@
-import styled from 'styled-components';
-
-/* eslint-disable indent */
-const NameWrapper = styled.div`
-  position: relative;
-  line-height: 26px;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  cursor: pointer;
-
-  ${({ isOverEditBlock, isOverRemove, isSelected }) => {
-    if (isOverRemove) {
-      return `
-        color: #f64d0a;
-      `;
-    }
-
-    if (isSelected || isOverEditBlock) {
-      return `
-        color: #007eff;
-    `;
-    }
-
-    return '';
-  }}
-`;
-
-export default NameWrapper;

package/admin/src/content-manager/components/DraggedField/RemoveWrapper.js

@@ -1,32 +0,0 @@
-import styled from 'styled-components';
-import getColor from './utils/getColor';
-
-/* eslint-disable indent */
-const RemoveWrapper = styled.div`
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  position: absolute;
-  top: 0px;
-  bottom: 0px;
-  right: 0;
-  width: 30px;
-  text-align: center;
-  background-color: ${({ isOverEditBlock, isOverRemove, isSelected }) => {
-    return getColor(isOverRemove, isSelected, isOverEditBlock);
-  }};
-  cursor: pointer;
-  svg {
-    align-self: center;
-    color: #b4b6ba;
-  }
-  ${({ isOverRemove }) =>
-    isOverRemove &&
-    `
-    path {
-      fill: #f64d0a;
-    }
-  `};
-`;
-
-export default RemoveWrapper;

package/admin/src/content-manager/components/DraggedField/SubWrapper.js

@@ -1,36 +0,0 @@
-/* eslint-disable */
-
-import styled from 'styled-components';
-import getColor from './utils/getColor';
-import getHeight from './utils/getHeight';
-
-const SubWrapper = styled.div`
-  position: relative;
-  min-height: ${({ withLongerHeight }) => getHeight(withLongerHeight)};
-  ${({ withLongerHeight }) => {
-    if (!withLongerHeight) {
-      return `
-        height: 30px;
-    `;
-    }
-  }};
-
-  line-height: ${({ withLongerHeight }) => getHeight(withLongerHeight)};
-  cursor: pointer;
-
-  background: ${({ isOverEditBlock, isOverRemove, isSelected }) => {
-    if (isOverRemove) {
-      return '#ffe9e0';
-    } else if (isSelected || isOverEditBlock) {
-      return '#e6f0fb';
-    } else {
-      return '#fafafb';
-    }
-  }};
-  border: 1px solid
-    ${({ isOverEditBlock, isOverRemove, isSelected }) =>
-      getColor(isOverRemove, isSelected, isOverEditBlock)};
-  border-radius: 2px;
-`;
-
-export default SubWrapper;