@strapi/strapi 4.1.6-alpha.1 → 4.1.8

package/bin/strapi.js

@@ -227,4 +227,10 @@ program
   .description('List all the application controllers')
   .action(getLocalScript('controllers/list'));
 
+//    `$ strapi opt-out-telemetry`
+program
+  .command('telemetry:disable')
+  .description('Stop Strapi from sending anonymous telemetry and metadata')
+  .action(getLocalScript('opt-out-telemetry'));
+
 program.parseAsync(process.argv);

package/lib/commands/opt-out-telemetry.js

@@ -0,0 +1,83 @@
+'use strict';
+
+const { resolve } = require('path');
+const fse = require('fs-extra');
+const chalk = require('chalk');
+const fetch = require('node-fetch');
+const machineID = require('../utils/machine-id');
+
+const readPackageJSON = async path => {
+  try {
+    const packageObj = await fse.readJson(path);
+    const uuid = packageObj.strapi ? packageObj.strapi.uuid : null;
+
+    return { uuid, packageObj };
+  } catch (err) {
+    console.error(`${chalk.red('Error')}: ${err.message}`);
+  }
+};
+
+const writePackageJSON = async (path, file, spacing) => {
+  try {
+    await fse.writeJson(path, file, { spaces: spacing });
+    return true;
+  } catch (err) {
+    console.error(`${chalk.red('Error')}: ${err.message}`);
+  }
+};
+
+const sendEvent = async uuid => {
+  try {
+    await fetch('https://analytics.strapi.io/track', {
+      method: 'POST',
+      body: JSON.stringify({
+        event: 'didOptOutTelemetry',
+        uuid,
+        deviceId: machineID(),
+      }),
+      headers: { 'Content-Type': 'application/json' },
+    });
+  } catch (e) {
+    //...
+  }
+};
+
+module.exports = async function optOutTelemetry() {
+  const packageJSONPath = resolve(process.cwd(), 'package.json');
+  const exists = await fse.pathExists(packageJSONPath);
+
+  if (!exists) {
+    console.log(`${chalk.yellow('Warning')}: could not find package.json`);
+    process.exit(0);
+  }
+
+  const { uuid, packageObj } = await readPackageJSON(packageJSONPath);
+
+  if ((packageObj.strapi && packageObj.strapi.telemetryDisabled) || !uuid) {
+    console.log(`${chalk.yellow('Warning:')} telemetry is already disabled`);
+    process.exit(0);
+  }
+
+  const updatedPackageJSON = {
+    ...packageObj,
+    strapi: {
+      ...packageObj.strapi,
+      telemetryDisabled: true,
+    },
+  };
+
+  const write = await writePackageJSON(packageJSONPath, updatedPackageJSON, 2);
+
+  if (!write) {
+    console.log(
+      `${chalk.yellow(
+        'Warning'
+      )}: There has been an error, please set "telemetryDisabled": true in the "strapi" object of your package.json manually.`
+    );
+    process.exit(0);
+  }
+
+  await sendEvent(uuid);
+  console.log(`${chalk.green('Successfully opted out of Strapi telemetry')}`);
+  process.exit(0);
+};

package/lib/middlewares/session.js

@@ -19,7 +19,9 @@ const defaultConfig = {
 module.exports = (userConfig, { strapi }) => {
   const keys = strapi.server.app.keys;
   if (!isArray(keys) || isEmpty(keys) || keys.some(isEmpty)) {
-    throw new Error(`App keys are required. Please set app.keys in config/server.js (ex: keys: ['myKeyA', 'myKeyB'])`);
+    throw new Error(
+      `App keys are required. Please set app.keys in config/server.js (ex: keys: ['myKeyA', 'myKeyB'])`
+    );
   }
 
   const config = defaultsDeep(defaultConfig, userConfig);

package/lib/services/metrics/index.js

@@ -24,7 +24,9 @@ const LIMITED_EVENTS = [
 
 const createTelemetryInstance = strapi => {
   const uuid = strapi.config.get('uuid');
-  const isDisabled = !uuid || isTruthy(process.env.STRAPI_TELEMETRY_DISABLED);
+  const telemetryDisabled = strapi.config.get('packageJsonStrapi.telemetryDisabled');
+  const isDisabled =
+    !uuid || isTruthy(process.env.STRAPI_TELEMETRY_DISABLED) || isTruthy(telemetryDisabled);
 
   const crons = [];
   const sender = createSender(strapi);

package/lib/services/server/index.js

@@ -30,7 +30,7 @@ const healthCheck = async ctx => {
 const createServer = strapi => {
   const app = createKoaApp({
     proxy: strapi.config.get('server.proxy'),
-    keys:  strapi.config.get('server.app.keys'),
+    keys: strapi.config.get('server.app.keys'),
   });
 
   const router = new Router();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/strapi",
-  "version": "4.1.6-alpha.1",
+  "version": "4.1.8",
   "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",
@@ -80,16 +80,16 @@
   "dependencies": {
     "@koa/cors": "3.1.0",
     "@koa/router": "10.1.1",
-    "@strapi/admin": "4.1.6-alpha.1",
-    "@strapi/database": "4.1.6-alpha.1",
-    "@strapi/generate-new": "4.1.6-alpha.1",
-    "@strapi/generators": "4.1.6-alpha.1",
-    "@strapi/logger": "4.1.6-alpha.1",
-    "@strapi/plugin-content-manager": "4.1.6-alpha.1",
-    "@strapi/plugin-content-type-builder": "4.1.6-alpha.1",
-    "@strapi/plugin-email": "4.1.6-alpha.1",
-    "@strapi/plugin-upload": "4.1.6-alpha.1",
-    "@strapi/utils": "4.1.6-alpha.1",
+    "@strapi/admin": "4.1.8",
+    "@strapi/database": "4.1.8",
+    "@strapi/generate-new": "4.1.8",
+    "@strapi/generators": "4.1.8",
+    "@strapi/logger": "4.1.8",
+    "@strapi/plugin-content-manager": "4.1.8",
+    "@strapi/plugin-content-type-builder": "4.1.8",
+    "@strapi/plugin-email": "4.1.8",
+    "@strapi/plugin-upload": "4.1.8",
+    "@strapi/utils": "4.1.8",
     "bcryptjs": "2.4.3",
     "boxen": "5.1.2",
     "chalk": "4.1.2",
@@ -136,5 +136,5 @@
     "node": ">=12.22.0 <=16.x.x",
     "npm": ">=6.0.0"
   },
-  "gitHead": "1130511ce3b6762b3b3de972103d891c7bc69520"
+  "gitHead": "3f204a0a48d4e1f6dca21683eb6c63041b2f6626"
 }