From d60578c87568f5bc7fc45e376751e40d7cc31ae6 Mon Sep 17 00:00:00 2001
From: Alexandre Bodin <bodin.alex@gmail.com>
Date: Mon, 30 Mar 2020 13:55:28 +0200
Subject: [PATCH] Update is truthy fn

Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
---
 .../{truthy-var.test.js => is-truthy.js}         |  2 +-
 packages/strapi/lib/services/metrics/index.js    |  4 ++--
 .../strapi/lib/services/metrics/is-truthy.js     |  9 +++++++++
 .../strapi/lib/services/metrics/truthy-var.js    | 16 ----------------
 4 files changed, 12 insertions(+), 19 deletions(-)
 rename packages/strapi/lib/services/metrics/__tests__/{truthy-var.test.js => is-truthy.js} (94%)
 create mode 100644 packages/strapi/lib/services/metrics/is-truthy.js
 delete mode 100644 packages/strapi/lib/services/metrics/truthy-var.js

diff --git a/packages/strapi/lib/services/metrics/__tests__/truthy-var.test.js b/packages/strapi/lib/services/metrics/__tests__/is-truthy.js
similarity index 94%
rename from packages/strapi/lib/services/metrics/__tests__/truthy-var.test.js
rename to packages/strapi/lib/services/metrics/__tests__/is-truthy.js
index a5a19d3865..7332852cda 100644
--- a/packages/strapi/lib/services/metrics/__tests__/truthy-var.test.js
+++ b/packages/strapi/lib/services/metrics/__tests__/is-truthy.js
@@ -1,4 +1,4 @@
-const isTruthyEnvVar = require('../truthy-var');
+const isTruthyEnvVar = require('../is-truthy');
 
 describe('isTruthyEnvVar', () => {
   test('Handles boolean strings', () => {
diff --git a/packages/strapi/lib/services/metrics/index.js b/packages/strapi/lib/services/metrics/index.js
index 69310273e4..9288e0b328 100644
--- a/packages/strapi/lib/services/metrics/index.js
+++ b/packages/strapi/lib/services/metrics/index.js
@@ -12,13 +12,13 @@ const ciEnv = require('ci-info');
 const { scheduleJob } = require('node-schedule');
 
 const createMiddleware = require('./middleware');
-const isTruthyEnvVar = require('./truthy-var');
+const isTruthy = require('./is-truthy');
 
 const createTelemetryInstance = strapi => {
   const uuid = strapi.config.uuid;
   const deviceId = machineIdSync();
 
-  const isDisabled = !uuid || isTruthyEnvVar(process.env.STRAPI_TELEMETRY_DISABLED);
+  const isDisabled = !uuid || isTruthy(process.env.STRAPI_TELEMETRY_DISABLED);
 
   const anonymous_metadata = {
     environment: strapi.config.environment,
diff --git a/packages/strapi/lib/services/metrics/is-truthy.js b/packages/strapi/lib/services/metrics/is-truthy.js
new file mode 100644
index 0000000000..a594a22912
--- /dev/null
+++ b/packages/strapi/lib/services/metrics/is-truthy.js
@@ -0,0 +1,9 @@
+'use strict';
+
+const _ = require('lodash');
+
+const isTruthy = val => {
+  return [1, true].includes(val) || ['true', '1'].includes(_.toLower(val));
+};
+
+module.exports = isTruthy;
diff --git a/packages/strapi/lib/services/metrics/truthy-var.js b/packages/strapi/lib/services/metrics/truthy-var.js
deleted file mode 100644
index d77f8febfb..0000000000
--- a/packages/strapi/lib/services/metrics/truthy-var.js
+++ /dev/null
@@ -1,16 +0,0 @@
-'use strict';
-
-const isTruthyEnvVar = val => {
-  if (val === null || val === undefined) return false;
-
-  if (val === true) return true;
-
-  if (val.toString().toLowerCase() === 'true') return true;
-  if (val.toString().toLowerCase() === 'false') return false;
-
-  if (val === 1) return true;
-
-  return false;
-};
-
-module.exports = isTruthyEnvVar;