npm - @strapi/admin - Versions diffs - 4.0.0-next.12 → 4.0.0-next.16 - Mend

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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (985) hide show

package/ee/admin/pages/SettingsPage/pages/Users/ListPage/ModalForm/utils/formDataModel.js ADDED Viewed

@@ -0,0 +1,14 @@
+import baseModel from '../../../../../../../../../admin/src/pages/SettingsPage/pages/Users/ListPage/ModalForm/utils/formDataModel';
+const ssoInputsModel = strapi.features.isEnabled(strapi.features.SSO)
+  ? {
+      useSSORegistration: true,
+    }
+  : {};
+const formDataModel = {
+  ...baseModel,
+  ...ssoInputsModel,
+};
+export default formDataModel;

package/ee/admin/pages/SettingsPage/pages/Users/ListPage/ModalForm/utils/roleSettingsForm.js ADDED Viewed

@@ -0,0 +1,24 @@
+const form = strapi.features.isEnabled(strapi.features.SSO)
+  ? [
+      [
+        {
+          intlLabel: {
+            id: 'Settings.permissions.users.form.sso',
+            defaultMessage: 'Connect with SSO',
+          },
+          hint: {
+            id: 'Settings.permissions.users.form.sso.description',
+            defaultMessage: 'When enabled (ON), users can login via SSO',
+          },
+          name: 'useSSORegistration',
+          type: 'bool',
+          size: {
+            col: 6,
+            xs: 12,
+          },
+        },
+      ],
+    ]
+  : [];
+export default form;

package/ee/admin/pages/SettingsPage/pages/Users/components/MagicLink/index.js ADDED Viewed

@@ -0,0 +1,43 @@
+import React from 'react';
+import { useIntl } from 'react-intl';
+import PropTypes from 'prop-types';
+import basename from '../../../../../../../../admin/src/core/utils/basename';
+import MagicLinkWrapper from '../../../../../../../../admin/src/pages/SettingsPage/pages/Users/components/MagicLink/MagicLinkWrapper';
+// FIXME replace with parts compo when ready
+const MagicLink = ({ registrationToken }) => {
+  const { formatMessage } = useIntl();
+  if (registrationToken) {
+    return (
+      <MagicLinkWrapper
+        target={`${window.location.origin}${basename}auth/register?registrationToken=${registrationToken}`}
+      >
+        {formatMessage({
+          id: 'app.components.Users.MagicLink.connect',
+          defaultMessage: 'Send this link to the user for them to connect.',
+        })}
+      </MagicLinkWrapper>
+    );
+  }
+  return (
+    <MagicLinkWrapper target={`${window.location.origin}${basename}auth/register`}>
+      {formatMessage({
+        id: 'app.components.Users.MagicLink.connect.sso',
+        defaultMessage:
+          'Send this link to the user, the first login can be made via a SSO provider.',
+      })}
+    </MagicLinkWrapper>
+  );
+};
+MagicLink.defaultProps = {
+  registrationToken: '',
+};
+MagicLink.propTypes = {
+  registrationToken: PropTypes.string,
+};
+export default MagicLink;

package/index.html CHANGED Viewed

@@ -1,16 +1,16 @@
-<!doctype html>
+<!DOCTYPE html>
 <html lang="en">
-<head>
-  <!-- The first thing in any HTML file should be the charset -->
-  <meta charset="utf-8">
-  <!-- Make the page mobile compatible -->
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <meta name="mobile-web-app-capable" content="yes">
-  <title>Strapi Admin</title>
-</head>
-<body>
-<!-- The app hooks into this div -->
-<div id="app"></div>
-<!-- A lot of magic happens in this file. HtmlWebpackPlugin automatically includes all assets (e.g. bundle.js, main.css) with the correct HTML tags, which is why they are missing in this HTML file. Don't add any assets here! (Check out webpackconfig.js if you want to know more) -->
-</body>
+  <head>
+    <!-- The first thing in any HTML file should be the charset -->
+    <meta charset="utf-8" />
+    <!-- Make the page mobile compatible -->
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <meta name="mobile-web-app-capable" content="yes" />
+    <title>Strapi Admin</title>
+  </head>
+  <body>
+    <!-- The app hooks into this div -->
+    <div style="min-height:100%;background-color:#f6f6f9;" id="app"></div>
+    <!-- A lot of magic happens in this file. HtmlWebpackPlugin automatically includes all assets (e.g. bundle.js, main.css) with the correct HTML tags, which is why they are missing in this HTML file. Don't add any assets here! (Check out webpackconfig.js if you want to know more) -->
+  </body>
 </html>

package/index.js CHANGED Viewed

@@ -12,7 +12,7 @@ const getWebpackConfig = require('./webpack.config');
 const getPkgPath = name => path.dirname(require.resolve(`${name}/package.json`));
 function getCustomWebpackConfig(dir, config) {
-  const adminConfigPath = path.join(dir, 'admin', 'webpack.config.js');
+  const adminConfigPath = path.join(dir, 'src', 'admin', 'webpack.config.js');
   let webpackConfig = getWebpackConfig(config);
@@ -94,7 +94,7 @@ async function createPluginsJs(plugins, dest) {
     const shortName = _.camelCase(name);
     return {
       name,
-      pathToPlugin: path.relative(path.resolve(dest, 'admin', 'src'), pathToPlugin),
+      pathToPlugin: path.relative(path.resolve(dest, 'admin/src'), pathToPlugin),
       shortName,
     };
   });
@@ -102,7 +102,7 @@ async function createPluginsJs(plugins, dest) {
   const content = `
 ${pluginsArray
   .map(({ pathToPlugin, shortName }) => {
-    const req = `'${pathToPlugin}/admin/src'`;
+    const req = `'${pathToPlugin}/strapi-admin.js'`;
     return `import ${shortName} from ${req};`;
   })
@@ -150,8 +150,7 @@ async function createCacheDir({ dir, plugins }) {
   const pluginsWithFront = Object.keys(plugins)
     .filter(pluginName => {
       const pluginInfo = plugins[pluginName];
-      // TODO: use strapi-admin
-      return fs.existsSync(path.resolve(pluginInfo.pathToPlugin, 'admin', 'src', 'index.js'));
+      return fs.existsSync(path.resolve(pluginInfo.pathToPlugin, 'strapi-admin.js'));
     })
     .map(name => ({ name, ...plugins[name] }));
@@ -162,14 +161,14 @@ async function createCacheDir({ dir, plugins }) {
   await copyAdmin(cacheDir);
   // Copy app.js
-  const customAdminConfigFilePath = path.join(dir, 'admin', 'app.js');
+  const customAdminConfigFilePath = path.join(dir, 'src', 'admin', 'app.js');
   if (fs.existsSync(customAdminConfigFilePath)) {
     await fs.copy(customAdminConfigFilePath, path.resolve(cacheDir, 'admin', 'src', 'app.js'));
   }
   // Copy admin extensions folder
-  const adminExtensionFolder = path.join(dir, 'admin', 'extensions');
+  const adminExtensionFolder = path.join(dir, 'src', 'admin', 'extensions');
   if (fs.existsSync(adminExtensionFolder)) {
     await fs.copy(adminExtensionFolder, path.resolve(cacheDir, 'admin', 'src', 'extensions'));
@@ -242,8 +241,8 @@ async function watchAdmin({ plugins, dir, host, port, browser, options }) {
  */
 async function watchFiles(dir) {
   const cacheDir = path.join(dir, '.cache');
-  const appExtensionFile = path.join(dir, 'admin', 'app.js');
-  const extensionsPath = path.join(dir, 'admin', 'extensions');
+  const appExtensionFile = path.join(dir, 'src', 'admin', 'app.js');
+  const extensionsPath = path.join(dir, 'src', 'admin', 'extensions');
   // Only watch the admin/app.js file and the files that are in the ./admin/extensions/folder
   const filesToWatch = [appExtensionFile, extensionsPath];

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/admin",
-  "version": "4.0.0-next.12",
+  "version": "4.0.0-next.16",
   "description": "Strapi Admin",
   "repository": {
     "type": "git",
@@ -9,7 +9,7 @@
   "scripts": {
     "prepublishOnly": "node ./scripts/build.js",
     "test": "echo \"no tests yet\"",
-    "develop": "webpack serve --config webpack.config.dev.js --progress profile",
+    "develop": "cross-env NODE_ENV=development webpack serve --config webpack.config.dev.js --progress profile",
     "develop:ce": "STRAPI_DISABLE_EE=true webpack serve --config webpack.config.dev.js --progress profile",
     "analyze:bundle": "ANALYZE_BUNDLE=true webpack --config webpack.config.dev.js",
     "analyze:deps": "ANALYZE_DEPS=true webpack serve --config webpack.config.dev.js --progress profile"
@@ -38,20 +38,22 @@
     "@fortawesome/free-brands-svg-icons": "^5.15.3",
     "@fortawesome/free-solid-svg-icons": "^5.15.3",
     "@fortawesome/react-fontawesome": "^0.1.14",
-    "@strapi/babel-plugin-switch-ee-ce": "4.0.0-next.12",
-    "@strapi/helper-plugin": "4.0.0-next.12",
-    "@strapi/utils": "4.0.0-next.12",
+    "@strapi/babel-plugin-switch-ee-ce": "4.0.0-next.16",
+    "@strapi/helper-plugin": "4.0.0-next.16",
+    "@strapi/icons": "0.0.1-alpha.42",
+    "@strapi/parts": "0.0.1-alpha.42",
+    "@strapi/utils": "4.0.0-next.16",
     "axios": "^0.21.1",
     "babel-loader": "8.2.2",
     "babel-plugin-styled-components": "1.12.0",
     "bcryptjs": "^2.4.3",
-    "bootstrap": "^4.6.0",
     "chalk": "^4.1.1",
     "chokidar": "^3.5.1",
     "classnames": "^2.3.1",
     "codemirror": "^5.61.0",
     "cross-env": "^7.0.3",
     "css-loader": "5.2.4",
+    "date-fns": "2.22.1",
     "dotenv": "8.5.1",
     "draft-js": "^0.11.5",
     "execa": "^1.0.0",
@@ -102,10 +104,10 @@
     "react-helmet": "^6.1.0",
     "react-intl": "5.20.2",
     "react-loadable": "^5.5.0",
-    "react-query": "3.19.0",
+    "react-query": "3.24.3",
     "react-redux": "7.2.3",
-    "react-router": "^5.2.0",
-    "react-router-dom": "^5.0.0",
+    "react-router": "5.2.0",
+    "react-router-dom": "5.2.0",
     "react-select": "^4.0.2",
     "react-tooltip": "4.2.18",
     "react-transition-group": "4.4.1",
@@ -146,7 +148,7 @@
     "npm": ">=6.0.0"
   },
   "license": "SEE LICENSE IN LICENSE",
-  "gitHead": "67af23d827fd48e7782e509a78d0ba66e67e2215",
+  "gitHead": "3aada6c5b84e8d79c9121ca402b23ee6f1e3d9e6",
   "devDependencies": {
     "duplicate-dependencies-webpack-plugin": "0.2.0",
     "webpack-bundle-analyzer": "4.4.1"

package/server/bootstrap.js CHANGED Viewed

@@ -44,6 +44,7 @@ module.exports = async () => {
   const permissionService = getService('permission');
   const userService = getService('user');
   const roleService = getService('role');
+  const apiTokenService = getService('api-token');
   await roleService.createRolesIfNoneExist();
   await roleService.resetSuperAdminPermissions();
@@ -55,4 +56,6 @@ module.exports = async () => {
   await userService.displayWarningIfUsersDontHaveRole();
   await syncAuthSettings();
+  apiTokenService.createSaltIfNotDefined();
 };

package/server/config/admin-actions.js CHANGED Viewed

@@ -118,5 +118,33 @@ module.exports = {
       category: 'users and roles',
       subCategory: 'roles',
     },
+    {
+      uid: 'api-tokens.create',
+      displayName: 'Create (generate)',
+      pluginName: 'admin',
+      section: 'settings',
+      category: 'api tokens',
+    },
+    {
+      uid: 'api-tokens.read',
+      displayName: 'Read',
+      pluginName: 'admin',
+      section: 'settings',
+      category: 'api tokens',
+    },
+    {
+      uid: 'api-tokens.update',
+      displayName: 'Update',
+      pluginName: 'admin',
+      section: 'settings',
+      category: 'api tokens',
+    },
+    {
+      uid: 'api-tokens.delete',
+      displayName: 'Delete (revoke)',
+      pluginName: 'admin',
+      section: 'settings',
+      category: 'api tokens',
+    },
   ],
 };

package/server/config/api-token.js ADDED Viewed

@@ -0,0 +1,7 @@
+'use strict';
+const { env } = require('@strapi/utils');
+module.exports = {
+  salt: env('API_TOKEN_SALT'),
+};

package/server/config/index.js CHANGED Viewed

@@ -6,4 +6,5 @@ module.exports = {
   forgotPassword: {
     emailTemplate: forgotPasswordTemplate,
   },
+  'api-token': require('./api-token'),
 };

package/server/content-types/api-token.js ADDED Viewed

@@ -0,0 +1,51 @@
+'use strict';
+const constants = require('../services/constants');
+module.exports = {
+  collectionName: 'strapi_api_tokens',
+  info: {
+    name: 'Api Token',
+    singularName: 'api-token',
+    pluralName: 'api-tokens',
+    displayName: 'Api Token',
+    description: '',
+  },
+  options: {},
+  pluginOptions: {
+    'content-manager': {
+      visible: false,
+    },
+    'content-type-builder': {
+      visible: false,
+    },
+  },
+  attributes: {
+    name: {
+      type: 'string',
+      minLength: 1,
+      configurable: false,
+      required: true,
+    },
+    description: {
+      type: 'string',
+      minLength: 1,
+      configurable: false,
+      required: false,
+      default: '',
+    },
+    type: {
+      type: 'enumeration',
+      enum: Object.values(constants.API_TOKEN_TYPE),
+      configurable: false,
+      required: false,
+      default: constants.API_TOKEN_TYPE.READ_ONLY,
+    },
+    accessKey: {
+      type: 'string',
+      minLength: 1,
+      configurable: false,
+      required: true,
+    },
+  },
+};

package/server/content-types/index.js CHANGED Viewed

@@ -4,4 +4,5 @@ module.exports = {
   permission: { schema: require('./Permission') },
   user: { schema: require('./User') },
   role: { schema: require('./Role') },
+  'api-token': { schema: require('./api-token') },
 };

package/server/controllers/api-token.js ADDED Viewed

@@ -0,0 +1,118 @@
+'use strict';
+const { stringEquals } = require('@strapi/utils/lib');
+const { trim } = require('lodash/fp');
+const has = require('lodash/has');
+const { getService } = require('../utils');
+const {
+  validateApiTokenCreationInput,
+  validateApiTokenUpdateInput,
+} = require('../validation/api-tokens');
+module.exports = {
+  async create(ctx) {
+    const { body } = ctx.request;
+    const apiTokenService = getService('api-token');
+    /**
+     * We trim both field to avoid having issues with either:
+     * - having a space at the end or start of the value.
+     * - having only spaces as value;
+     */
+    const attributes = {
+      name: trim(body.name),
+      description: trim(body.description),
+      type: body.type,
+    };
+    try {
+      await validateApiTokenCreationInput(attributes);
+    } catch (err) {
+      return ctx.badRequest('ValidationError', err);
+    }
+    const alreadyExists = await apiTokenService.exists({ name: attributes.name });
+    if (alreadyExists) {
+      return ctx.badRequest('Name already taken');
+    }
+    const apiToken = await apiTokenService.create(attributes);
+    ctx.created({ data: apiToken });
+  },
+  async list(ctx) {
+    const apiTokenService = getService('api-token');
+    const apiTokens = await apiTokenService.list();
+    ctx.send({ data: apiTokens });
+  },
+  async revoke(ctx) {
+    const { id } = ctx.params;
+    const apiTokenService = getService('api-token');
+    const apiToken = await apiTokenService.revoke(id);
+    ctx.deleted({ data: apiToken });
+  },
+  async get(ctx) {
+    const { id } = ctx.params;
+    const apiTokenService = getService('api-token');
+    const apiToken = await apiTokenService.getById(id);
+    if (!apiToken) {
+      ctx.notFound('API Token not found');
+      return;
+    }
+    ctx.send({ data: apiToken });
+  },
+  async update(ctx) {
+    const { body } = ctx.request;
+    const { id } = ctx.params;
+    const apiTokenService = getService('api-token');
+    const attributes = body;
+    /**
+     * We trim both field to avoid having issues with either:
+     * - having a space at the end or start of the value.
+     * - having only spaces as value;
+     */
+    if (has(attributes, 'name')) {
+      attributes.name = trim(body.name);
+    }
+    if (has(attributes, 'description') || attributes.description === null) {
+      attributes.description = trim(body.description);
+    }
+    try {
+      await validateApiTokenUpdateInput(attributes);
+    } catch (err) {
+      return ctx.badRequest('ValidationError', err);
+    }
+    const apiTokenExists = await apiTokenService.getById(id);
+    if (!apiTokenExists) {
+      return ctx.notFound('API token not found');
+    }
+    if (has(attributes, 'name')) {
+      const nameAlreadyTaken = await apiTokenService.getByName(attributes.name);
+      /**
+       * We cast the ids as string as the one coming from the ctx isn't cast
+       * as a Number in case it is supposed to be an integer. It remains
+       * as a string. This way we avoid issues with integers in the db.
+       */
+      if (!!nameAlreadyTaken && !stringEquals(nameAlreadyTaken.id, id)) {
+        return ctx.badRequest('Name already taken');
+      }
+    }
+    const apiToken = await apiTokenService.update(id, attributes);
+    ctx.send({ data: apiToken });
+  },
+};

package/server/controllers/index.js CHANGED Viewed

@@ -2,6 +2,7 @@
 module.exports = {
   admin: require('./admin'),
+  'api-token': require('./api-token'),
   'authenticated-user': require('./authenticated-user'),
   authentication: require('./authentication'),
   permission: require('./permission'),

package/server/controllers/user.js CHANGED Viewed

@@ -59,7 +59,7 @@ module.exports = {
   async findOne(ctx) {
     const { id } = ctx.params;
-    const user = await getService('user').findOne({ id });
+    const user = await getService('user').findOne(id);
     if (!user) {
       return ctx.notFound('User does not exist');

package/server/policies/hasPermissions.js CHANGED Viewed

@@ -30,11 +30,11 @@ module.exports = createPolicyFactory(
       inputModifiers.find(modifier => modifier.check(action)).transform(action)
     );
-    return (ctx, next) => {
+    return ({ ctx, strapi }) => {
       const { userAbility: ability, isAuthenticated } = ctx.state;
       if (!isAuthenticated || !ability) {
-        return next();
+        return true;
       }
       const isAuthorized = permissions.every(({ action, subject }) => ability.can(action, subject));
@@ -43,7 +43,7 @@ module.exports = createPolicyFactory(
         throw strapi.errors.forbidden();
       }
-      return next();
+      return true;
     };
   },
   {

package/server/policies/isAuthenticatedAdmin.js CHANGED Viewed

@@ -1,9 +1,5 @@
 'use strict';
-module.exports = (ctx, next) => {
-  if (!ctx.state.isAuthenticated) {
-    return ctx.unauthorized();
-  }
-  return next();
+module.exports = ({ ctx }) => {
+  return Boolean(ctx.state.isAuthenticated);
 };

package/server/register.js CHANGED Viewed

@@ -1,48 +1,12 @@
 'use strict';
-const adminAuthStrategy = {
-  name: 'admin',
-  async authenticate(ctx) {
-    const { authorization } = ctx.request.header;
-    if (!authorization) {
-      return { authenticated: false };
-    }
-    const parts = authorization.split(/\s+/);
-    if (parts[0] !== 'Bearer' || parts.length !== 2) {
-      return { authenticated: false };
-    }
-    const token = parts[1];
-    const { payload, isValid } = strapi.admin.services.token.decodeJwtToken(token);
-    if (isValid) {
-      const user = await strapi
-        .query('admin::user')
-        .findOne({ where: { id: payload.id }, populate: ['roles'] });
-      if (!user || !(user.isActive === true)) {
-        return { error: 'Invalid credentials' };
-      }
-      const userAbility = await strapi.admin.services.permission.engine.generateUserAbility(user);
-      ctx.state.userAbility = userAbility;
-      ctx.state.user = user;
-      ctx.state.isAuthenticatedAdmin = true;
-      return { authenticated: true, credentials: user };
-    }
-    return { error: 'Invalid credentials' };
-  },
-};
+const adminAuthStrategy = require('./strategies/admin');
+// const apiTokenAuthStrategy = require('./strategies/api-token');
 module.exports = () => {
   const passportMiddleware = strapi.admin.services.passport.init();
   strapi.server.api('admin').use(passportMiddleware);
   strapi.container.get('auth').register('admin', adminAuthStrategy);
+  // strapi.container.get('auth').register('content-api', apiTokenAuthStrategy);
 };

package/server/routes/api-tokens.js ADDED Viewed

@@ -0,0 +1,59 @@
+'use strict';
+module.exports = [
+  {
+    method: 'POST',
+    path: '/api-tokens',
+    handler: 'api-token.create',
+    config: {
+      policies: [
+        'admin::isAuthenticatedAdmin',
+        { name: 'admin::hasPermissions', options: { actions: ['admin::api-tokens.create'] } },
+      ],
+    },
+  },
+  {
+    method: 'GET',
+    path: '/api-tokens',
+    handler: 'api-token.list',
+    config: {
+      policies: [
+        'admin::isAuthenticatedAdmin',
+        { name: 'admin::hasPermissions', options: { actions: ['admin::api-tokens.read'] } },
+      ],
+    },
+  },
+  {
+    method: 'DELETE',
+    path: '/api-tokens/:id',
+    handler: 'api-token.revoke',
+    config: {
+      policies: [
+        'admin::isAuthenticatedAdmin',
+        { name: 'admin::hasPermissions', options: { actions: ['admin::api-tokens.delete'] } },
+      ],
+    },
+  },
+  {
+    method: 'GET',
+    path: '/api-tokens/:id',
+    handler: 'api-token.get',
+    config: {
+      policies: [
+        'admin::isAuthenticatedAdmin',
+        { name: 'admin::hasPermissions', options: { actions: ['admin::api-tokens.read'] } },
+      ],
+    },
+  },
+  {
+    method: 'PUT',
+    path: '/api-tokens/:id',
+    handler: 'api-token.update',
+    config: {
+      policies: [
+        'admin::isAuthenticatedAdmin',
+        { name: 'admin::hasPermissions', options: { actions: ['admin::api-tokens.update'] } },
+      ],
+    },
+  },
+];

package/server/routes/index.js CHANGED Viewed

@@ -6,5 +6,14 @@ const permissions = require('./permissions');
 const users = require('./users');
 const roles = require('./roles');
 const webhooks = require('./webhooks');
+const apiTokens = require('./api-tokens');
-module.exports = [...admin, ...authentication, ...permissions, ...users, ...roles, ...webhooks];
+module.exports = [
+  ...admin,
+  ...authentication,
+  ...permissions,
+  ...users,
+  ...roles,
+  ...webhooks,
+  ...apiTokens,
+];