Merge pull request #11063 from strapi/v4/cleanup-cm

Move CM files into the new structure

packages/core/content-manager/config/admin.json

@@ -1,5 +0,0 @@
-{
-  "admin": {
-    "schema": {}
-  }
-}

packages/core/content-manager/config/functions/bootstrap.js

@@ -1,9 +0,0 @@
-'use strict';
-
-const { getService } = require('../../utils');
-
-module.exports = async () => {
-  await getService('components').syncConfigurations();
-  await getService('content-types').syncConfigurations();
-  await getService('permission').registerPermissions();
-};

packages/core/content-manager/server/bootstrap.js

@@ -1,5 +1,9 @@
 'use strict';
 
-const bootstrap = require('../config/functions/bootstrap');
+const { getService } = require('./utils');
 
-module.exports = bootstrap;
+module.exports = async () => {
+  await getService('components').syncConfigurations();
+  await getService('content-types').syncConfigurations();
+  await getService('permission').registerPermissions();
+};

packages/core/content-manager/server/controllers/__tests__/content-types.test.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const createContext = require('../../../../../test/helpers/create-context');
+const createContext = require('../../../../../../test/helpers/create-context');
 const contentTypes = require('../content-types');
 
 describe('Content Types', () => {

packages/core/content-manager/server/controllers/__tests__/relations.test.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const createContext = require('../../../../../test/helpers/create-context');
+const createContext = require('../../../../../../test/helpers/create-context');
 const relations = require('../relations');
 
 describe('Relations', () => {

packages/core/content-manager/server/controllers/__tests__/single-types.test.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const createContext = require('../../../../../test/helpers/create-context');
+const createContext = require('../../../../../../test/helpers/create-context');
 const singleTypes = require('../single-types');
 
 describe('Single Types', () => {

packages/core/content-manager/server/controllers/index.js

@@ -1,11 +1,11 @@
 'use strict';
 
-const collectionTypes = require('../../controllers/collection-types');
-const components = require('../../controllers/components');
-const contentTypes = require('../../controllers/content-types');
-const relations = require('../../controllers/relations');
-const singleTypes = require('../../controllers/single-types');
-const uid = require('../../controllers/uid');
+const collectionTypes = require('./collection-types');
+const components = require('./components');
+const contentTypes = require('./content-types');
+const relations = require('./relations');
+const singleTypes = require('./single-types');
+const uid = require('./uid');
 
 module.exports = {
   'collection-types': collectionTypes,

packages/core/content-manager/server/index.js

@@ -0,0 +1,17 @@
+'use strict';
+
+const bootstrap = require('./bootstrap');
+const controllers = require('./controllers');
+const routes = require('./routes');
+const policies = require('./policies');
+const services = require('./services');
+
+module.exports = () => {
+  return {
+    bootstrap,
+    controllers,
+    routes,
+    policies,
+    services,
+  };
+};

packages/core/content-manager/server/policies/hasPermissions.js

@@ -3,7 +3,7 @@
 const {
   policy: { createPolicyFactory },
 } = require('@strapi/utils');
-const { validateHasPermissionsInput } = require('../../validation/policies/hasPermissions');
+const { validateHasPermissionsInput } = require('../validation/policies/hasPermissions');
 
 module.exports = createPolicyFactory(
   ({ actions = [], hasAtLeastOne = false } = {}) => (ctx, next) => {

packages/core/content-manager/server/policies/index.js

@@ -1,8 +1,8 @@
 'use strict';
 
-const hasDraftAndPublish = require('../../config/policies/has-draft-and-publish');
-const hasPermissions = require('../../config/policies/hasPermissions');
-const routing = require('../../config/policies/routing');
+const hasDraftAndPublish = require('./has-draft-and-publish');
+const hasPermissions = require('./hasPermissions');
+const routing = require('./routing');
 
 module.exports = {
   'has-draft-and-publish': hasDraftAndPublish,

packages/core/content-manager/server/services/index.js

@@ -1,13 +1,13 @@
 'use strict';
 
-const components = require('../../services/components');
-const contentTypes = require('../../services/content-types');
-const dataMapper = require('../../services/data-mapper');
-const metrics = require('../../services/metrics');
-const permissionChecker = require('../../services/permission-checker');
-const permission = require('../../services/permission');
-const uid = require('../../services/uid');
-const entityManager = require('../../services/entity-manager');
+const components = require('./components');
+const contentTypes = require('./content-types');
+const dataMapper = require('./data-mapper');
+const metrics = require('./metrics');
+const permissionChecker = require('./permission-checker');
+const permission = require('./permission');
+const uid = require('./uid');
+const entityManager = require('./entity-manager');
 
 module.exports = {
   components,

packages/core/content-manager/server/tests/api/basic-compo-repeatable.test.e2e.js

@@ -2,9 +2,9 @@
 
 const _ = require('lodash');
 
-const { createTestBuilder } = require('../../../../../test/helpers/builder');
-const { createStrapiInstance } = require('../../../../../test/helpers/strapi');
-const { createAuthRequest } = require('../../../../../test/helpers/request');
+const { createTestBuilder } = require('../../../../../../test/helpers/builder');
+const { createStrapiInstance } = require('../../../../../../test/helpers/strapi');
+const { createAuthRequest } = require('../../../../../../test/helpers/request');
 
 const builder = createTestBuilder();
 let strapi;

packages/core/content-manager/server/tests/api/basic-compo.test.e2e.js

@@ -2,9 +2,9 @@
 
 const _ = require('lodash');
 
-const { createTestBuilder } = require('../../../../../test/helpers/builder');
-const { createStrapiInstance } = require('../../../../../test/helpers/strapi');
-const { createAuthRequest } = require('../../../../../test/helpers/request');
+const { createTestBuilder } = require('../../../../../../test/helpers/builder');
+const { createStrapiInstance } = require('../../../../../../test/helpers/strapi');
+const { createAuthRequest } = require('../../../../../../test/helpers/request');
 
 const builder = createTestBuilder();
 let strapi;

packages/core/content-manager/server/tests/api/basic-dp-compo-repeatable.test.e2e.js

@@ -4,9 +4,9 @@
 
 const _ = require('lodash');
 
-const { createTestBuilder } = require('../../../../../test/helpers/builder');
-const { createStrapiInstance } = require('../../../../../test/helpers/strapi');
-const { createAuthRequest } = require('../../../../../test/helpers/request');
+const { createTestBuilder } = require('../../../../../../test/helpers/builder');
+const { createStrapiInstance } = require('../../../../../../test/helpers/strapi');
+const { createAuthRequest } = require('../../../../../../test/helpers/request');
 
 const builder = createTestBuilder();
 let strapi;

packages/core/content-manager/server/tests/api/basic-dp-compo.test.e2e.js

@@ -4,9 +4,9 @@
 
 const _ = require('lodash');
 
-const { createTestBuilder } = require('../../../../../test/helpers/builder');
-const { createStrapiInstance } = require('../../../../../test/helpers/strapi');
-const { createAuthRequest } = require('../../../../../test/helpers/request');
+const { createTestBuilder } = require('../../../../../../test/helpers/builder');
+const { createStrapiInstance } = require('../../../../../../test/helpers/strapi');
+const { createAuthRequest } = require('../../../../../../test/helpers/request');
 
 const builder = createTestBuilder();
 let strapi;

packages/core/content-manager/server/tests/api/basic-dp-dz.test.e2e.js

@@ -4,9 +4,9 @@
 
 const _ = require('lodash');
 
-const { createTestBuilder } = require('../../../../../test/helpers/builder');
-const { createStrapiInstance } = require('../../../../../test/helpers/strapi');
-const { createAuthRequest } = require('../../../../../test/helpers/request');
+const { createTestBuilder } = require('../../../../../../test/helpers/builder');
+const { createStrapiInstance } = require('../../../../../../test/helpers/strapi');
+const { createAuthRequest } = require('../../../../../../test/helpers/request');
 
 const builder = createTestBuilder();
 let strapi;

packages/core/content-manager/server/tests/api/basic-dp.test.e2e.js

@@ -2,9 +2,9 @@
 
 const _ = require('lodash');
 
-const { createTestBuilder } = require('../../../../../test/helpers/builder');
-const { createStrapiInstance } = require('../../../../../test/helpers/strapi');
-const { createAuthRequest } = require('../../../../../test/helpers/request');
+const { createTestBuilder } = require('../../../../../../test/helpers/builder');
+const { createStrapiInstance } = require('../../../../../../test/helpers/strapi');
+const { createAuthRequest } = require('../../../../../../test/helpers/request');
 
 const builder = createTestBuilder();
 let strapi;

packages/core/content-manager/server/tests/api/basic-dz.test.e2e.js

@@ -2,9 +2,9 @@
 
 const _ = require('lodash');
 
-const { createTestBuilder } = require('../../../../../test/helpers/builder');
-const { createStrapiInstance } = require('../../../../../test/helpers/strapi');
-const { createAuthRequest } = require('../../../../../test/helpers/request');
+const { createTestBuilder } = require('../../../../../../test/helpers/builder');
+const { createStrapiInstance } = require('../../../../../../test/helpers/strapi');
+const { createAuthRequest } = require('../../../../../../test/helpers/request');
 
 const builder = createTestBuilder();
 let strapi;

packages/core/content-manager/server/tests/api/basic-relations.test.e2e.js

@@ -1,8 +1,8 @@
 'use strict';
 
-const { createAuthRequest } = require('../../../../../test/helpers/request');
-const { createStrapiInstance } = require('../../../../../test/helpers/strapi');
-const { createTestBuilder } = require('../../../../../test/helpers/builder');
+const { createAuthRequest } = require('../../../../../../test/helpers/request');
+const { createStrapiInstance } = require('../../../../../../test/helpers/strapi');
+const { createTestBuilder } = require('../../../../../../test/helpers/builder');
 
 let strapi;
 let rq;

packages/core/content-manager/server/tests/api/basic.test.e2e.js

@@ -1,9 +1,9 @@
 'use strict';
 
 const _ = require('lodash');
-const { createStrapiInstance } = require('../../../../../test/helpers/strapi');
-const { createTestBuilder } = require('../../../../../test/helpers/builder');
-const { createAuthRequest } = require('../../../../../test/helpers/request');
+const { createStrapiInstance } = require('../../../../../../test/helpers/strapi');
+const { createTestBuilder } = require('../../../../../../test/helpers/builder');
+const { createAuthRequest } = require('../../../../../../test/helpers/request');
 
 const builder = createTestBuilder();
 let strapi;

packages/core/content-manager/server/tests/api/x-to-many-rf-preview.test.e2e.js

@@ -1,9 +1,9 @@
 'use strict';
 
 const { prop, difference, map, uniq } = require('lodash/fp');
-const { createAuthRequest } = require('../../../../../test/helpers/request');
-const { createStrapiInstance } = require('../../../../../test/helpers/strapi');
-const { createTestBuilder } = require('../../../../../test/helpers/builder');
+const { createAuthRequest } = require('../../../../../../test/helpers/request');
+const { createStrapiInstance } = require('../../../../../../test/helpers/strapi');
+const { createTestBuilder } = require('../../../../../../test/helpers/builder');
 
 const toIds = arr => uniq(map(prop('id'))(arr));
 

packages/core/content-manager/server/tests/components/repeatable-not-required-min-max.test.e2e.js

@@ -1,8 +1,8 @@
 'use strict';
 
-const { createTestBuilder } = require('../../../../../test/helpers/builder');
-const { createStrapiInstance } = require('../../../../../test/helpers/strapi');
-const { createAuthRequest } = require('../../../../../test/helpers/request');
+const { createTestBuilder } = require('../../../../../../test/helpers/builder');
+const { createStrapiInstance } = require('../../../../../../test/helpers/strapi');
+const { createAuthRequest } = require('../../../../../../test/helpers/request');
 
 let strapi;
 let rq;

packages/core/content-manager/server/tests/components/repeatable-not-required.test.e2e.js

@@ -1,8 +1,8 @@
 'use strict';
 
-const { createTestBuilder } = require('../../../../../test/helpers/builder');
-const { createStrapiInstance } = require('../../../../../test/helpers/strapi');
-const { createAuthRequest } = require('../../../../../test/helpers/request');
+const { createTestBuilder } = require('../../../../../../test/helpers/builder');
+const { createStrapiInstance } = require('../../../../../../test/helpers/strapi');
+const { createAuthRequest } = require('../../../../../../test/helpers/request');
 
 let strapi;
 let rq;

packages/core/content-manager/server/tests/components/repeatable-required-min-max.test.e2e.js

@@ -1,8 +1,8 @@
 'use strict';
 
-const { createTestBuilder } = require('../../../../../test/helpers/builder');
-const { createStrapiInstance } = require('../../../../../test/helpers/strapi');
-const { createAuthRequest } = require('../../../../../test/helpers/request');
+const { createTestBuilder } = require('../../../../../../test/helpers/builder');
+const { createStrapiInstance } = require('../../../../../../test/helpers/strapi');
+const { createAuthRequest } = require('../../../../../../test/helpers/request');
 
 let strapi;
 let rq;

packages/core/content-manager/server/tests/components/repeatable-required.test.e2e.js

@@ -1,8 +1,8 @@
 'use strict';
 
-const { createTestBuilder } = require('../../../../../test/helpers/builder');
-const { createStrapiInstance } = require('../../../../../test/helpers/strapi');
-const { createAuthRequest } = require('../../../../../test/helpers/request');
+const { createTestBuilder } = require('../../../../../../test/helpers/builder');
+const { createStrapiInstance } = require('../../../../../../test/helpers/strapi');
+const { createAuthRequest } = require('../../../../../../test/helpers/request');
 
 let strapi;
 let rq;

packages/core/content-manager/server/tests/components/single-not-required.test.e2e.js

@@ -1,8 +1,8 @@
 'use strict';
 
-const { createTestBuilder } = require('../../../../../test/helpers/builder');
-const { createStrapiInstance } = require('../../../../../test/helpers/strapi');
-const { createAuthRequest } = require('../../../../../test/helpers/request');
+const { createTestBuilder } = require('../../../../../../test/helpers/builder');
+const { createStrapiInstance } = require('../../../../../../test/helpers/strapi');
+const { createAuthRequest } = require('../../../../../../test/helpers/request');
 
 let strapi;
 let rq;

packages/core/content-manager/server/tests/components/single-required.test.e2e.js

@@ -1,8 +1,8 @@
 'use strict';
 
-const { createTestBuilder } = require('../../../../../test/helpers/builder');
-const { createStrapiInstance } = require('../../../../../test/helpers/strapi');
-const { createAuthRequest } = require('../../../../../test/helpers/request');
+const { createTestBuilder } = require('../../../../../../test/helpers/builder');
+const { createStrapiInstance } = require('../../../../../../test/helpers/strapi');
+const { createAuthRequest } = require('../../../../../../test/helpers/request');
 
 let strapi;
 let rq;

packages/core/content-manager/server/tests/content-manager/uid.test.e2e.js

@@ -1,9 +1,9 @@
 'use strict';
 
 // Helpers.
-const { createTestBuilder } = require('../../../../../test/helpers/builder');
-const { createStrapiInstance } = require('../../../../../test/helpers/strapi');
-const { createAuthRequest } = require('../../../../../test/helpers/request');
+const { createTestBuilder } = require('../../../../../../test/helpers/builder');
+const { createStrapiInstance } = require('../../../../../../test/helpers/strapi');
+const { createAuthRequest } = require('../../../../../../test/helpers/request');
 
 const builder = createTestBuilder();
 let strapi;

packages/core/content-manager/server/tests/dynamiczones/simple.test.e2e.js

@@ -1,8 +1,8 @@
 'use strict';
 
-const { createTestBuilder } = require('../../../../../test/helpers/builder');
-const { createStrapiInstance } = require('../../../../../test/helpers/strapi');
-const { createAuthRequest } = require('../../../../../test/helpers/request');
+const { createTestBuilder } = require('../../../../../../test/helpers/builder');
+const { createStrapiInstance } = require('../../../../../../test/helpers/strapi');
+const { createAuthRequest } = require('../../../../../../test/helpers/request');
 
 let strapi;
 let rq;

packages/core/content-manager/server/tests/dynamiczones/with-media.test.e2e.js

@@ -3,9 +3,9 @@
 const fs = require('fs');
 const path = require('path');
 
-const { createTestBuilder } = require('../../../../../test/helpers/builder');
-const { createStrapiInstance } = require('../../../../../test/helpers/strapi');
-const { createAuthRequest } = require('../../../../../test/helpers/request');
+const { createTestBuilder } = require('../../../../../../test/helpers/builder');
+const { createStrapiInstance } = require('../../../../../../test/helpers/strapi');
+const { createAuthRequest } = require('../../../../../../test/helpers/request');
 
 let strapi;
 let rq;

packages/core/content-manager/server/tests/fields/biginteger.test.e2e.js

@@ -1,8 +1,8 @@
 'use strict';
 
-const { createTestBuilder } = require('../../../../../test/helpers/builder');
-const { createStrapiInstance } = require('../../../../../test/helpers/strapi');
-const { createAuthRequest } = require('../../../../../test/helpers/request');
+const { createTestBuilder } = require('../../../../../../test/helpers/builder');
+const { createStrapiInstance } = require('../../../../../../test/helpers/strapi');
+const { createAuthRequest } = require('../../../../../../test/helpers/request');
 
 const builder = createTestBuilder();
 let strapi;

packages/core/content-manager/server/tests/fields/boolean.test.e2e.js

@@ -1,8 +1,8 @@
 'use strict';
 
-const { createTestBuilder } = require('../../../../../test/helpers/builder');
-const { createStrapiInstance } = require('../../../../../test/helpers/strapi');
-const { createAuthRequest } = require('../../../../../test/helpers/request');
+const { createTestBuilder } = require('../../../../../../test/helpers/builder');
+const { createStrapiInstance } = require('../../../../../../test/helpers/strapi');
+const { createAuthRequest } = require('../../../../../../test/helpers/request');
 
 const builder = createTestBuilder();
 let strapi;

packages/core/content-manager/server/tests/fields/date.test.e2e.js

@@ -1,8 +1,8 @@
 'use strict';
 
-const { createTestBuilder } = require('../../../../../test/helpers/builder');
-const { createStrapiInstance } = require('../../../../../test/helpers/strapi');
-const { createAuthRequest } = require('../../../../../test/helpers/request');
+const { createTestBuilder } = require('../../../../../../test/helpers/builder');
+const { createStrapiInstance } = require('../../../../../../test/helpers/strapi');
+const { createAuthRequest } = require('../../../../../../test/helpers/request');
 
 const builder = createTestBuilder();
 let strapi;

packages/core/content-manager/server/tests/fields/datetime.test.e2e.js

@@ -1,8 +1,8 @@
 'use strict';
 
-const { createTestBuilder } = require('../../../../../test/helpers/builder');
-const { createStrapiInstance } = require('../../../../../test/helpers/strapi');
-const { createAuthRequest } = require('../../../../../test/helpers/request');
+const { createTestBuilder } = require('../../../../../../test/helpers/builder');
+const { createStrapiInstance } = require('../../../../../../test/helpers/strapi');
+const { createAuthRequest } = require('../../../../../../test/helpers/request');
 
 const builder = createTestBuilder();
 let strapi;

packages/core/content-manager/server/tests/fields/decimal.test.e2e.js

@@ -1,8 +1,8 @@
 'use strict';
 
-const { createTestBuilder } = require('../../../../../test/helpers/builder');
-const { createStrapiInstance } = require('../../../../../test/helpers/strapi');
-const { createAuthRequest } = require('../../../../../test/helpers/request');
+const { createTestBuilder } = require('../../../../../../test/helpers/builder');
+const { createStrapiInstance } = require('../../../../../../test/helpers/strapi');
+const { createAuthRequest } = require('../../../../../../test/helpers/request');
 
 const builder = createTestBuilder();
 let strapi;

packages/core/content-manager/server/tests/fields/email.test.e2e.js

@@ -1,8 +1,8 @@
 'use strict';
 
-const { createTestBuilder } = require('../../../../../test/helpers/builder');
-const { createStrapiInstance } = require('../../../../../test/helpers/strapi');
-const { createAuthRequest } = require('../../../../../test/helpers/request');
+const { createTestBuilder } = require('../../../../../../test/helpers/builder');
+const { createStrapiInstance } = require('../../../../../../test/helpers/strapi');
+const { createAuthRequest } = require('../../../../../../test/helpers/request');
 
 const builder = createTestBuilder();
 let strapi;

packages/core/content-manager/server/tests/fields/enumeration.test.e2e.js

@@ -1,8 +1,8 @@
 'use strict';
 
-const { createTestBuilder } = require('../../../../../test/helpers/builder');
-const { createStrapiInstance } = require('../../../../../test/helpers/strapi');
-const { createAuthRequest } = require('../../../../../test/helpers/request');
+const { createTestBuilder } = require('../../../../../../test/helpers/builder');
+const { createStrapiInstance } = require('../../../../../../test/helpers/strapi');
+const { createAuthRequest } = require('../../../../../../test/helpers/request');
 
 const builder = createTestBuilder();
 let strapi;

packages/core/content-manager/server/tests/fields/float.test.e2e.js

@@ -1,8 +1,8 @@
 'use strict';
 
-const { createTestBuilder } = require('../../../../../test/helpers/builder');
-const { createStrapiInstance } = require('../../../../../test/helpers/strapi');
-const { createAuthRequest } = require('../../../../../test/helpers/request');
+const { createTestBuilder } = require('../../../../../../test/helpers/builder');
+const { createStrapiInstance } = require('../../../../../../test/helpers/strapi');
+const { createAuthRequest } = require('../../../../../../test/helpers/request');
 
 const builder = createTestBuilder();
 let strapi;

packages/core/content-manager/server/tests/fields/integer.test.e2e.js

@@ -1,8 +1,8 @@
 'use strict';
 
-const { createTestBuilder } = require('../../../../../test/helpers/builder');
-const { createStrapiInstance } = require('../../../../../test/helpers/strapi');
-const { createAuthRequest } = require('../../../../../test/helpers/request');
+const { createTestBuilder } = require('../../../../../../test/helpers/builder');
+const { createStrapiInstance } = require('../../../../../../test/helpers/strapi');
+const { createAuthRequest } = require('../../../../../../test/helpers/request');
 
 const builder = createTestBuilder();
 let strapi;

packages/core/content-manager/server/tests/fields/json.test.e2e.js

@@ -1,8 +1,8 @@
 'use strict';
 
-const { createTestBuilder } = require('../../../../../test/helpers/builder');
-const { createStrapiInstance } = require('../../../../../test/helpers/strapi');
-const { createAuthRequest } = require('../../../../../test/helpers/request');
+const { createTestBuilder } = require('../../../../../../test/helpers/builder');
+const { createStrapiInstance } = require('../../../../../../test/helpers/strapi');
+const { createAuthRequest } = require('../../../../../../test/helpers/request');
 
 const builder = createTestBuilder();
 let strapi;

packages/core/content-manager/server/tests/fields/password.test.e2e.js

@@ -1,8 +1,8 @@
 'use strict';
 
-const { createTestBuilder } = require('../../../../../test/helpers/builder');
-const { createStrapiInstance } = require('../../../../../test/helpers/strapi');
-const { createAuthRequest } = require('../../../../../test/helpers/request');
+const { createTestBuilder } = require('../../../../../../test/helpers/builder');
+const { createStrapiInstance } = require('../../../../../../test/helpers/strapi');
+const { createAuthRequest } = require('../../../../../../test/helpers/request');
 
 const builder = createTestBuilder();
 let strapi;

packages/core/content-manager/server/tests/fields/richtext.test.e2e.js

@@ -1,8 +1,8 @@
 'use strict';
 
-const { createTestBuilder } = require('../../../../../test/helpers/builder');
-const { createStrapiInstance } = require('../../../../../test/helpers/strapi');
-const { createAuthRequest } = require('../../../../../test/helpers/request');
+const { createTestBuilder } = require('../../../../../../test/helpers/builder');
+const { createStrapiInstance } = require('../../../../../../test/helpers/strapi');
+const { createAuthRequest } = require('../../../../../../test/helpers/request');
 
 const builder = createTestBuilder();
 let strapi;

packages/core/content-manager/server/tests/fields/string.test.e2e.js

@@ -1,8 +1,8 @@
 'use strict';
 
-const { createTestBuilder } = require('../../../../../test/helpers/builder');
-const { createStrapiInstance } = require('../../../../../test/helpers/strapi');
-const { createAuthRequest } = require('../../../../../test/helpers/request');
+const { createTestBuilder } = require('../../../../../../test/helpers/builder');
+const { createStrapiInstance } = require('../../../../../../test/helpers/strapi');
+const { createAuthRequest } = require('../../../../../../test/helpers/request');
 
 const builder = createTestBuilder();
 let strapi;

packages/core/content-manager/server/tests/fields/text.test.e2e.js

@@ -1,8 +1,8 @@
 'use strict';
 
-const { createTestBuilder } = require('../../../../../test/helpers/builder');
-const { createStrapiInstance } = require('../../../../../test/helpers/strapi');
-const { createAuthRequest } = require('../../../../../test/helpers/request');
+const { createTestBuilder } = require('../../../../../../test/helpers/builder');
+const { createStrapiInstance } = require('../../../../../../test/helpers/strapi');
+const { createAuthRequest } = require('../../../../../../test/helpers/request');
 
 const builder = createTestBuilder();
 let strapi;

packages/core/content-manager/server/tests/fields/time.test.e2e.js

@@ -1,8 +1,8 @@
 'use strict';
 
-const { createTestBuilder } = require('../../../../../test/helpers/builder');
-const { createStrapiInstance } = require('../../../../../test/helpers/strapi');
-const { createAuthRequest } = require('../../../../../test/helpers/request');
+const { createTestBuilder } = require('../../../../../../test/helpers/builder');
+const { createStrapiInstance } = require('../../../../../../test/helpers/strapi');
+const { createAuthRequest } = require('../../../../../../test/helpers/request');
 
 const builder = createTestBuilder();
 let strapi;

packages/core/content-manager/server/tests/fields/uid.test.e2e.js

@@ -1,8 +1,8 @@
 'use strict';
 
-const { createTestBuilder } = require('../../../../../test/helpers/builder');
-const { createStrapiInstance } = require('../../../../../test/helpers/strapi');
-const { createAuthRequest } = require('../../../../../test/helpers/request');
+const { createTestBuilder } = require('../../../../../../test/helpers/builder');
+const { createStrapiInstance } = require('../../../../../../test/helpers/strapi');
+const { createAuthRequest } = require('../../../../../../test/helpers/request');
 
 let strapi;
 let rq;

packages/core/content-manager/server/tests/index.test.e2e.js

@@ -1,10 +1,10 @@
 'use strict';
 
 // Helpers.
-const { createTestBuilder } = require('../../../../test/helpers/builder');
-const { createStrapiInstance } = require('../../../../test/helpers/strapi');
-const form = require('../../../../test/helpers/generators');
-const { createAuthRequest } = require('../../../../test/helpers/request');
+const { createTestBuilder } = require('../../../../../test/helpers/builder');
+const { createStrapiInstance } = require('../../../../../test/helpers/strapi');
+const form = require('../../../../../test/helpers/generators');
+const { createAuthRequest } = require('../../../../../test/helpers/request');
 
 const cleanDate = entry => {
   delete entry.updatedAt;

packages/core/content-manager/server/tests/relation-list.test.e2e.js

@@ -4,9 +4,9 @@
 
 const { omit, pick } = require('lodash/fp');
 
-const { createTestBuilder } = require('../../../../test/helpers/builder');
-const { createStrapiInstance } = require('../../../../test/helpers/strapi');
-const { createAuthRequest } = require('../../../../test/helpers/request');
+const { createTestBuilder } = require('../../../../../test/helpers/builder');
+const { createStrapiInstance } = require('../../../../../test/helpers/strapi');
+const { createAuthRequest } = require('../../../../../test/helpers/request');
 
 let strapi;
 let rq;

packages/core/content-manager/server/tests/search.test.e2e.js

@@ -2,9 +2,9 @@
 
 // Test an API with all the possible filed types and simple filterings (no deep filtering, no relations)
 const { omit } = require('lodash/fp');
-const { createTestBuilder } = require('../../../../test/helpers/builder');
-const { createStrapiInstance } = require('../../../../test/helpers/strapi');
-const { createAuthRequest } = require('../../../../test/helpers/request');
+const { createTestBuilder } = require('../../../../../test/helpers/builder');
+const { createStrapiInstance } = require('../../../../../test/helpers/strapi');
+const { createAuthRequest } = require('../../../../../test/helpers/request');
 
 const CREATOR_FIELDS = ['updatedBy', 'createdBy'];
 

packages/core/content-manager/server/tests/single-type.test.e2e.js

@@ -1,9 +1,9 @@
 'use strict';
 
 // Helpers.
-const { createTestBuilder } = require('../../../../test/helpers/builder');
-const { createStrapiInstance } = require('../../../../test/helpers/strapi');
-const { createAuthRequest } = require('../../../../test/helpers/request');
+const { createTestBuilder } = require('../../../../../test/helpers/builder');
+const { createStrapiInstance } = require('../../../../../test/helpers/strapi');
+const { createAuthRequest } = require('../../../../../test/helpers/request');
 
 const builder = createTestBuilder();
 let strapi;

packages/core/content-manager/strapi-server.js

@@ -1,17 +1,3 @@
 'use strict';
 
-const bootstrap = require('./server/bootstrap');
-const policies = require('./server/policies');
-const services = require('./server/services');
-const routes = require('./server/routes');
-const controllers = require('./server/controllers');
-
-module.exports = () => {
-  return {
-    bootstrap,
-    routes,
-    controllers,
-    policies,
-    services,
-  };
-};
+module.exports = require('./server');

packages/plugins/users-permissions/server/content-types/user/index.js

@@ -68,5 +68,5 @@ module.exports = {
     },
   },
 
-  config: schemaConfig, // TODO: to handle differently for V4
+  config: schemaConfig, // TODO: to move to content-manager options
 };

packages/plugins/users-permissions/server/controllers/user/admin.js

@@ -51,10 +51,9 @@ module.exports = {
    * @return {Object}
    */
   async create(ctx) {
-    const {
-      request: { body },
-      state: { userAbility, admin },
-    } = ctx;
+    const { body } = ctx.request;
+    const { user: admin, userAbility } = ctx.state;
+
     const { email, username, password } = body;
 
     const pm = strapi.admin.services.permission.createPermissionsManager({
@@ -117,7 +116,7 @@ module.exports = {
       [UPDATED_BY_ATTRIBUTE]: admin.id,
     };
 
-    user.email = user.email.toLowerCase();
+    user.email = _.toLower(user.email);
 
     if (!user.role) {
       const defaultRole = await strapi
@@ -141,15 +140,14 @@ module.exports = {
    */
 
   async update(ctx) {
+    const { id } = ctx.params;
+    const { body } = ctx.request;
+    const { user: admin, userAbility } = ctx.state;
+
     const advancedConfigs = await strapi
       .store({ type: 'plugin', name: 'users-permissions', key: 'advanced' })
       .get();
 
-    const {
-      params: { id },
-      request: { body },
-      state: { userAbility, admin },
-    } = ctx;
     const { email, username, password } = body;
 
     const { pm, entity: user } = await findEntityAndCheckPermissions(
@@ -191,7 +189,7 @@ module.exports = {
     if (_.has(body, 'email') && advancedConfigs.unique_email) {
       const userWithSameEmail = await strapi
         .query('plugin::users-permissions.user')
-        .findOne({ where: { email: email.toLowerCase() } });
+        .findOne({ where: { email: _.toLower(email) } });
 
       if (userWithSameEmail && userWithSameEmail.id != id) {
         return ctx.badRequest(
@@ -203,16 +201,12 @@ module.exports = {
           })
         );
       }
-      body.email = body.email.toLowerCase();
+      body.email = _.toLower(body.email);
     }
 
     const sanitizedData = pm.pickPermittedFieldsOf(body, { subject: pm.toSubject(user) });
     const updateData = _.omit({ ...sanitizedData, updatedBy: admin.id }, 'createdBy');
 
-    if (_.has(body, 'password') && password === user.password) {
-      delete updateData.password;
-    }
-
     const data = await getService('user').edit({ id }, updateData);
 
     ctx.body = pm.sanitize(data, { action: ACTIONS.read });

packages/plugins/users-permissions/server/controllers/user/api.js

@@ -67,7 +67,7 @@ module.exports = {
       provider: 'local',
     };
 
-    user.email = user.email.toLowerCase();
+    user.email = _.toLower(user.email);
 
     if (!role) {
       const defaultRole = await strapi
@@ -85,11 +85,11 @@ module.exports = {
       ctx.badRequest(null, formatError(error));
     }
   },
+
   /**
    * Update a/an user record.
    * @return {Object}
    */
-
   async update(ctx) {
     const advancedConfigs = await strapi
       .store({ type: 'plugin', name: 'users-permissions', key: 'advanced' })
@@ -98,9 +98,7 @@ module.exports = {
     const { id } = ctx.params;
     const { email, username, password } = ctx.request.body;
 
-    const user = await getService('user').fetch({
-      id,
-    });
+    const user = await getService('user').fetch({ id });
 
     if (_.has(ctx.request.body, 'email') && !email) {
       return ctx.badRequest('email.notNull');
@@ -153,10 +151,6 @@ module.exports = {
       ...ctx.request.body,
     };
 
-    if (_.has(ctx.request.body, 'password') && password === user.password) {
-      delete updateData.password;
-    }
-
     const data = await getService('user').edit({ id }, updateData);
 
     ctx.send(sanitizeUser(data));