@strapi/admin 4.10.0-beta.0 → 4.10.0

package/server/services/transfer/token.js

@@ -149,37 +149,39 @@ const update = async (id, attributes) => {
       },
     });
 
-    const currentPermissionsResult = await strapi.entityService.load(
-      TRANSFER_TOKEN_UID,
-      updatedToken,
-      'permissions'
-    );
-
-    const currentPermissions = map('action', currentPermissionsResult || []);
-    const newPermissions = uniq(attributes.permissions);
-
-    const actionsToDelete = difference(currentPermissions, newPermissions);
-    const actionsToAdd = difference(newPermissions, currentPermissions);
-
-    // TODO: improve efficiency here
-    // method using a loop -- works but very inefficient
-    await Promise.all(
-      actionsToDelete.map((action) =>
-        strapi.query(TRANSFER_TOKEN_PERMISSION_UID).delete({
-          where: { action, token: id },
-        })
-      )
-    );
-
-    // TODO: improve efficiency here
-    // using a loop -- works but very inefficient
-    await Promise.all(
-      actionsToAdd.map((action) =>
-        strapi.query(TRANSFER_TOKEN_PERMISSION_UID).create({
-          data: { action, token: id },
-        })
-      )
-    );
+    if (attributes.permissions) {
+      const currentPermissionsResult = await strapi.entityService.load(
+        TRANSFER_TOKEN_UID,
+        updatedToken,
+        'permissions'
+      );
+
+      const currentPermissions = map('action', currentPermissionsResult || []);
+      const newPermissions = uniq(attributes.permissions);
+
+      const actionsToDelete = difference(currentPermissions, newPermissions);
+      const actionsToAdd = difference(newPermissions, currentPermissions);
+
+      // TODO: improve efficiency here
+      // method using a loop -- works but very inefficient
+      await Promise.all(
+        actionsToDelete.map((action) =>
+          strapi.query(TRANSFER_TOKEN_PERMISSION_UID).delete({
+            where: { action, token: id },
+          })
+        )
+      );
+
+      // TODO: improve efficiency here
+      // using a loop -- works but very inefficient
+      await Promise.all(
+        actionsToAdd.map((action) =>
+          strapi.query(TRANSFER_TOKEN_PERMISSION_UID).create({
+            data: { action, token: id },
+          })
+        )
+      );
+    }
 
     // retrieve permissions
     const permissionsFromDb = await strapi.entityService.load(

package/server/strategies/api-token.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const { castArray, isNil } = require('lodash/fp');
+const { castArray, isNil, isEmpty } = require('lodash/fp');
 const { UnauthorizedError, ForbiddenError } = require('@strapi/utils').errors;
 const constants = require('../services/constants');
 const { getService } = require('../utils');
@@ -78,6 +78,13 @@ const authenticate = async (ctx) => {
 const verify = (auth, config) => {
   const { credentials: apiToken, ability } = auth;
 
+  strapi.telemetry.send('didReceiveAPIRequest', {
+    eventProperties: {
+      authenticationMethod: auth?.strategy?.name || 'api-token',
+      isAuthenticated: !isEmpty(apiToken),
+    },
+  });
+
   if (!apiToken) {
     throw new UnauthorizedError('Token not found');
   }

package/server/validation/transfer/token.js

@@ -8,7 +8,11 @@ const transferTokenCreationSchema = yup
   .shape({
     name: yup.string().min(1).required(),
     description: yup.string().optional(),
-    permissions: yup.array().of(yup.string()).nullable(),
+    permissions: yup
+      .array()
+      .min(1)
+      .of(yup.string().oneOf(Object.values(constants.TRANSFER_TOKEN_TYPE)))
+      .required(),
     lifespan: yup
       .number()
       .min(1)
@@ -23,7 +27,11 @@ const transferTokenUpdateSchema = yup
   .shape({
     name: yup.string().min(1).notNull(),
     description: yup.string().nullable(),
-    permissions: yup.array().of(yup.string()).nullable(),
+    permissions: yup
+      .array()
+      .min(1)
+      .of(yup.string().oneOf(Object.values(constants.TRANSFER_TOKEN_TYPE)))
+      .nullable(),
   })
   .noUnknown()
   .strict();

package/webpack.config.js

@@ -9,6 +9,7 @@ const HtmlWebpackPlugin = require('html-webpack-plugin');
 const { ESBuildMinifyPlugin } = require('esbuild-loader');
 const WebpackBar = require('webpackbar');
 const ReactRefreshWebpackPlugin = require('@pmmmwh/react-refresh-webpack-plugin');
+const browserslist = require('browserslist');
 const browserslistToEsbuild = require('browserslist-to-esbuild');
 
 const alias = require('./webpack.alias');
@@ -52,7 +53,10 @@ module.exports = ({
 
   const excludeRegex = createPluginsExcludePath(pluginsPath);
 
-  const buildTarget = browserslistToEsbuild();
+  // Ensure we use the config in this directory, even if run with a different
+  // working directory
+  const browserslistConfig = browserslist.loadConfig({ path: __dirname });
+  const buildTarget = browserslistToEsbuild(browserslistConfig);
 
   return {
     mode: isProduction ? 'production' : 'development',
@@ -221,7 +225,7 @@ module.exports = ({
       alias,
       symlinks: false,
       extensions: ['.js', '.jsx', '.react.js', '.ts', '.tsx'],
-      mainFields: ['browser', 'jsnext:main', 'main'],
+      mainFields: ['browser', 'module', 'jsnext:main', 'main'],
       modules: ['node_modules', path.resolve(__dirname, 'node_modules')],
     },
     plugins: [

package/admin/src/content-manager/components/DynamicTable/CellContent/ReviewWorkflowsStage/index.js

@@ -1 +0,0 @@
-export * from './ReviewWorkflowsStage';

package/admin/src/content-manager/pages/App/LeftMenu/utils/index.js

@@ -1 +0,0 @@
-export { default as matchByTitle } from './matchByTitle';

package/admin/src/content-manager/pages/App/LeftMenu/utils/matchByTitle.js

@@ -1,24 +0,0 @@
-import matchSorter from 'match-sorter';
-import camelCase from 'lodash/camelCase';
-
-/**
- * @type {(links: array, search? : string) => array }
- */
-const matchByTitle = (links, search) =>
-  search
-    ? matchSorter(links, search.toLowerCase(), { keys: [(item) => item.title.toLowerCase()] })
-    : links.sort((link, nextLink) => {
-        const title = camelCase(link.title);
-        const nextTitle = camelCase(nextLink.title);
-
-        if (title < nextTitle) {
-          return -1;
-        }
-        if (title > nextTitle) {
-          return 1;
-        }
-
-        return 0;
-      });
-
-export default matchByTitle;