@strapi/admin 4.7.0-beta.0 → 4.9.0-alpha.0

package/server/controllers/admin.js

@@ -3,11 +3,9 @@
 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');
 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
 const ee = require('@strapi/strapi/lib/utils/ee');
@@ -19,15 +17,6 @@ const {
 } = require('../validation/project-settings');
 const { getService } = require('../utils');
 
-const PLUGIN_NAME_REGEX = /^[A-Za-z][A-Za-z0-9-_]+$/;
-
-/**
- * Validates a plugin name format
- */
-const isValidPluginName = (plugin) => {
-  return _.isString(plugin) && !_.isEmpty(plugin) && PLUGIN_NAME_REGEX.test(plugin);
-};
-
 /**
  * A set of functions called "actions" for `Admin`
  */
@@ -146,28 +135,6 @@ module.exports = {
     };
   },
 
-  async installPlugin(ctx) {
-    try {
-      const { plugin } = ctx.request.body;
-
-      if (!isValidPluginName(plugin)) {
-        throw new ValidationError('Invalid plugin name');
-      }
-
-      strapi.reload.isWatching = false;
-
-      strapi.log.info(`Installing ${plugin}...`);
-      await execa('npm', ['run', 'strapi', '--', 'install', plugin]);
-
-      ctx.send({ ok: true });
-
-      strapi.reload();
-    } catch (err) {
-      strapi.reload.isWatching = true;
-      throw err;
-    }
-  },
-
   async plugins(ctx) {
     const enabledPlugins = strapi.config.get('enabledPlugins');
 
@@ -180,26 +147,4 @@ module.exports = {
 
     ctx.send({ plugins });
   },
-
-  async uninstallPlugin(ctx) {
-    try {
-      const { plugin } = ctx.params;
-
-      if (!isValidPluginName(plugin)) {
-        throw new ValidationError('Invalid plugin name');
-      }
-
-      strapi.reload.isWatching = false;
-
-      strapi.log.info(`Uninstalling ${plugin}...`);
-      await execa('npm', ['run', 'strapi', '--', 'uninstall', plugin, '-d']);
-
-      ctx.send({ ok: true });
-
-      strapi.reload();
-    } catch (err) {
-      strapi.reload.isWatching = true;
-      throw err;
-    }
-  },
 };

package/server/controllers/api-token.js

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

package/server/controllers/index.js

@@ -7,7 +7,6 @@ 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/register.js

@@ -1,9 +1,9 @@
 'use strict';
 
-const registerAdminPanelRoute = require('./routes/serve-admin-panel');
+// 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,4 +16,11 @@ 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/admin.js

@@ -68,32 +68,4 @@ module.exports = [
       ],
     },
   },
-  {
-    method: 'POST',
-    path: '/plugins/install',
-    handler: 'admin.installPlugin',
-    config: {
-      policies: [
-        'admin::isAuthenticatedAdmin',
-        {
-          name: 'admin::hasPermissions',
-          config: { actions: ['admin::marketplace.plugins.install'] },
-        },
-      ],
-    },
-  },
-  {
-    method: 'DELETE',
-    path: '/plugins/uninstall/:plugin',
-    handler: 'admin.uninstallPlugin',
-    config: {
-      policies: [
-        'admin::isAuthenticatedAdmin',
-        {
-          name: 'admin::hasPermissions',
-          config: { actions: ['admin::marketplace.plugins.uninstall'] },
-        },
-      ],
-    },
-  },
 ];

package/server/routes/index.js

@@ -8,7 +8,6 @@ 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,
@@ -19,5 +18,4 @@ module.exports = [
   ...webhooks,
   ...apiTokens,
   ...contentApi,
-  ...transfer,
 ];

package/server/services/api-token.js

@@ -1,7 +1,8 @@
 'use strict';
 
 const crypto = require('crypto');
-const { omit, difference, isNil, isEmpty, map, isArray, uniq } = require('lodash/fp');
+const { isNil } = require('lodash/fp');
+const { omit, difference, isEmpty, map, isArray, uniq } = require('lodash/fp');
 const { ValidationError, NotFoundError } = require('@strapi/utils').errors;
 const constants = require('./constants');
 
@@ -77,7 +78,7 @@ const assertCustomTokenPermissionsValidity = (attributes) => {
 };
 
 /**
- * Assert that a token's lifespan is valid
+ * Assert that a token's permissions attribute is valid for its type
  *
  * @param {ApiToken} token
  */

package/server/services/constants.js

@@ -24,10 +24,4 @@ module.exports = {
     DAYS_30: 30 * DAY_IN_MS,
     DAYS_90: 90 * DAY_IN_MS,
   },
-  TRANSFER_TOKEN_LIFESPANS: {
-    UNLIMITED: null,
-    DAYS_7: 7 * DAY_IN_MS,
-    DAYS_30: 30 * DAY_IN_MS,
-    DAYS_90: 90 * DAY_IN_MS,
-  },
 };

package/server/services/index.js

@@ -13,6 +13,5 @@ module.exports = {
   auth: require('./auth'),
   action: require('./action'),
   'api-token': require('./api-token'),
-  transfer: require('./transfer'),
   'project-settings': require('./project-settings'),
 };

package/server/strategies/api-token.js

@@ -24,8 +24,7 @@ const extractToken = (ctx) => {
 /**
  * Authenticate the validity of the token
  *
- *  @type {import('.').AuthenticateFunction}
- */
+ *  @type {import('.').AuthenticateFunction} */
 const authenticate = async (ctx) => {
   const apiTokenService = getService('api-token');
   const token = extractToken(ctx);
@@ -73,8 +72,7 @@ const authenticate = async (ctx) => {
 /**
  * Verify the token has the required abilities for the requested scope
  *
- *  @type {import('.').VerifyFunction}
- */
+ *  @type {import('.').VerifyFunction} */
 const verify = (auth, config) => {
   const { credentials: apiToken, ability } = auth;
 

package/server/strategies/index.js

@@ -21,6 +21,5 @@
  */
 module.exports = {
   admin: require('./admin'),
-  'data-transfer': require('./data-transfer'),
   'api-token': require('./api-token'),
 };

package/server/utils/index.d.ts

@@ -7,7 +7,6 @@ import * as token from '../services/token';
 import * as auth from '../services/auth';
 import * as apiToken from '../services/api-token';
 import * as projectSettings from '../services/project-settings';
-import * as transfer from '../services/transfer';
 
 type S = {
   role: typeof role;
@@ -19,7 +18,6 @@ type S = {
   metrics: typeof metrics;
   'api-token': typeof apiToken;
   'project-settings': typeof projectSettings;
-  transfer: typeof transfer;
 };
 
 export function getService<T extends keyof S>(name: T): S[T];

package/server/validation/api-tokens.js

@@ -10,7 +10,12 @@ const apiTokenCreationSchema = yup
     description: yup.string().optional(),
     type: yup.string().oneOf(Object.values(constants.API_TOKEN_TYPE)).required(),
     permissions: yup.array().of(yup.string()).nullable(),
-    lifespan: yup.number().min(1).oneOf(Object.values(constants.API_TOKEN_LIFESPANS)).nullable(),
+    lifespan: yup
+      .number()
+      .integer()
+      .min(1)
+      .oneOf(Object.values(constants.API_TOKEN_LIFESPANS))
+      .nullable(),
   })
   .noUnknown()
   .strict();

package/webpack.config.js

@@ -8,7 +8,6 @@ const ForkTsCheckerPlugin = require('fork-ts-checker-webpack-plugin');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 const { ESBuildMinifyPlugin } = require('esbuild-loader');
 const WebpackBar = require('webpackbar');
-const NodePolyfillPlugin = require('node-polyfill-webpack-plugin');
 const ReactRefreshWebpackPlugin = require('@pmmmwh/react-refresh-webpack-plugin');
 const browserslistToEsbuild = require('browserslist-to-esbuild');
 
@@ -232,8 +231,6 @@ module.exports = ({
       }),
       new webpack.DefinePlugin(envVariables),
 
-      new NodePolyfillPlugin(),
-
       new ForkTsCheckerPlugin({
         typescript: {
           configFile: tsConfigFilePath,

package/admin/src/pages/SettingsPage/components/Tokens/FormiTokenContainer/LifeSpanInput.js

@@ -1,96 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { useIntl } from 'react-intl';
-import { usePersistentState } from '@strapi/helper-plugin';
-import { Select, Option } from '@strapi/design-system/Select';
-import { Typography } from '@strapi/design-system/Typography';
-import { getDateOfExpiration } from '../../../pages/ApiTokens/EditView/utils';
-
-const LifeSpanInput = ({ token, errors, values, onChange, disabled }) => {
-  const { formatMessage } = useIntl();
-  const [lang] = usePersistentState('strapi-admin-language', 'en');
-
-  return (
-    <>
-      <Select
-        name="lifespan"
-        label={formatMessage({
-          id: 'Settings.apiTokens.form.duration',
-          defaultMessage: 'Token duration',
-        })}
-        value={values.lifespan !== null ? values.lifespan : '0'}
-        error={
-          errors.lifespan
-            ? formatMessage(
-                errors.lifespan?.id
-                  ? errors.lifespan
-                  : { id: errors.lifespan, defaultMessage: errors.lifespan }
-              )
-            : null
-        }
-        onChange={(value) => {
-          onChange({ target: { name: 'lifespan', value } });
-        }}
-        required
-        disabled={disabled}
-        placeholder="Select"
-      >
-        <Option value="604800000">
-          {formatMessage({
-            id: 'Settings.apiTokens.duration.7-days',
-            defaultMessage: '7 days',
-          })}
-        </Option>
-        <Option value="2592000000">
-          {formatMessage({
-            id: 'Settings.apiTokens.duration.30-days',
-            defaultMessage: '30 days',
-          })}
-        </Option>
-        <Option value="7776000000">
-          {formatMessage({
-            id: 'Settings.apiTokens.duration.90-days',
-            defaultMessage: '90 days',
-          })}
-        </Option>
-        <Option value="0">
-          {formatMessage({
-            id: 'Settings.apiTokens.duration.unlimited',
-            defaultMessage: 'Unlimited',
-          })}
-        </Option>
-      </Select>
-      <Typography variant="pi" textColor="neutral600">
-        {disabled &&
-          `${formatMessage({
-            id: 'Settings.apiTokens.duration.expiration-date',
-            defaultMessage: 'Expiration date',
-          })}: ${getDateOfExpiration(token?.createdAt, parseInt(values.lifespan, 10, lang))}`}
-      </Typography>
-    </>
-  );
-};
-
-LifeSpanInput.propTypes = {
-  errors: PropTypes.string,
-  onChange: PropTypes.func.isRequired,
-  values: PropTypes.oneOfType([PropTypes.number, PropTypes.string]).isRequired,
-  disabled: PropTypes.bool.isRequired,
-  token: PropTypes.shape({
-    id: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
-    type: PropTypes.string,
-    lifespan: PropTypes.string,
-    name: PropTypes.string,
-    accessKey: PropTypes.string,
-    permissions: PropTypes.array,
-    description: PropTypes.string,
-    createdAt: PropTypes.string,
-  }),
-};
-
-LifeSpanInput.defaultProps = {
-  errors: {},
-  token: {},
-};
-
-export default LifeSpanInput;

package/admin/src/pages/SettingsPage/components/Tokens/LifeSpanInput/index.js

@@ -1,98 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { useIntl } from 'react-intl';
-import { Select, Option } from '@strapi/design-system/Select';
-import { Typography } from '@strapi/design-system/Typography';
-import { getDateOfExpiration } from '../../../pages/ApiTokens/EditView/utils';
-
-const LifeSpanInput = ({ token, errors, values, onChange, isCreating }) => {
-  const { formatMessage } = useIntl();
-
-  return (
-    <>
-      <Select
-        name="lifespan"
-        label={formatMessage({
-          id: 'Settings.apiTokens.form.duration',
-          defaultMessage: 'Token duration',
-        })}
-        value={values.lifespan !== null ? values.lifespan : '0'}
-        error={
-          errors.lifespan
-            ? formatMessage(
-                errors.lifespan?.id
-                  ? errors.lifespan
-                  : { id: errors.lifespan, defaultMessage: errors.lifespan }
-              )
-            : null
-        }
-        onChange={(value) => {
-          onChange({ target: { name: 'lifespan', value } });
-        }}
-        required
-        disabled={!isCreating}
-        placeholder="Select"
-      >
-        <Option value="604800000">
-          {formatMessage({
-            id: 'Settings.tokens.duration.7-days',
-            defaultMessage: '7 days',
-          })}
-        </Option>
-        <Option value="2592000000">
-          {formatMessage({
-            id: 'Settings.tokens.duration.30-days',
-            defaultMessage: '30 days',
-          })}
-        </Option>
-        <Option value="7776000000">
-          {formatMessage({
-            id: 'Settings.tokens.duration.90-days',
-            defaultMessage: '90 days',
-          })}
-        </Option>
-        <Option value="0">
-          {formatMessage({
-            id: 'Settings.tokens.duration.unlimited',
-            defaultMessage: 'Unlimited',
-          })}
-        </Option>
-      </Select>
-      <Typography variant="pi" textColor="neutral600">
-        {!isCreating &&
-          `${formatMessage({
-            id: 'Settings.tokens.duration.expiration-date',
-            defaultMessage: 'Expiration date',
-          })}: ${getDateOfExpiration(token?.createdAt, parseInt(values.lifespan, 10))}`}
-      </Typography>
-    </>
-  );
-};
-
-LifeSpanInput.propTypes = {
-  errors: PropTypes.shape({
-    lifespan: PropTypes.string,
-  }),
-  onChange: PropTypes.func.isRequired,
-  values: PropTypes.shape({
-    lifespan: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
-  }).isRequired,
-  isCreating: PropTypes.bool.isRequired,
-  token: PropTypes.shape({
-    id: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
-    type: PropTypes.string,
-    lifespan: PropTypes.string,
-    name: PropTypes.string,
-    accessKey: PropTypes.string,
-    permissions: PropTypes.array,
-    description: PropTypes.string,
-    createdAt: PropTypes.string,
-  }),
-};
-
-LifeSpanInput.defaultProps = {
-  errors: {},
-  token: {},
-};
-
-export default LifeSpanInput;

package/admin/src/pages/SettingsPage/components/Tokens/Regenerate/index.js

@@ -1,73 +0,0 @@
-import React, { useState } from 'react';
-import PropTypes from 'prop-types';
-import { useIntl } from 'react-intl';
-import { Button } from '@strapi/design-system/Button';
-import Refresh from '@strapi/icons/Refresh';
-import { ConfirmDialog } from '@strapi/helper-plugin';
-import { useRegenerate } from '../../../../../hooks';
-
-export const Regenerate = ({ onRegenerate, idToRegenerate, backUrl }) => {
-  const { formatMessage } = useIntl();
-  const [showConfirmDialog, setShowConfirmDialog] = useState(false);
-  const { regenerateData, isLoadingConfirmation } = useRegenerate(
-    backUrl,
-    idToRegenerate,
-    onRegenerate
-  );
-  const handleConfirmRegeneration = async () => {
-    regenerateData();
-    setShowConfirmDialog(false);
-  };
-
-  return (
-    <>
-      <Button
-        startIcon={<Refresh />}
-        type="button"
-        size="S"
-        variant="tertiary"
-        onClick={() => setShowConfirmDialog(true)}
-        name="regenerate"
-      >
-        {formatMessage({
-          id: 'Settings.apiTokens.regenerate',
-          defaultMessage: 'Regenerate',
-        })}
-      </Button>
-
-      <ConfirmDialog
-        bodyText={{
-          id: 'Settings.apiTokens.popUpWarning.message',
-          defaultMessage: 'Are you sure you want to regenerate this token?',
-        }}
-        iconRightButton={<Refresh />}
-        isConfirmButtonLoading={isLoadingConfirmation}
-        isOpen={showConfirmDialog}
-        onToggleDialog={() => setShowConfirmDialog(false)}
-        onConfirm={handleConfirmRegeneration}
-        leftButtonText={{
-          id: 'Settings.apiTokens.Button.cancel',
-          defaultMessage: 'Cancel',
-        }}
-        rightButtonText={{
-          id: 'Settings.apiTokens.Button.regenerate',
-          defaultMessage: 'Regenerate',
-        }}
-        title={{
-          id: 'Settings.apiTokens.RegenerateDialog.title',
-          defaultMessage: 'Regenerate token',
-        }}
-      />
-    </>
-  );
-};
-
-Regenerate.defaultProps = { onRegenerate() {} };
-
-Regenerate.propTypes = {
-  onRegenerate: PropTypes.func,
-  idToRegenerate: PropTypes.oneOfType([PropTypes.number, PropTypes.string]).isRequired,
-  backUrl: PropTypes.string.isRequired,
-};
-
-export default Regenerate;