@strapi/admin 4.5.0-alpha.0 → 4.5.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/admin",
-  "version": "4.5.0-alpha.0",
+  "version": "4.5.0",
   "description": "Strapi Admin",
   "repository": {
     "type": "git",
@@ -51,12 +51,13 @@
     "@fortawesome/free-solid-svg-icons": "^5.15.3",
     "@fortawesome/react-fontawesome": "^0.2.0",
     "@pmmmwh/react-refresh-webpack-plugin": "0.5.7",
-    "@strapi/babel-plugin-switch-ee-ce": "4.5.0-alpha.0",
-    "@strapi/design-system": "1.2.3",
-    "@strapi/helper-plugin": "4.5.0-alpha.0",
-    "@strapi/icons": "1.2.3",
-    "@strapi/typescript-utils": "4.5.0-alpha.0",
-    "@strapi/utils": "4.5.0-alpha.0",
+    "@strapi/babel-plugin-switch-ee-ce": "4.5.0",
+    "@strapi/design-system": "1.2.7",
+    "@strapi/helper-plugin": "4.5.0",
+    "@strapi/icons": "1.2.7",
+    "@strapi/permissions": "4.5.0",
+    "@strapi/typescript-utils": "4.5.0",
+    "@strapi/utils": "4.5.0",
     "axios": "0.27.2",
     "babel-loader": "8.2.5",
     "babel-plugin-styled-components": "2.0.2",
@@ -68,7 +69,7 @@
     "css-loader": "6.7.1",
     "date-fns": "2.29.2",
     "dotenv": "8.5.1",
-    "esbuild-loader": "^2.19.0",
+    "esbuild-loader": "^2.20.0",
     "execa": "^1.0.0",
     "fast-deep-equal": "3.1.3",
     "font-awesome": "^4.7.0",
@@ -100,6 +101,7 @@
     "markdown-it-sup": "1.0.0",
     "match-sorter": "^4.0.2",
     "mini-css-extract-plugin": "2.4.4",
+    "msw": "0.42.3",
     "node-polyfill-webpack-plugin": "2.0.1",
     "p-map": "4.0.0",
     "passport-local": "1.0.0",
@@ -126,11 +128,11 @@
     "rimraf": "3.0.2",
     "sanitize-html": "2.7.1",
     "semver": "7.3.7",
-    "sift": "13.5.4",
+    "sift": "16.0.0",
     "style-loader": "3.3.1",
     "styled-components": "5.3.3",
     "typescript": "4.6.2",
-    "webpack": "^5.73.0",
+    "webpack": "^5.74.0",
     "webpack-cli": "^4.10.0",
     "webpack-dev-server": "^4.9.3",
     "webpackbar": "^5.0.2",
@@ -163,5 +165,5 @@
       }
     }
   },
-  "gitHead": "c9a98c4dbcf3c4f2a449f8d96e7cbe4cd9b1e0f5"
+  "gitHead": "33debd57010667a3fc5dfa343a673206cfb956e1"
 }

package/scripts/build.js

@@ -41,6 +41,17 @@ const buildAdmin = async () => {
     options: {
       backend: 'http://localhost:1337',
       adminPath: '/admin/',
+
+      /**
+       * Ideally this would take more scenarios into account, such
+       * as the `telemetryDisabled` property in the package.json
+       * of the users project. For builds based on an app we are
+       * passing this information throgh, but here we do not have access
+       * to the app's package.json. By using at least an environment variable
+       * we can make sure developers can actually test this functionality.
+       */
+
+      telemetryDisabled: process.env.STRAPI_TELEMETRY_DISABLED === 'true' ?? false,
     },
     tsConfigFilePath,
   };

package/server/bootstrap.js

@@ -1,6 +1,7 @@
 'use strict';
 
-const { merge } = require('lodash/fp');
+const { merge, map, difference, uniq } = require('lodash/fp');
+const { pipeAsync } = require('@strapi/utils');
 const { getService } = require('./utils');
 const adminActions = require('./config/admin-actions');
 const adminConditions = require('./config/admin-conditions');
@@ -52,6 +53,22 @@ const syncAuthSettings = async () => {
   await adminStore.set({ key: 'auth', value: newAuthSettings });
 };
 
+const syncAPITokensPermissions = async () => {
+  const validPermissions = strapi.contentAPI.permissions.providers.action.keys();
+  const permissionsInDB = await pipeAsync(
+    strapi.query('admin::api-token-permission').findMany,
+    map('action')
+  )();
+
+  const unknownPermissions = uniq(difference(permissionsInDB, validPermissions));
+
+  if (unknownPermissions.length > 0) {
+    await strapi
+      .query('admin::api-token-permission')
+      .deleteMany({ where: { action: { $in: unknownPermissions } } });
+  }
+};
+
 module.exports = async () => {
   await registerAdminConditions();
   await registerPermissionActions();
@@ -73,6 +90,7 @@ module.exports = async () => {
   await userService.displayWarningIfUsersDontHaveRole();
 
   await syncAuthSettings();
+  await syncAPITokensPermissions();
 
   apiTokenService.checkSaltIsDefined();
   tokenService.checkSecretIsDefined();

package/server/config/admin-actions.js

@@ -118,12 +118,21 @@ module.exports = {
       category: 'users and roles',
       subCategory: 'roles',
     },
+    {
+      uid: 'api-tokens.access',
+      displayName: 'Access the API tokens settings page',
+      pluginName: 'admin',
+      section: 'settings',
+      category: 'api tokens',
+      subCategory: 'api Tokens',
+    },
     {
       uid: 'api-tokens.create',
       displayName: 'Create (generate)',
       pluginName: 'admin',
       section: 'settings',
       category: 'api tokens',
+      subCategory: 'general',
     },
     {
       uid: 'api-tokens.read',
@@ -131,6 +140,7 @@ module.exports = {
       pluginName: 'admin',
       section: 'settings',
       category: 'api tokens',
+      subCategory: 'general',
     },
     {
       uid: 'api-tokens.update',
@@ -138,6 +148,15 @@ module.exports = {
       pluginName: 'admin',
       section: 'settings',
       category: 'api tokens',
+      subCategory: 'general',
+    },
+    {
+      uid: 'api-tokens.regenerate',
+      displayName: 'Regenerate',
+      pluginName: 'admin',
+      section: 'settings',
+      category: 'api tokens',
+      subCategory: 'general',
     },
     {
       uid: 'api-tokens.delete',
@@ -145,6 +164,7 @@ module.exports = {
       pluginName: 'admin',
       section: 'settings',
       category: 'api tokens',
+      subCategory: 'general',
     },
     {
       uid: 'project-settings.update',

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

@@ -0,0 +1,36 @@
+'use strict';
+
+module.exports = {
+  collectionName: 'strapi_api_token_permissions',
+  info: {
+    name: 'API Token Permission',
+    description: '',
+    singularName: 'api-token-permission',
+    pluralName: 'api-token-permissions',
+    displayName: 'API 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::api-token',
+    },
+  },
+};

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

@@ -26,6 +26,7 @@ module.exports = {
       minLength: 1,
       configurable: false,
       required: true,
+      unique: true,
     },
     description: {
       type: 'string',
@@ -38,7 +39,7 @@ module.exports = {
       type: 'enumeration',
       enum: Object.values(constants.API_TOKEN_TYPE),
       configurable: false,
-      required: false,
+      required: true,
       default: constants.API_TOKEN_TYPE.READ_ONLY,
     },
     accessKey: {
@@ -47,5 +48,28 @@ module.exports = {
       configurable: false,
       required: true,
     },
+    lastUsedAt: {
+      type: 'datetime',
+      configurable: false,
+      required: false,
+    },
+    permissions: {
+      type: 'relation',
+      target: 'admin::api-token-permission',
+      relation: 'oneToMany',
+      mappedBy: 'token',
+      configurable: false,
+      required: false,
+    },
+    expiresAt: {
+      type: 'datetime',
+      configurable: false,
+      required: false,
+    },
+    lifespan: {
+      type: 'integer',
+      configurable: false,
+      required: false,
+    },
   },
 };

package/server/content-types/index.js

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

package/server/controllers/admin.js

@@ -4,6 +4,7 @@ const path = require('path');
 const execa = require('execa');
 const _ = require('lodash');
 const { exists } = require('fs-extra');
+const { env } = require('@strapi/utils');
 const { ValidationError } = require('@strapi/utils').errors;
 const { isUsingTypeScript } = require('@strapi/typescript-utils');
 // eslint-disable-next-line node/no-extraneous-require
@@ -93,11 +94,13 @@ module.exports = {
     const useTypescriptOnAdmin = await isUsingTypeScript(
       path.join(strapi.dirs.app.root, 'src', 'admin')
     );
+    const isHostedOnStrapiCloud = env('STRAPI_HOSTING', null) === 'strapi.cloud';
 
     return {
       data: {
         useTypescriptOnServer,
         useTypescriptOnAdmin,
+        isHostedOnStrapiCloud,
       },
     };
   },

package/server/controllers/api-token.js

@@ -24,6 +24,8 @@ module.exports = {
       name: trim(body.name),
       description: trim(body.description),
       type: body.type,
+      permissions: body.permissions,
+      lifespan: body.lifespan,
     };
 
     await validateApiTokenCreationInput(attributes);
@@ -37,6 +39,21 @@ module.exports = {
     ctx.created({ data: apiToken });
   },
 
+  async regenerate(ctx) {
+    const { id } = ctx.params;
+    const apiTokenService = getService('api-token');
+
+    const apiTokenExists = await apiTokenService.getById(id);
+    if (!apiTokenExists) {
+      ctx.notFound('API Token not found');
+      return;
+    }
+
+    const accessToken = await apiTokenService.regenerate(id);
+
+    ctx.created({ data: accessToken });
+  },
+
   async list(ctx) {
     const apiTokenService = getService('api-token');
     const apiTokens = await apiTokenService.list();
@@ -59,7 +76,6 @@ module.exports = {
 
     if (!apiToken) {
       ctx.notFound('API Token not found');
-
       return;
     }
 
@@ -108,4 +124,11 @@ module.exports = {
     const apiToken = await apiTokenService.update(id, attributes);
     ctx.send({ data: apiToken });
   },
+
+  async getLayout(ctx) {
+    const apiTokenService = getService('api-token');
+    const layout = await apiTokenService.getApiTokenLayout();
+
+    ctx.send({ data: layout });
+  },
 };

package/server/controllers/content-api.js

@@ -0,0 +1,15 @@
+'use strict';
+
+module.exports = {
+  async getPermissions(ctx) {
+    const actionsMap = await strapi.contentAPI.permissions.getActionsMap();
+
+    ctx.send({ data: actionsMap });
+  },
+
+  async getRoutes(ctx) {
+    const routesMap = await strapi.contentAPI.getRoutesMap();
+
+    ctx.send({ data: routesMap });
+  },
+};

package/server/controllers/index.js

@@ -9,4 +9,5 @@ module.exports = {
   role: require('./role'),
   user: require('./user'),
   webhooks: require('./webhooks'),
+  'content-api': require('./content-api'),
 };

package/server/controllers/user.js

@@ -13,10 +13,11 @@ const { getService } = require('../utils');
 module.exports = {
   async create(ctx) {
     const { body } = ctx.request;
+    const cleanData = { ...body, email: _.get(body, `email`, ``).toLowerCase() };
 
-    await validateUserCreationInput(body);
+    await validateUserCreationInput(cleanData);
 
-    const attributes = _.pick(body, [
+    const attributes = _.pick(cleanData, [
       'firstname',
       'lastname',
       'email',

package/server/routes/api-tokens.js

@@ -56,4 +56,15 @@ module.exports = [
       ],
     },
   },
+  {
+    method: 'POST',
+    path: '/api-tokens/:id/regenerate',
+    handler: 'api-token.regenerate',
+    config: {
+      policies: [
+        'admin::isAuthenticatedAdmin',
+        { name: 'admin::hasPermissions', config: { actions: ['admin::api-tokens.regenerate'] } },
+      ],
+    },
+  },
 ];

package/server/routes/content-api.js

@@ -0,0 +1,20 @@
+'use strict';
+
+module.exports = [
+  {
+    method: 'GET',
+    path: '/content-api/permissions',
+    handler: 'content-api.getPermissions',
+    config: {
+      policies: ['admin::isAuthenticatedAdmin'],
+    },
+  },
+  {
+    method: 'GET',
+    path: '/content-api/routes',
+    handler: 'content-api.getRoutes',
+    config: {
+      policies: ['admin::isAuthenticatedAdmin'],
+    },
+  },
+];

package/server/routes/index.js

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