@strapi/admin 4.6.0 → 4.7.0-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/admin",
-  "version": "4.6.0",
+  "version": "4.7.0-beta.0",
   "description": "Strapi Admin",
   "repository": {
     "type": "git",
@@ -38,25 +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",
     "@pmmmwh/react-refresh-webpack-plugin": "0.5.10",
-    "@strapi/babel-plugin-switch-ee-ce": "4.6.0",
-    "@strapi/data-transfer": "4.6.0",
-    "@strapi/design-system": "1.6.1",
-    "@strapi/helper-plugin": "4.6.0",
-    "@strapi/icons": "1.6.1",
-    "@strapi/permissions": "4.6.0",
-    "@strapi/provider-audit-logs-local": "4.6.0",
-    "@strapi/typescript-utils": "4.6.0",
-    "@strapi/utils": "4.6.0",
+    "@strapi/babel-plugin-switch-ee-ce": "4.7.0-beta.0",
+    "@strapi/data-transfer": "4.7.0-beta.0",
+    "@strapi/design-system": "1.6.3",
+    "@strapi/helper-plugin": "4.7.0-beta.0",
+    "@strapi/icons": "1.6.3",
+    "@strapi/permissions": "4.7.0-beta.0",
+    "@strapi/provider-audit-logs-local": "4.7.0-beta.0",
+    "@strapi/typescript-utils": "4.7.0-beta.0",
+    "@strapi/utils": "4.7.0-beta.0",
     "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",
@@ -64,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",
@@ -77,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",
@@ -99,8 +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",
-    "msw": "0.49.1",
+    "mini-css-extract-plugin": "2.7.2",
     "node-polyfill-webpack-plugin": "2.0.1",
     "node-schedule": "2.1.0",
     "p-map": "4.0.0",
@@ -115,15 +114,15 @@
     "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",
+    "react-redux": "8.0.5",
     "react-refresh": "0.14.0",
     "react-router": "5.2.0",
     "react-router-dom": "5.3.4",
     "react-window": "1.8.7",
-    "redux": "^4.0.1",
+    "redux": "^4.2.1",
     "reselect": "^4.0.0",
     "rimraf": "3.0.2",
     "sanitize-html": "2.7.3",
@@ -132,9 +131,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"
   },
@@ -145,9 +144,10 @@
     "@testing-library/user-event": "14.4.3",
     "duplicate-dependencies-webpack-plugin": "^1.0.2",
     "glob": "8.0.3",
+    "msw": "1.0.0",
     "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"
@@ -165,5 +165,5 @@
       }
     }
   },
-  "gitHead": "a9e55435c489f3379d88565bf3f729deb29bfb45"
+  "gitHead": "880ba7af867ad43c4cc45b47467b76a9b5606b6e"
 }

package/server/bootstrap.js

@@ -78,6 +78,7 @@ module.exports = async () => {
   const userService = getService('user');
   const roleService = getService('role');
   const apiTokenService = getService('api-token');
+  const transferService = getService('transfer');
   const tokenService = getService('token');
 
   await roleService.createRolesIfNoneExist();
@@ -93,5 +94,6 @@ module.exports = async () => {
   await syncAPITokensPermissions();
 
   apiTokenService.checkSaltIsDefined();
+  transferService.token.checkSaltIsDefined();
   tokenService.checkSecretIsDefined();
 };

package/server/config/admin-actions.js

@@ -180,5 +180,53 @@ module.exports = {
       section: 'settings',
       category: 'project',
     },
+    {
+      uid: 'transfer.tokens.access',
+      displayName: 'Access the transfer tokens settings page',
+      pluginName: 'admin',
+      section: 'settings',
+      category: 'transfer tokens',
+      subCategory: 'transfer tokens',
+    },
+    {
+      uid: 'transfer.tokens.create',
+      displayName: 'Create (generate)',
+      pluginName: 'admin',
+      section: 'settings',
+      category: 'transfer tokens',
+      subCategory: 'general',
+    },
+    {
+      uid: 'transfer.tokens.read',
+      displayName: 'Read',
+      pluginName: 'admin',
+      section: 'settings',
+      category: 'transfer tokens',
+      subCategory: 'general',
+    },
+    {
+      uid: 'transfer.tokens.update',
+      displayName: 'Update',
+      pluginName: 'admin',
+      section: 'settings',
+      category: 'transfer tokens',
+      subCategory: 'general',
+    },
+    {
+      uid: 'transfer.tokens.regenerate',
+      displayName: 'Regenerate',
+      pluginName: 'admin',
+      section: 'settings',
+      category: 'transfer tokens',
+      subCategory: 'general',
+    },
+    {
+      uid: 'transfer.tokens.delete',
+      displayName: 'Delete (revoke)',
+      pluginName: 'admin',
+      section: 'settings',
+      category: 'transfer tokens',
+      subCategory: 'general',
+    },
   ],
 };

package/server/content-types/index.js

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

package/server/content-types/transfer-token-permission.js

@@ -0,0 +1,36 @@
+'use strict';
+
+module.exports = {
+  collectionName: 'strapi_transfer_token_permissions',
+  info: {
+    name: 'Transfer Token Permission',
+    description: '',
+    singularName: 'transfer-token-permission',
+    pluralName: 'transfer-token-permissions',
+    displayName: 'Transfer Token Permission',
+  },
+  options: {},
+  pluginOptions: {
+    'content-manager': {
+      visible: false,
+    },
+    'content-type-builder': {
+      visible: false,
+    },
+  },
+  attributes: {
+    action: {
+      type: 'string',
+      minLength: 1,
+      configurable: false,
+      required: true,
+    },
+    token: {
+      configurable: false,
+      type: 'relation',
+      relation: 'manyToOne',
+      inversedBy: 'permissions',
+      target: 'admin::transfer-token',
+    },
+  },
+};

package/server/content-types/transfer-token.js

@@ -0,0 +1,66 @@
+'use strict';
+
+module.exports = {
+  collectionName: 'strapi_transfer_tokens',
+  info: {
+    name: 'Transfer Token',
+    singularName: 'transfer-token',
+    pluralName: 'transfer-tokens',
+    displayName: 'Transfer Token',
+    description: '',
+  },
+  options: {},
+  pluginOptions: {
+    'content-manager': {
+      visible: false,
+    },
+    'content-type-builder': {
+      visible: false,
+    },
+  },
+  attributes: {
+    name: {
+      type: 'string',
+      minLength: 1,
+      configurable: false,
+      required: true,
+      unique: true,
+    },
+    description: {
+      type: 'string',
+      minLength: 1,
+      configurable: false,
+      required: false,
+      default: '',
+    },
+    accessKey: {
+      type: 'string',
+      minLength: 1,
+      configurable: false,
+      required: true,
+    },
+    lastUsedAt: {
+      type: 'datetime',
+      configurable: false,
+      required: false,
+    },
+    permissions: {
+      type: 'relation',
+      target: 'admin::transfer-token-permission',
+      relation: 'oneToMany',
+      mappedBy: 'token',
+      configurable: false,
+      required: false,
+    },
+    expiresAt: {
+      type: 'datetime',
+      configurable: false,
+      required: false,
+    },
+    lifespan: {
+      type: 'biginteger',
+      configurable: false,
+      required: false,
+    },
+  },
+};

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');
@@ -97,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/controllers/api-token.js

@@ -2,8 +2,7 @@
 
 const { stringEquals } = require('@strapi/utils/lib');
 const { ApplicationError } = require('@strapi/utils').errors;
-const { trim } = require('lodash/fp');
-const has = require('lodash/has');
+const { trim, has } = require('lodash/fp');
 const { getService } = require('../utils');
 const {
   validateApiTokenCreationInput,
@@ -93,11 +92,11 @@ module.exports = {
      * - having a space at the end or start of the value.
      * - having only spaces as value;
      */
-    if (has(attributes, 'name')) {
+    if (has('name', attributes)) {
       attributes.name = trim(body.name);
     }
 
-    if (has(attributes, 'description') || attributes.description === null) {
+    if (has('description', attributes) || attributes.description === null) {
       attributes.description = trim(body.description);
     }
 
@@ -108,7 +107,7 @@ module.exports = {
       return ctx.notFound('API Token not found');
     }
 
-    if (has(attributes, 'name')) {
+    if (has('name', attributes)) {
       const nameAlreadyTaken = await apiTokenService.getByName(attributes.name);
 
       /**

package/server/controllers/index.js

@@ -7,6 +7,7 @@ module.exports = {
   authentication: require('./authentication'),
   permission: require('./permission'),
   role: require('./role'),
+  transfer: require('./transfer'),
   user: require('./user'),
   webhooks: require('./webhooks'),
   'content-api': require('./content-api'),

package/server/controllers/transfer/index.js

@@ -0,0 +1,13 @@
+'use strict';
+
+const { mapKeys } = require('lodash/fp');
+
+const runner = require('./runner');
+const token = require('./token');
+
+const prefixActionsName = (prefix, dict) => mapKeys((key) => `${prefix}-${key}`, dict);
+
+module.exports = {
+  ...prefixActionsName('runner', runner),
+  ...prefixActionsName('token', token),
+};

package/server/controllers/transfer/runner.js

@@ -0,0 +1,24 @@
+'use strict';
+
+const { remote } = require('@strapi/data-transfer/lib/strapi');
+const { UnauthorizedError } = require('@strapi/utils/lib/errors');
+
+const dataTransferAuthStrategy = require('../../strategies/data-transfer');
+
+/**
+ * @param {import('koa').Context} ctx
+ * @param {string} [scope]
+ */
+const verify = async (ctx, scope) => {
+  const { auth } = ctx.state;
+
+  if (!auth) {
+    throw new UnauthorizedError();
+  }
+
+  await dataTransferAuthStrategy.verify(auth, { scope });
+};
+
+module.exports = {
+  connect: remote.handlers.createTransferHandler({ verify }),
+};

package/server/controllers/transfer/token.js

@@ -0,0 +1,131 @@
+'use strict';
+
+const { trim, has } = require('lodash/fp');
+const {
+  errors: { ApplicationError },
+  stringEquals,
+} = require('@strapi/utils');
+
+const {
+  token: { validateTransferTokenCreationInput, validateTransferTokenUpdateInput },
+} = require('../../validation/transfer');
+const { getService } = require('../../utils');
+
+module.exports = {
+  async list(ctx) {
+    const transferService = getService('transfer');
+    const transferTokens = await transferService.token.list();
+
+    ctx.body = { data: transferTokens };
+  },
+
+  async getById(ctx) {
+    const { id } = ctx.params;
+    const tokenService = getService('transfer').token;
+
+    const transferToken = await tokenService.getById(id);
+
+    if (!transferToken) {
+      ctx.notFound('Transfer token not found');
+      return;
+    }
+
+    ctx.body = { data: transferToken };
+  },
+
+  async create(ctx) {
+    const { body } = ctx.request;
+    const { token: tokenService } = getService('transfer');
+
+    /**
+     * We trim fields to avoid having issues with either:
+     * - having a space at the end or start of the value
+     * - having only spaces as value (so that an empty field can be caught in validation)
+     */
+    const attributes = {
+      name: trim(body.name),
+      description: trim(body.description),
+      permissions: body.permissions,
+      lifespan: body.lifespan,
+    };
+
+    await validateTransferTokenCreationInput(attributes);
+
+    const alreadyExists = await tokenService.exists({ name: attributes.name });
+    if (alreadyExists) {
+      throw new ApplicationError('Name already taken');
+    }
+
+    const transferTokens = await tokenService.create(attributes);
+
+    ctx.created({ data: transferTokens });
+  },
+
+  async update(ctx) {
+    const { body } = ctx.request;
+    const { id } = ctx.params;
+    const { token: tokenService } = getService('transfer');
+
+    const attributes = body;
+    /**
+     * We trim fields to avoid having issues with either:
+     * - having a space at the end or start of the value
+     * - having only spaces as value (so that an empty field can be caught in validation)
+     */
+    if (has('name', attributes)) {
+      attributes.name = trim(body.name);
+    }
+
+    if (has('description', attributes) || attributes.description === null) {
+      attributes.description = trim(body.description);
+    }
+
+    await validateTransferTokenUpdateInput(attributes);
+
+    const apiTokenExists = await tokenService.getById(id);
+    if (!apiTokenExists) {
+      return ctx.notFound('Transfer token not found');
+    }
+
+    if (has('name', attributes)) {
+      const nameAlreadyTaken = await tokenService.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)) {
+        throw new ApplicationError('Name already taken');
+      }
+    }
+
+    const apiToken = await tokenService.update(id, attributes);
+
+    ctx.body = { data: apiToken };
+  },
+
+  async revoke(ctx) {
+    const { id } = ctx.params;
+    const { token: tokenService } = getService('transfer');
+
+    const transferToken = await tokenService.revoke(id);
+
+    ctx.deleted({ data: transferToken });
+  },
+
+  async regenerate(ctx) {
+    const { id } = ctx.params;
+    const { token: tokenService } = getService('transfer');
+
+    const exists = await tokenService.getById(id);
+    if (!exists) {
+      ctx.notFound('Transfer token not found');
+      return;
+    }
+
+    const accessToken = await tokenService.regenerate(id);
+
+    ctx.created({ data: accessToken });
+  },
+};

package/server/register.js

@@ -1,9 +1,9 @@
 'use strict';
 
-// const { register: registerDataTransferRoute } = require('@strapi/data-transfer/lib/strapi');
-
 const registerAdminPanelRoute = require('./routes/serve-admin-panel');
+
 const adminAuthStrategy = require('./strategies/admin');
+
 const apiTokenAuthStrategy = require('./strategies/api-token');
 
 module.exports = ({ strapi }) => {
@@ -16,11 +16,4 @@ module.exports = ({ strapi }) => {
   if (strapi.config.serveAdminPanel) {
     registerAdminPanelRoute({ strapi });
   }
-
-  // if (
-  //   process.env.STRAPI_EXPERIMENTAL === 'true' &&
-  //   process.env.STRAPI_DISABLE_REMOTE_DATA_TRANSFER !== 'true'
-  // ) {
-  //   registerDataTransferRoute(strapi);
-  // }
 };

package/server/routes/index.js

@@ -8,6 +8,7 @@ const roles = require('./roles');
 const webhooks = require('./webhooks');
 const apiTokens = require('./api-tokens');
 const contentApi = require('./content-api');
+const transfer = require('./transfer');
 
 module.exports = [
   ...admin,
@@ -18,4 +19,5 @@ module.exports = [
   ...webhooks,
   ...apiTokens,
   ...contentApi,
+  ...transfer,
 ];