@strapi/strapi 4.6.0-beta.1 → 4.6.0

package/lib/utils/ee.js

@@ -1,123 +1,3 @@
 'use strict';
 
-const path = require('path');
-const fs = require('fs');
-const crypto = require('crypto');
-const _ = require('lodash');
-
-const publicKey = fs.readFileSync(path.join(__dirname, '../utils/resources/key.pub'));
-
-const noop = () => {};
-
-const noLog = {
-  warn: noop,
-  info: noop,
-};
-
-const internals = {};
-const features = {
-  bronze: [],
-  silver: [],
-  gold: ['sso'],
-};
-
-module.exports = ({ dir, logger = noLog }) => {
-  if (_.has(internals, 'isEE')) return internals.isEE;
-
-  const warnAndReturn = (msg = 'Invalid license. Starting in CE.') => {
-    logger.warn(msg);
-    internals.isEE = false;
-    return false;
-  };
-
-  if (process.env.STRAPI_DISABLE_EE === 'true') {
-    internals.isEE = false;
-    return false;
-  }
-
-  const licensePath = path.join(dir, 'license.txt');
-
-  let license;
-  if (_.has(process.env, 'STRAPI_LICENSE')) {
-    license = process.env.STRAPI_LICENSE;
-  } else if (fs.existsSync(licensePath)) {
-    license = fs.readFileSync(licensePath).toString();
-  }
-
-  if (_.isNil(license)) {
-    internals.isEE = false;
-    return false;
-  }
-
-  try {
-    const plainLicense = Buffer.from(license, 'base64').toString();
-    const [signatureb64, contentb64] = plainLicense.split('\n');
-
-    const signature = Buffer.from(signatureb64, 'base64');
-    const content = Buffer.from(contentb64, 'base64').toString();
-
-    const verifier = crypto.createVerify('RSA-SHA256');
-    verifier.update(content);
-    verifier.end();
-
-    const isValid = verifier.verify(publicKey, signature);
-    if (!isValid) return warnAndReturn();
-
-    internals.licenseInfo = JSON.parse(content);
-
-    const expirationTime = new Date(internals.licenseInfo.expireAt).getTime();
-    if (expirationTime < new Date().getTime()) {
-      return warnAndReturn('License expired. Starting in CE');
-    }
-  } catch (err) {
-    return warnAndReturn();
-  }
-
-  internals.isEE = true;
-  return true;
-};
-
-Object.defineProperty(module.exports, 'licenseInfo', {
-  get() {
-    mustHaveKey('licenseInfo');
-    return internals.licenseInfo;
-  },
-  configurable: false,
-  enumerable: false,
-});
-
-Object.defineProperty(module.exports, 'isEE', {
-  get() {
-    mustHaveKey('isEE');
-    return internals.isEE;
-  },
-  configurable: false,
-  enumerable: false,
-});
-
-Object.defineProperty(module.exports, 'features', {
-  get() {
-    mustHaveKey('licenseInfo');
-
-    const { type: licenseType } = module.exports.licenseInfo;
-
-    return {
-      isEnabled(feature) {
-        return features[licenseType].includes(feature);
-      },
-      getEnabled() {
-        return features[licenseType];
-      },
-    };
-  },
-  configurable: false,
-  enumerable: false,
-});
-
-const mustHaveKey = (key) => {
-  if (!_.has(internals, key)) {
-    const err = new Error('Tampering with license');
-    // err.stack = null;
-    throw err;
-  }
-};
+module.exports = require('../../ee');

package/lib/utils/startup-logger.js

@@ -4,7 +4,6 @@ const chalk = require('chalk');
 const CLITable = require('cli-table3');
 const _ = require('lodash/fp');
 const { getAbsoluteAdminUrl, getAbsoluteServerUrl } = require('@strapi/utils');
-const ee = require('./ee');
 
 module.exports = (app) => {
   return {
@@ -19,15 +18,14 @@ module.exports = (app) => {
         chars: { mid: '', 'left-mid': '', 'mid-mid': '', 'right-mid': '' },
       });
 
-      const isEE = app.EE === true && ee.isEE === true;
-
       infoTable.push(
         [chalk.blue('Time'), `${new Date()}`],
         [chalk.blue('Launched in'), `${Date.now() - app.config.launchedAt} ms`],
         [chalk.blue('Environment'), app.config.environment],
         [chalk.blue('Process PID'), process.pid],
         [chalk.blue('Version'), `${app.config.info.strapi} (node ${process.version})`],
-        [chalk.blue('Edition'), isEE ? 'Enterprise' : 'Community']
+        [chalk.blue('Edition'), app.EE ? 'Enterprise' : 'Community'],
+        [chalk.blue('Database'), app.db.dialect.client]
       );
 
       console.log(infoTable.toString());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/strapi",
-  "version": "4.6.0-beta.1",
+  "version": "4.6.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",
@@ -71,7 +71,8 @@
   },
   "directories": {
     "lib": "./lib",
-    "bin": "./bin"
+    "bin": "./bin",
+    "ee": "./ee"
   },
   "scripts": {
     "postinstall": "node lib/utils/success.js",
@@ -80,26 +81,26 @@
   "dependencies": {
     "@koa/cors": "3.4.3",
     "@koa/router": "10.1.1",
-    "@strapi/admin": "4.6.0-beta.1",
-    "@strapi/data-transfer": "4.6.0-beta.1",
-    "@strapi/database": "4.6.0-beta.1",
-    "@strapi/generate-new": "4.6.0-beta.1",
-    "@strapi/generators": "4.6.0-beta.1",
-    "@strapi/logger": "4.6.0-beta.1",
-    "@strapi/permissions": "4.6.0-beta.1",
-    "@strapi/plugin-content-manager": "4.6.0-beta.1",
-    "@strapi/plugin-content-type-builder": "4.6.0-beta.1",
-    "@strapi/plugin-email": "4.6.0-beta.1",
-    "@strapi/plugin-upload": "4.6.0-beta.1",
-    "@strapi/typescript-utils": "4.6.0-beta.1",
-    "@strapi/utils": "4.6.0-beta.1",
+    "@strapi/admin": "4.6.0",
+    "@strapi/data-transfer": "4.6.0",
+    "@strapi/database": "4.6.0",
+    "@strapi/generate-new": "4.6.0",
+    "@strapi/generators": "4.6.0",
+    "@strapi/logger": "4.6.0",
+    "@strapi/permissions": "4.6.0",
+    "@strapi/plugin-content-manager": "4.6.0",
+    "@strapi/plugin-content-type-builder": "4.6.0",
+    "@strapi/plugin-email": "4.6.0",
+    "@strapi/plugin-upload": "4.6.0",
+    "@strapi/typescript-utils": "4.6.0",
+    "@strapi/utils": "4.6.0",
     "bcryptjs": "2.4.3",
     "boxen": "5.1.2",
     "chalk": "4.1.2",
     "chokidar": "3.5.2",
     "ci-info": "3.5.0",
     "cli-table3": "0.6.2",
-    "commander": "8.2.0",
+    "commander": "8.3.0",
     "configstore": "5.0.1",
     "debug": "4.3.4",
     "delegates": "1.0.0",
@@ -141,5 +142,5 @@
     "node": ">=14.19.1 <=18.x.x",
     "npm": ">=6.0.0"
   },
-  "gitHead": "2c0bcabdf0bf2a269fed50c6f23ba777845968a0"
+  "gitHead": "a9e55435c489f3379d88565bf3f729deb29bfb45"
 }

package/lib/commands/utils/index.js

@@ -1,20 +0,0 @@
-'use strict';
-
-const bytesPerKb = 1024;
-const sizes = ['B ', 'KB', 'MB', 'GB', 'TB', 'PB'];
-
-const readableBytes = (bytes, decimals = 1, padStart = 0) => {
-  if (!bytes) {
-    return '0';
-  }
-  const i = Math.floor(Math.log(bytes) / Math.log(bytesPerKb));
-  const result = `${parseFloat((bytes / bytesPerKb ** i).toFixed(decimals))} ${sizes[i].padStart(
-    2
-  )}`;
-
-  return result.padStart(padStart);
-};
-
-module.exports = {
-  readableBytes,
-};