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

package/bin/strapi.js

@@ -18,9 +18,8 @@ const {
   promptEncryptionKey,
   confirmMessage,
   forceOption,
-  parseURL,
 } = require('../lib/commands/utils/commander');
-const { exitWith, ifOptions, assertUrlHasProtocol } = require('../lib/commands/utils/helpers');
+const { exitWith } = require('../lib/commands/utils/helpers');
 const {
   excludeOption,
   onlyOption,
@@ -273,88 +272,59 @@ program
   .option('-s, --silent', `Run the generation silently, without any output`, false)
   .action(getLocalScript('ts/generate-types'));
 
-// `$ strapi transfer`
-program
-  .command('transfer')
-  .description('Transfer data from one source to another')
-  .allowExcessArguments(false)
-  .addOption(
-    new Option('--from <sourceURL>', `URL of the remote Strapi instance to get data from`)
-      .argParser(parseURL)
-      .hideHelp() // Hidden until pull feature is released
-  )
-  .addOption(
-    new Option('--from-token <token>', `Transfer token for the remote Strapi source`).hideHelp() // Hidden until pull feature is released
-  )
-  .addOption(
-    new Option(
-      '--to <destinationURL>',
-      `URL of the remote Strapi instance to send data to`
-    ).argParser(parseURL)
-  )
-  .addOption(new Option('--to-token <token>', `Transfer token for the remote Strapi destination`))
-  .addOption(forceOption)
-  .addOption(excludeOption)
-  .addOption(onlyOption)
-  .hook('preAction', validateExcludeOnly)
-  // If --from is used, validate the URL and token
-  .hook(
-    'preAction',
-    ifOptions(
-      (opts) => opts.from,
-      async (thisCommand) => {
-        assertUrlHasProtocol(thisCommand.opts().from, ['https:', 'http:']);
-        if (!thisCommand.opts().fromToken) {
-          const answers = await inquirer.prompt([
-            {
-              type: 'password',
-              message: 'Please enter your transfer token for the remote Strapi source',
-              name: 'fromToken',
-            },
-          ]);
-          if (!answers.fromToken?.length) {
-            exitWith(0, 'No token entered, aborting transfer.');
-          }
-          thisCommand.opts().fromToken = answers.fromToken;
-        }
-      }
-    )
-  )
-  // If --to is used, validate the URL, token, and confirm restore
-  .hook(
-    'preAction',
-    ifOptions(
-      (opts) => opts.to,
-      async (thisCommand) => {
-        assertUrlHasProtocol(thisCommand.opts().to, ['https:', 'http:']);
-        if (!thisCommand.opts().toToken) {
-          const answers = await inquirer.prompt([
-            {
-              type: 'password',
-              message: 'Please enter your transfer token for the remote Strapi destination',
-              name: 'toToken',
-            },
-          ]);
-          if (!answers.toToken?.length) {
-            exitWith(0, 'No token entered, aborting transfer.');
-          }
-          thisCommand.opts().toToken = answers.toToken;
-        }
-
-        await confirmMessage(
-          'The transfer will delete all data in the remote database and media files. Are you sure you want to proceed?'
-        )(thisCommand);
-      }
-    )
-  )
-  // .hook(
-  //   'preAction',
-  //   ifOptions(
-  //     (opts) => !opts.from && !opts.to,
-  //     () => exitWith(1, 'At least one source (from) or destination (to) option must be provided')
-  //   )
-  // )
-  .action(getLocalScript('transfer/transfer'));
+// if (process.env.STRAPI_EXPERIMENTAL === 'true') {
+//   // `$ strapi transfer`
+//   program
+//     .command('transfer')
+//     .description('Transfer data from one source to another')
+//     .allowExcessArguments(false)
+//     .addOption(
+//       new Option(
+//         '--from <sourceURL>',
+//         `URL of the remote Strapi instance to get data from`
+//       ).argParser(parseURL)
+//     )
+//     .addOption(
+//       new Option(
+//         '--to <destinationURL>',
+//         `URL of the remote Strapi instance to send data to`
+//       ).argParser(parseURL)
+//     )
+//     .addOption(forceOption)
+//     // Validate URLs
+//     .hook(
+//       'preAction',
+//       ifOptions(
+//         (opts) => opts.from,
+//         (thisCommand) => assertUrlHasProtocol(thisCommand.opts().from, ['https:', 'http:'])
+//       )
+//     )
+//     .hook(
+//       'preAction',
+//       ifOptions(
+//         (opts) => opts.to,
+//         (thisCommand) => assertUrlHasProtocol(thisCommand.opts().to, ['https:', 'http:'])
+//       )
+//     )
+//     .hook(
+//       'preAction',
+//       ifOptions(
+//         (opts) => !opts.from && !opts.to,
+//         () => exitWith(1, 'At least one source (from) or destination (to) option must be provided')
+//       )
+//     )
+//     .addOption(forceOption)
+//     .addOption(excludeOption)
+//     .addOption(onlyOption)
+//     .hook('preAction', validateExcludeOnly)
+//     .hook(
+//       'preAction',
+//       confirmMessage(
+//         'The import will delete all data in the remote database. Are you sure you want to proceed?'
+//       )
+//     )
+//     .action(getLocalScript('transfer/transfer'));
+// }
 
 // `$ strapi export`
 program
@@ -450,7 +420,7 @@ program
   .hook(
     'preAction',
     confirmMessage(
-      'The import will delete all data in your database and media files. Are you sure you want to proceed?'
+      'The import will delete all data in your database. Are you sure you want to proceed?'
     )
   )
   .action(getLocalScript('transfer/import'));

package/ee/license.js

@@ -10,7 +10,7 @@ const machineId = require('../lib/utils/machine-id');
 const DEFAULT_FEATURES = {
   bronze: [],
   silver: [],
-  gold: ['sso', { name: 'audit-logs', options: { retentionDays: 90 } }],
+  gold: ['sso', { name: 'audit-logs', options: { retentionDays: 90 } }, 'review-workflows'],
 };
 
 const publicKey = fs.readFileSync(join(__dirname, 'resources/key.pub'));

package/lib/commands/transfer/export.js

@@ -19,7 +19,6 @@ const {
   createStrapiInstance,
   formatDiagnostic,
 } = require('./utils');
-const { exitWith } = require('../utils/helpers');
 
 /**
  * @typedef ExportCommandOptions Options given to the CLI import command
@@ -30,6 +29,8 @@ const { exitWith } = require('../utils/helpers');
  * @property {boolean} [compress] Used to compress the final archive
  */
 
+const logger = console;
+
 const BYTES_IN_MB = 1024 * 1024;
 
 /**
@@ -42,7 +43,8 @@ const BYTES_IN_MB = 1024 * 1024;
 module.exports = async (opts) => {
   // Validate inputs from Commander
   if (!isObject(opts)) {
-    exitWith(1, 'Could not parse command arguments');
+    logger.error('Could not parse command arguments');
+    process.exit(1);
   }
 
   const strapi = await createStrapiInstance();
@@ -90,34 +92,33 @@ module.exports = async (opts) => {
   };
 
   progress.on('transfer::start', async () => {
-    console.log(`Starting export...`);
+    logger.log(`Starting export...`);
     await strapi.telemetry.send('didDEITSProcessStart', getTelemetryPayload());
   });
 
-  let results;
-  let outFile;
   try {
-    results = await engine.transfer();
-    outFile = results.destination.file.path;
+    const results = await engine.transfer();
+    const outFile = results.destination.file.path;
+
+    const table = buildTransferTable(results.engine);
+    logger.log(table.toString());
+
     const outFileExists = await fs.pathExists(outFile);
     if (!outFileExists) {
       throw new TransferEngineTransferError(`Export file not created "${outFile}"`);
     }
+
+    logger.log(`${chalk.bold('Export process has been completed successfully!')}`);
+    logger.log(`Export archive is in ${chalk.green(outFile)}`);
   } catch {
     await strapi.telemetry.send('didDEITSProcessFail', getTelemetryPayload());
-    exitWith(1, 'Export process failed.');
+    logger.error('Export process failed.');
+    process.exit(1);
   }
 
+  // Note: Telemetry can't be sent in a finish event, because it runs async after this block but we can't await it, so if process.exit is used it won't send
   await strapi.telemetry.send('didDEITSProcessFinish', getTelemetryPayload());
-  try {
-    const table = buildTransferTable(results.engine);
-    console.log(table.toString());
-  } catch (e) {
-    console.error('There was an error displaying the results of the transfer.');
-  }
-
-  console.log(`${chalk.bold('Export process has been completed successfully!')}`);
-  exitWith(0, `Export archive is in ${chalk.green(outFile)}`);
+  process.exit(0);
 };
 
 /**

package/lib/commands/transfer/import.js

@@ -20,16 +20,18 @@ const {
   createStrapiInstance,
   formatDiagnostic,
 } = require('./utils');
-const { exitWith } = require('../utils/helpers');
 
 /**
  * @typedef {import('@strapi/data-transfer').ILocalFileSourceProviderOptions} ILocalFileSourceProviderOptions
  */
 
+const logger = console;
+
 module.exports = async (opts) => {
   // validate inputs from Commander
   if (!isObject(opts)) {
-    exitWith(1, 'Could not parse arguments');
+    logger.error('Could not parse arguments');
+    process.exit(1);
   }
 
   /**
@@ -98,30 +100,27 @@ module.exports = async (opts) => {
   };
 
   progress.on('transfer::start', async () => {
-    console.log('Starting import...');
+    logger.info('Starting import...');
     await strapiInstance.telemetry.send('didDEITSProcessStart', getTelemetryPayload());
   });
 
-  let results;
   try {
-    results = await engine.transfer();
+    const results = await engine.transfer();
+    const table = buildTransferTable(results.engine);
+    logger.info(table.toString());
+
+    logger.info('Import process has been completed successfully!');
   } catch (e) {
     await strapiInstance.telemetry.send('didDEITSProcessFail', getTelemetryPayload());
-    console.error('Import process failed.');
+    logger.error('Import process failed.');
     process.exit(1);
   }
 
-  try {
-    const table = buildTransferTable(results.engine);
-    console.log(table.toString());
-  } catch (e) {
-    console.error('There was an error displaying the results of the transfer.');
-  }
-
+  // Note: Telemetry can't be sent in a finish event, because it runs async after this block but we can't await it, so if process.exit is used it won't send
   await strapiInstance.telemetry.send('didDEITSProcessFinish', getTelemetryPayload());
   await strapiInstance.destroy();
 
-  exitWith(0, 'Import process has been completed successfully!');
+  process.exit(0);
 };
 
 /**

package/lib/commands/transfer/transfer.js

@@ -17,28 +17,28 @@ const {
   DEFAULT_IGNORED_CONTENT_TYPES,
   formatDiagnostic,
 } = require('./utils');
-const { exitWith } = require('../utils/helpers');
+
+const logger = console;
 
 /**
  * @typedef TransferCommandOptions Options given to the CLI transfer command
  *
  * @property {URL|undefined} [to] The url of a remote Strapi to use as remote destination
  * @property {URL|undefined} [from] The url of a remote Strapi to use as remote source
- * @property {string|undefined} [toToken] The transfer token for the remote Strapi destination
- * @property {string|undefined} [fromToken] The transfer token for the remote Strapi source
  */
 
 /**
  * Transfer command.
  *
- * Transfers data between local Strapi and remote Strapi instances
+ * It transfers data from a local file to a local strapi instance
  *
  * @param {TransferCommandOptions} opts
  */
 module.exports = async (opts) => {
   // Validate inputs from Commander
   if (!isObject(opts)) {
-    exitWith(1, 'Could not parse command arguments');
+    logger.error('Could not parse command arguments');
+    process.exit(1);
   }
 
   const strapi = await createStrapiInstance();
@@ -47,7 +47,8 @@ module.exports = async (opts) => {
   let destination;
 
   if (!opts.from && !opts.to) {
-    exitWith(1, 'At least one source (from) or destination (to) option must be provided');
+    logger.error('At least one source (from) or destination (to) option must be provided');
+    process.exit(1);
   }
 
   // if no URL provided, use local Strapi
@@ -58,7 +59,8 @@ module.exports = async (opts) => {
   }
   // if URL provided, set up a remote source provider
   else {
-    exitWith(1, `Remote Strapi source provider not yet implemented`);
+    logger.error(`Remote Strapi source provider not yet implemented`);
+    process.exit(1);
   }
 
   // if no URL provided, use local Strapi
@@ -69,16 +71,9 @@ module.exports = async (opts) => {
   }
   // if URL provided, set up a remote destination provider
   else {
-    if (!opts.toToken) {
-      exitWith(1, 'Missing token for remote destination');
-    }
-
     destination = createRemoteStrapiDestinationProvider({
       url: opts.to,
-      auth: {
-        type: 'token',
-        token: opts.toToken,
-      },
+      auth: false,
       strategy: 'restore',
       restore: {
         entities: { exclude: DEFAULT_IGNORED_CONTENT_TYPES },
@@ -87,11 +82,12 @@ module.exports = async (opts) => {
   }
 
   if (!source || !destination) {
-    exitWith(1, 'Could not create providers');
+    logger.error('Could not create providers');
+    process.exit(1);
   }
 
   const engine = createTransferEngine(source, destination, {
-    versionStrategy: 'exact',
+    versionStrategy: 'strict',
     schemaStrategy: 'strict',
     transforms: {
       links: [
@@ -116,15 +112,18 @@ module.exports = async (opts) => {
 
   engine.diagnostics.onDiagnostic(formatDiagnostic('transfer'));
 
-  let results;
   try {
-    console.log(`Starting transfer...`);
-    results = await engine.transfer();
+    logger.log(`Starting transfer...`);
+
+    const results = await engine.transfer();
+
+    const table = buildTransferTable(results.engine);
+    logger.log(table.toString());
+
+    logger.log(`${chalk.bold('Transfer process has been completed successfully!')}`);
+    process.exit(0);
   } catch (e) {
-    exitWith(1, 'Transfer process failed.');
+    logger.error('Transfer process failed.');
+    process.exit(1);
   }
-
-  const table = buildTransferTable(results.engine);
-  console.log(table.toString());
-  exitWith(0, `${chalk.bold('Transfer process has been completed successfully!')}`);
 };

package/lib/commands/transfer/utils.js

@@ -82,8 +82,6 @@ const DEFAULT_IGNORED_CONTENT_TYPES = [
   'admin::role',
   'admin::api-token',
   'admin::api-token-permission',
-  'admin::transfer-token',
-  'admin::transfer-token-permission',
   'admin::audit-log',
 ];
 

package/lib/commands/utils/helpers.js

@@ -36,29 +36,22 @@ const readableBytes = (bytes, decimals = 1, padStart = 0) => {
  *
  * @param {number} code Code to exit process with
  * @param {string | Array} message Message(s) to display before exiting
- * @param {Object} options
- * @param {console} options.logger - logger object, defaults to console
- * @param {process} options.prc - process object, defaults to process
- *
  */
-const exitWith = (code, message = undefined, options = {}) => {
-  const { logger = console, prc = process } = options;
-
-  const log = (message) => {
+const exitWith = (code, message = undefined) => {
+  const logger = (message) => {
     if (code === 0) {
-      logger.log(chalk.green(message));
+      console.log(chalk.green(message));
     } else {
-      logger.error(chalk.red(message));
+      console.error(chalk.red(message));
     }
   };
 
   if (isString(message)) {
-    log(message);
+    logger(message);
   } else if (isArray(message)) {
-    message.forEach((msg) => log(msg));
+    message.forEach((msg) => logger(msg));
   }
-
-  prc.exit(code);
+  process.exit(code);
 };
 
 /**

package/lib/middlewares/cors.js

@@ -19,6 +19,14 @@ module.exports = (config) => {
   const { origin, expose, maxAge, credentials, methods, headers, keepHeadersOnError } =
     defaultsDeep(defaults, config);
 
+  if (config.enabled !== undefined) {
+    strapi.log.warn(
+      'The strapi::cors middleware no longer supports the `enabled` option. Using it' +
+        ' to conditionally enable CORS might cause an insecure default. To disable strapi::cors, remove it from' +
+        ' the exported array in config/middleware.js'
+    );
+  }
+
   return cors({
     async origin(ctx) {
       let originList;

package/lib/middlewares/public/index.js

@@ -77,9 +77,10 @@ module.exports = (config, { strapi }) => {
         }),
         config: { auth: false },
       },
+      // All other public GET-routes except /uploads/(.*) which is handled in upload middleware
       {
         method: 'GET',
-        path: '/(.*)',
+        path: '/((?!uploads/).+)',
         handler: koaStatic(strapi.dirs.static.public, {
           maxage: maxAge,
           defer: true,

package/lib/services/auth/index.js

@@ -43,28 +43,7 @@ const createAuthentication = () => {
         return next();
       }
 
-      const routeStrategies = strategies[route.info.type];
-      const configStrategies = config?.strategies ?? routeStrategies ?? [];
-
-      const strategiesToUse = configStrategies.reduce((acc, strategy) => {
-        // Resolve by strategy name
-        if (typeof strategy === 'string') {
-          const routeStrategy = routeStrategies.find((rs) => rs.name === strategy);
-
-          if (routeStrategy) {
-            acc.push(routeStrategy);
-          }
-        }
-
-        // Use the given strategy as is
-        else if (typeof strategy === 'object') {
-          validStrategy(strategy);
-
-          acc.push(strategy);
-        }
-
-        return acc;
-      }, []);
+      const strategiesToUse = strategies[route.info.type];
 
       for (const strategy of strategiesToUse) {
         const result = await strategy.authenticate(ctx);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/strapi",
-  "version": "4.7.0-beta.0",
+  "version": "4.9.0-alpha.0",
   "description": "An open source headless CMS solution to create and manage your own API. It provides a powerful dashboard and features to make your life easier. Databases supported: MySQL, MariaDB, PostgreSQL, SQLite",
   "keywords": [
     "strapi",
@@ -81,19 +81,19 @@
   "dependencies": {
     "@koa/cors": "3.4.3",
     "@koa/router": "10.1.1",
-    "@strapi/admin": "4.7.0-beta.0",
-    "@strapi/data-transfer": "4.7.0-beta.0",
-    "@strapi/database": "4.7.0-beta.0",
-    "@strapi/generate-new": "4.7.0-beta.0",
-    "@strapi/generators": "4.7.0-beta.0",
-    "@strapi/logger": "4.7.0-beta.0",
-    "@strapi/permissions": "4.7.0-beta.0",
-    "@strapi/plugin-content-manager": "4.7.0-beta.0",
-    "@strapi/plugin-content-type-builder": "4.7.0-beta.0",
-    "@strapi/plugin-email": "4.7.0-beta.0",
-    "@strapi/plugin-upload": "4.7.0-beta.0",
-    "@strapi/typescript-utils": "4.7.0-beta.0",
-    "@strapi/utils": "4.7.0-beta.0",
+    "@strapi/admin": "4.9.0-alpha.0",
+    "@strapi/data-transfer": "4.9.0-alpha.0",
+    "@strapi/database": "4.9.0-alpha.0",
+    "@strapi/generate-new": "4.9.0-alpha.0",
+    "@strapi/generators": "4.9.0-alpha.0",
+    "@strapi/logger": "4.9.0-alpha.0",
+    "@strapi/permissions": "4.9.0-alpha.0",
+    "@strapi/plugin-content-manager": "4.9.0-alpha.0",
+    "@strapi/plugin-content-type-builder": "4.9.0-alpha.0",
+    "@strapi/plugin-email": "4.9.0-alpha.0",
+    "@strapi/plugin-upload": "4.9.0-alpha.0",
+    "@strapi/typescript-utils": "4.9.0-alpha.0",
+    "@strapi/utils": "4.9.0-alpha.0",
     "bcryptjs": "2.4.3",
     "boxen": "5.1.2",
     "chalk": "4.1.2",
@@ -118,7 +118,7 @@
     "koa-favicon": "2.1.0",
     "koa-helmet": "6.1.0",
     "koa-ip": "^2.1.2",
-    "koa-session": "6.2.0",
+    "koa-session": "6.4.0",
     "koa-static": "5.0.0",
     "lodash": "4.17.21",
     "mime-types": "2.1.35",
@@ -135,12 +135,12 @@
     "uuid": "^8.3.2"
   },
   "devDependencies": {
-    "supertest": "6.2.4",
+    "supertest": "6.3.3",
     "typescript": "4.6.2"
   },
   "engines": {
     "node": ">=14.19.1 <=18.x.x",
     "npm": ">=6.0.0"
   },
-  "gitHead": "880ba7af867ad43c4cc45b47467b76a9b5606b6e"
+  "gitHead": "35f783d0dc07db101e7e62cb4d682f751551f452"
 }