@strapi/strapi 4.6.2 → 4.7.0-exp.117579f4c13806c2cd518e7d7d2f9d0c8a20107d

package/bin/strapi.js

@@ -18,8 +18,9 @@ const {
   promptEncryptionKey,
   confirmMessage,
   forceOption,
+  parseURL,
 } = require('../lib/commands/utils/commander');
-const { exitWith } = require('../lib/commands/utils/helpers');
+const { exitWith, ifOptions, assertUrlHasProtocol } = require('../lib/commands/utils/helpers');
 const {
   excludeOption,
   onlyOption,
@@ -272,59 +273,88 @@ program
   .option('-s, --silent', `Run the generation silently, without any output`, false)
   .action(getLocalScript('ts/generate-types'));
 
-// 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 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'));
 
 // `$ strapi export`
 program
@@ -420,7 +450,7 @@ program
   .hook(
     'preAction',
     confirmMessage(
-      'The import will delete all data in your database. Are you sure you want to proceed?'
+      'The import will delete all data in your database and media files. Are you sure you want to proceed?'
     )
   )
   .action(getLocalScript('transfer/import'));

package/lib/commands/transfer/export.js

@@ -18,8 +18,9 @@ const {
   DEFAULT_IGNORED_CONTENT_TYPES,
   createStrapiInstance,
   formatDiagnostic,
+  loadersFactory,
 } = require('./utils');
-
+const { exitWith } = require('../utils/helpers');
 /**
  * @typedef ExportCommandOptions Options given to the CLI import command
  *
@@ -29,8 +30,6 @@ const {
  * @property {boolean} [compress] Used to compress the final archive
  */
 
-const logger = console;
-
 const BYTES_IN_MB = 1024 * 1024;
 
 /**
@@ -43,8 +42,7 @@ const BYTES_IN_MB = 1024 * 1024;
 module.exports = async (opts) => {
   // Validate inputs from Commander
   if (!isObject(opts)) {
-    logger.error('Could not parse command arguments');
-    process.exit(1);
+    exitWith(1, 'Could not parse command arguments');
   }
 
   const strapi = await createStrapiInstance();
@@ -82,6 +80,20 @@ module.exports = async (opts) => {
 
   const progress = engine.progress.stream;
 
+  const { updateLoader } = loadersFactory();
+
+  progress.on(`stage::start`, ({ stage, data }) => {
+    updateLoader(stage, data).start();
+  });
+
+  progress.on('stage::finish', ({ stage, data }) => {
+    updateLoader(stage, data).succeed();
+  });
+
+  progress.on('stage::progress', ({ stage, data }) => {
+    updateLoader(stage, data);
+  });
+
   const getTelemetryPayload = (/* payload */) => {
     return {
       eventProperties: {
@@ -92,33 +104,34 @@ module.exports = async (opts) => {
   };
 
   progress.on('transfer::start', async () => {
-    logger.log(`Starting export...`);
+    console.log(`Starting export...`);
     await strapi.telemetry.send('didDEITSProcessStart', getTelemetryPayload());
   });
 
+  let results;
+  let outFile;
   try {
-    const results = await engine.transfer();
-    const outFile = results.destination.file.path;
-
-    const table = buildTransferTable(results.engine);
-    logger.log(table.toString());
-
+    results = await engine.transfer();
+    outFile = results.destination.file.path;
     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());
-    logger.error('Export process failed.');
-    process.exit(1);
+    exitWith(1, 'Export process failed.');
   }
 
-  // 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());
-  process.exit(0);
+  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)}`);
 };
 
 /**

package/lib/commands/transfer/import.js

@@ -19,19 +19,18 @@ const {
   DEFAULT_IGNORED_CONTENT_TYPES,
   createStrapiInstance,
   formatDiagnostic,
+  loadersFactory,
 } = 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)) {
-    logger.error('Could not parse arguments');
-    process.exit(1);
+    exitWith(1, 'Could not parse arguments');
   }
 
   /**
@@ -90,6 +89,21 @@ module.exports = async (opts) => {
   engine.diagnostics.onDiagnostic(formatDiagnostic('import'));
 
   const progress = engine.progress.stream;
+
+  const { updateLoader } = loadersFactory();
+
+  progress.on(`stage::start`, ({ stage, data }) => {
+    updateLoader(stage, data).start();
+  });
+
+  progress.on('stage::finish', ({ stage, data }) => {
+    updateLoader(stage, data).succeed();
+  });
+
+  progress.on('stage::progress', ({ stage, data }) => {
+    updateLoader(stage, data);
+  });
+
   const getTelemetryPayload = () => {
     return {
       eventProperties: {
@@ -100,27 +114,30 @@ module.exports = async (opts) => {
   };
 
   progress.on('transfer::start', async () => {
-    logger.info('Starting import...');
+    console.log('Starting import...');
     await strapiInstance.telemetry.send('didDEITSProcessStart', getTelemetryPayload());
   });
 
+  let results;
   try {
-    const results = await engine.transfer();
-    const table = buildTransferTable(results.engine);
-    logger.info(table.toString());
-
-    logger.info('Import process has been completed successfully!');
+    results = await engine.transfer();
   } catch (e) {
     await strapiInstance.telemetry.send('didDEITSProcessFail', getTelemetryPayload());
-    logger.error('Import process failed.');
+    console.error('Import 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
+  try {
+    const table = buildTransferTable(results.engine);
+    console.log(table.toString());
+  } catch (e) {
+    console.error('There was an error displaying the results of the transfer.');
+  }
+
   await strapiInstance.telemetry.send('didDEITSProcessFinish', getTelemetryPayload());
   await strapiInstance.destroy();
 
-  process.exit(0);
+  exitWith(0, 'Import process has been completed successfully!');
 };
 
 /**

package/lib/commands/transfer/transfer.js

@@ -16,29 +16,30 @@ const {
   createStrapiInstance,
   DEFAULT_IGNORED_CONTENT_TYPES,
   formatDiagnostic,
+  loadersFactory,
 } = require('./utils');
-
-const logger = console;
+const { exitWith } = require('../utils/helpers');
 
 /**
  * @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.
  *
- * It transfers data from a local file to a local strapi instance
+ * Transfers data between local Strapi and remote Strapi instances
  *
  * @param {TransferCommandOptions} opts
  */
 module.exports = async (opts) => {
   // Validate inputs from Commander
   if (!isObject(opts)) {
-    logger.error('Could not parse command arguments');
-    process.exit(1);
+    exitWith(1, 'Could not parse command arguments');
   }
 
   const strapi = await createStrapiInstance();
@@ -47,8 +48,7 @@ module.exports = async (opts) => {
   let destination;
 
   if (!opts.from && !opts.to) {
-    logger.error('At least one source (from) or destination (to) option must be provided');
-    process.exit(1);
+    exitWith(1, 'At least one source (from) or destination (to) option must be provided');
   }
 
   // if no URL provided, use local Strapi
@@ -59,8 +59,7 @@ module.exports = async (opts) => {
   }
   // if URL provided, set up a remote source provider
   else {
-    logger.error(`Remote Strapi source provider not yet implemented`);
-    process.exit(1);
+    exitWith(1, `Remote Strapi source provider not yet implemented`);
   }
 
   // if no URL provided, use local Strapi
@@ -71,9 +70,16 @@ 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: false,
+      auth: {
+        type: 'token',
+        token: opts.toToken,
+      },
       strategy: 'restore',
       restore: {
         entities: { exclude: DEFAULT_IGNORED_CONTENT_TYPES },
@@ -82,12 +88,11 @@ module.exports = async (opts) => {
   }
 
   if (!source || !destination) {
-    logger.error('Could not create providers');
-    process.exit(1);
+    exitWith(1, 'Could not create providers');
   }
 
   const engine = createTransferEngine(source, destination, {
-    versionStrategy: 'strict',
+    versionStrategy: 'exact',
     schemaStrategy: 'strict',
     transforms: {
       links: [
@@ -112,18 +117,31 @@ module.exports = async (opts) => {
 
   engine.diagnostics.onDiagnostic(formatDiagnostic('transfer'));
 
-  try {
-    logger.log(`Starting transfer...`);
+  const progress = engine.progress.stream;
 
-    const results = await engine.transfer();
+  const { updateLoader } = loadersFactory();
 
-    const table = buildTransferTable(results.engine);
-    logger.log(table.toString());
+  progress.on(`stage::start`, ({ stage, data }) => {
+    updateLoader(stage, data).start();
+  });
 
-    logger.log(`${chalk.bold('Transfer process has been completed successfully!')}`);
-    process.exit(0);
+  progress.on('stage::finish', ({ stage, data }) => {
+    updateLoader(stage, data).succeed();
+  });
+
+  progress.on('stage::progress', ({ stage, data }) => {
+    updateLoader(stage, data);
+  });
+
+  let results;
+  try {
+    console.log(`Starting transfer...`);
+    results = await engine.transfer();
   } catch (e) {
-    logger.error('Transfer process failed.');
-    process.exit(1);
+    exitWith(1, 'Transfer process failed.');
   }
+
+  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

@@ -9,6 +9,7 @@ const {
   configs: { createOutputFileConfiguration },
   createLogger,
 } = require('@strapi/logger');
+const ora = require('ora');
 const { readableBytes, exitWith } = require('../utils/helpers');
 const strapi = require('../../index');
 const { getParseListWithChoices } = require('../utils/commander');
@@ -82,6 +83,8 @@ const DEFAULT_IGNORED_CONTENT_TYPES = [
   'admin::role',
   'admin::api-token',
   'admin::api-token-permission',
+  'admin::transfer-token',
+  'admin::transfer-token-permission',
   'admin::audit-log',
 ];
 
@@ -169,7 +172,46 @@ const formatDiagnostic =
     }
   };
 
+const loadersFactory = (defaultLoaders = {}) => {
+  const loaders = defaultLoaders;
+  const updateLoader = (stage, data) => {
+    if (!(stage in loaders)) {
+      createLoader(stage);
+    }
+    const stageData = data[stage];
+    const elapsedTime = stageData?.startTime
+      ? (stageData?.endTime || Date.now()) - stageData.startTime
+      : 0;
+    const size = `size: ${readableBytes(stageData?.bytes ?? 0)}`;
+    const elapsed = `elapsed: ${elapsedTime} ms`;
+    const speed =
+      elapsedTime > 0 ? `(${readableBytes(((stageData?.bytes ?? 0) * 1000) / elapsedTime)}/s)` : '';
+
+    loaders[stage].text = `${stage}: ${stageData?.count ?? 0} transfered (${size}) (${elapsed}) ${
+      !stageData?.endTime ? speed : ''
+    }`;
+
+    return loaders[stage];
+  };
+
+  const createLoader = (stage) => {
+    Object.assign(loaders, { [stage]: ora() });
+    return loaders[stage];
+  };
+
+  const getLoader = (stage) => {
+    return loaders[stage];
+  };
+
+  return {
+    updateLoader,
+    createLoader,
+    getLoader,
+  };
+};
+
 module.exports = {
+  loadersFactory,
   buildTransferTable,
   getDefaultExportName,
   DEFAULT_IGNORED_CONTENT_TYPES,

package/lib/commands/utils/helpers.js

@@ -36,22 +36,29 @@ 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) => {
-  const logger = (message) => {
+const exitWith = (code, message = undefined, options = {}) => {
+  const { logger = console, prc = process } = options;
+
+  const log = (message) => {
     if (code === 0) {
-      console.log(chalk.green(message));
+      logger.log(chalk.green(message));
     } else {
-      console.error(chalk.red(message));
+      logger.error(chalk.red(message));
     }
   };
 
   if (isString(message)) {
-    logger(message);
+    log(message);
   } else if (isArray(message)) {
-    message.forEach((msg) => logger(msg));
+    message.forEach((msg) => log(msg));
   }
-  process.exit(code);
+
+  prc.exit(code);
 };
 
 /**

package/lib/services/auth/index.js

@@ -43,7 +43,28 @@ const createAuthentication = () => {
         return next();
       }
 
-      const strategiesToUse = strategies[route.info.type];
+      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;
+      }, []);
 
       for (const strategy of strategiesToUse) {
         const result = await strategy.authenticate(ctx);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/strapi",
-  "version": "4.6.2",
+  "version": "4.7.0-exp.117579f4c13806c2cd518e7d7d2f9d0c8a20107d",
   "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.6.2",
-    "@strapi/data-transfer": "4.6.2",
-    "@strapi/database": "4.6.2",
-    "@strapi/generate-new": "4.6.2",
-    "@strapi/generators": "4.6.2",
-    "@strapi/logger": "4.6.2",
-    "@strapi/permissions": "4.6.2",
-    "@strapi/plugin-content-manager": "4.6.2",
-    "@strapi/plugin-content-type-builder": "4.6.2",
-    "@strapi/plugin-email": "4.6.2",
-    "@strapi/plugin-upload": "4.6.2",
-    "@strapi/typescript-utils": "4.6.2",
-    "@strapi/utils": "4.6.2",
+    "@strapi/admin": "4.7.0-exp.117579f4c13806c2cd518e7d7d2f9d0c8a20107d",
+    "@strapi/data-transfer": "4.7.0-exp.117579f4c13806c2cd518e7d7d2f9d0c8a20107d",
+    "@strapi/database": "4.7.0-exp.117579f4c13806c2cd518e7d7d2f9d0c8a20107d",
+    "@strapi/generate-new": "4.7.0-exp.117579f4c13806c2cd518e7d7d2f9d0c8a20107d",
+    "@strapi/generators": "4.7.0-exp.117579f4c13806c2cd518e7d7d2f9d0c8a20107d",
+    "@strapi/logger": "4.7.0-exp.117579f4c13806c2cd518e7d7d2f9d0c8a20107d",
+    "@strapi/permissions": "4.7.0-exp.117579f4c13806c2cd518e7d7d2f9d0c8a20107d",
+    "@strapi/plugin-content-manager": "4.7.0-exp.117579f4c13806c2cd518e7d7d2f9d0c8a20107d",
+    "@strapi/plugin-content-type-builder": "4.7.0-exp.117579f4c13806c2cd518e7d7d2f9d0c8a20107d",
+    "@strapi/plugin-email": "4.7.0-exp.117579f4c13806c2cd518e7d7d2f9d0c8a20107d",
+    "@strapi/plugin-upload": "4.7.0-exp.117579f4c13806c2cd518e7d7d2f9d0c8a20107d",
+    "@strapi/typescript-utils": "4.7.0-exp.117579f4c13806c2cd518e7d7d2f9d0c8a20107d",
+    "@strapi/utils": "4.7.0-exp.117579f4c13806c2cd518e7d7d2f9d0c8a20107d",
     "bcryptjs": "2.4.3",
     "boxen": "5.1.2",
     "chalk": "4.1.2",
@@ -142,5 +142,5 @@
     "node": ">=14.19.1 <=18.x.x",
     "npm": ">=6.0.0"
   },
-  "gitHead": "bae505f44c3a779905f6b8dbc0c497e24d9eabfb"
+  "gitHead": "117579f4c13806c2cd518e7d7d2f9d0c8a20107d"
 }