From 7cf05bfb10b045e52fe4db93d7526c8ef4170b19 Mon Sep 17 00:00:00 2001 From: Alexandre Bodin Date: Fri, 24 Sep 2021 09:04:44 +0200 Subject: [PATCH] Move CM files into the new structure --- .../core/content-manager/config/admin.json | 5 ---- .../config/functions/bootstrap.js | 9 ------ .../core/content-manager/server/bootstrap.js | 8 ++++-- .../__tests__/content-types.test.js | 2 +- .../controllers/__tests__/relations.test.js | 2 +- .../__tests__/single-types.test.js | 2 +- .../controllers/collection-types.js | 0 .../{ => server}/controllers/components.js | 0 .../{ => server}/controllers/content-types.js | 0 .../server/controllers/index.js | 12 ++++---- .../{ => server}/controllers/relations.js | 0 .../{ => server}/controllers/single-types.js | 0 .../{ => server}/controllers/uid.js | 0 .../controllers/validation/index.js | 0 .../validation/model-configuration.js | 0 packages/core/content-manager/server/index.js | 17 ++++++++++++ .../__tests__/has-draft-and-publish.test.js | 0 .../policies/has-draft-and-publish.js | 0 .../policies/hasPermissions.js | 2 +- .../content-manager/server/policies/index.js | 6 ++-- .../{config => server}/policies/routing.js | 0 .../services/__tests__/content-types.test.js | 0 .../services/__tests__/entity-manager.test.js | 0 .../services/__tests__/metrics.test.js | 0 .../services/__tests__/uid.test.js | 0 .../{ => server}/services/components.js | 0 .../{ => server}/services/configuration.js | 0 .../{ => server}/services/content-types.js | 0 .../{ => server}/services/data-mapper.js | 0 .../{ => server}/services/entity-manager.d.ts | 0 .../{ => server}/services/entity-manager.js | 0 .../content-manager/server/services/index.js | 16 +++++------ .../{ => server}/services/metrics.js | 0 .../services/permission-checker.js | 0 .../{ => server}/services/permission.js | 0 .../{ => server}/services/uid.js | 0 .../__tests__/attributes.test.js | 0 .../configuration/__tests__/settings.test.js | 0 .../utils/configuration/attributes.js | 0 .../services/utils/configuration/index.js | 0 .../services/utils/configuration/layouts.js | 0 .../services/utils/configuration/metadatas.js | 0 .../services/utils/configuration/settings.js | 0 .../{ => server}/services/utils/store.js | 0 .../api/basic-compo-repeatable.test.e2e.js | 6 ++-- .../tests/api/basic-compo.test.e2e.js | 6 ++-- .../api/basic-dp-compo-repeatable.test.e2e.js | 6 ++-- .../tests/api/basic-dp-compo.test.e2e.js | 6 ++-- .../tests/api/basic-dp-dz.test.e2e.js | 6 ++-- .../tests/api/basic-dp.test.e2e.js | 6 ++-- .../tests/api/basic-dz.test.e2e.js | 6 ++-- .../tests/api/basic-relations.test.e2e.js | 6 ++-- .../{ => server}/tests/api/basic.test.e2e.js | 6 ++-- .../api/x-to-many-rf-preview.test.e2e.js | 6 ++-- ...epeatable-not-required-min-max.test.e2e.js | 6 ++-- .../repeatable-not-required.test.e2e.js | 6 ++-- .../repeatable-required-min-max.test.e2e.js | 6 ++-- .../repeatable-required.test.e2e.js | 6 ++-- .../single-not-required.test.e2e.js | 6 ++-- .../components/single-required.test.e2e.js | 6 ++-- .../tests/content-manager/uid.test.e2e.js | 6 ++-- .../{ => server}/tests/dynamiczones/rec.jpg | Bin .../tests/dynamiczones/simple.test.e2e.js | 6 ++-- .../tests/dynamiczones/with-media.test.e2e.js | 6 ++-- .../tests/fields/biginteger.test.e2e.js | 6 ++-- .../tests/fields/boolean.test.e2e.js | 6 ++-- .../tests/fields/date.test.e2e.js | 6 ++-- .../tests/fields/datetime.test.e2e.js | 6 ++-- .../tests/fields/decimal.test.e2e.js | 6 ++-- .../tests/fields/email.test.e2e.js | 6 ++-- .../tests/fields/enumeration.test.e2e.js | 6 ++-- .../tests/fields/float.test.e2e.js | 6 ++-- .../tests/fields/integer.test.e2e.js | 6 ++-- .../tests/fields/json.test.e2e.js | 6 ++-- .../tests/fields/password.test.e2e.js | 6 ++-- .../tests/fields/richtext.test.e2e.js | 6 ++-- .../tests/fields/string.test.e2e.js | 6 ++-- .../tests/fields/text.test.e2e.js | 6 ++-- .../tests/fields/time.test.e2e.js | 6 ++-- .../{ => server}/tests/fields/uid.test.e2e.js | 6 ++-- .../front/integration/createPage_specs.js | 0 .../tests/front/integration/init_specs.js | 0 .../tests/front/integration/listPage_specs.js | 0 .../{ => server}/tests/index.test.e2e.js | 8 +++--- .../tests/relation-list.test.e2e.js | 6 ++-- .../{ => server}/tests/search.test.e2e.js | 6 ++-- .../tests/single-type.test.e2e.js | 6 ++-- .../{ => server}/utils/index.d.ts | 0 .../{ => server}/utils/index.js | 0 .../utils/pick-writable-attributes.js | 0 .../{ => server}/utils/wrap-bad-request.js | 0 .../validation/policies/hasPermissions.js | 0 .../core/content-manager/strapi-server.js | 16 +---------- .../server/content-types/user/index.js | 2 +- .../server/controllers/user/admin.js | 26 +++++++----------- .../server/controllers/user/api.js | 12 ++------ 96 files changed, 177 insertions(+), 196 deletions(-) delete mode 100644 packages/core/content-manager/config/admin.json delete mode 100644 packages/core/content-manager/config/functions/bootstrap.js rename packages/core/content-manager/{ => server}/controllers/__tests__/content-types.test.js (93%) rename packages/core/content-manager/{ => server}/controllers/__tests__/relations.test.js (98%) rename packages/core/content-manager/{ => server}/controllers/__tests__/single-types.test.js (99%) rename packages/core/content-manager/{ => server}/controllers/collection-types.js (100%) rename packages/core/content-manager/{ => server}/controllers/components.js (100%) rename packages/core/content-manager/{ => server}/controllers/content-types.js (100%) rename packages/core/content-manager/{ => server}/controllers/relations.js (100%) rename packages/core/content-manager/{ => server}/controllers/single-types.js (100%) rename packages/core/content-manager/{ => server}/controllers/uid.js (100%) rename packages/core/content-manager/{ => server}/controllers/validation/index.js (100%) rename packages/core/content-manager/{ => server}/controllers/validation/model-configuration.js (100%) create mode 100644 packages/core/content-manager/server/index.js rename packages/core/content-manager/{config => server}/policies/__tests__/has-draft-and-publish.test.js (100%) rename packages/core/content-manager/{config => server}/policies/has-draft-and-publish.js (100%) rename packages/core/content-manager/{config => server}/policies/hasPermissions.js (88%) rename packages/core/content-manager/{config => server}/policies/routing.js (100%) rename packages/core/content-manager/{ => server}/services/__tests__/content-types.test.js (100%) rename packages/core/content-manager/{ => server}/services/__tests__/entity-manager.test.js (100%) rename packages/core/content-manager/{ => server}/services/__tests__/metrics.test.js (100%) rename packages/core/content-manager/{ => server}/services/__tests__/uid.test.js (100%) rename packages/core/content-manager/{ => server}/services/components.js (100%) rename packages/core/content-manager/{ => server}/services/configuration.js (100%) rename packages/core/content-manager/{ => server}/services/content-types.js (100%) rename packages/core/content-manager/{ => server}/services/data-mapper.js (100%) rename packages/core/content-manager/{ => server}/services/entity-manager.d.ts (100%) rename packages/core/content-manager/{ => server}/services/entity-manager.js (100%) rename packages/core/content-manager/{ => server}/services/metrics.js (100%) rename packages/core/content-manager/{ => server}/services/permission-checker.js (100%) rename packages/core/content-manager/{ => server}/services/permission.js (100%) rename packages/core/content-manager/{ => server}/services/uid.js (100%) rename packages/core/content-manager/{ => server}/services/utils/configuration/__tests__/attributes.test.js (100%) rename packages/core/content-manager/{ => server}/services/utils/configuration/__tests__/settings.test.js (100%) rename packages/core/content-manager/{ => server}/services/utils/configuration/attributes.js (100%) rename packages/core/content-manager/{ => server}/services/utils/configuration/index.js (100%) rename packages/core/content-manager/{ => server}/services/utils/configuration/layouts.js (100%) rename packages/core/content-manager/{ => server}/services/utils/configuration/metadatas.js (100%) rename packages/core/content-manager/{ => server}/services/utils/configuration/settings.js (100%) rename packages/core/content-manager/{ => server}/services/utils/store.js (100%) rename packages/core/content-manager/{ => server}/tests/api/basic-compo-repeatable.test.e2e.js (95%) rename packages/core/content-manager/{ => server}/tests/api/basic-compo.test.e2e.js (95%) rename packages/core/content-manager/{ => server}/tests/api/basic-dp-compo-repeatable.test.e2e.js (96%) rename packages/core/content-manager/{ => server}/tests/api/basic-dp-compo.test.e2e.js (95%) rename packages/core/content-manager/{ => server}/tests/api/basic-dp-dz.test.e2e.js (96%) rename packages/core/content-manager/{ => server}/tests/api/basic-dp.test.e2e.js (96%) rename packages/core/content-manager/{ => server}/tests/api/basic-dz.test.e2e.js (96%) rename packages/core/content-manager/{ => server}/tests/api/basic-relations.test.e2e.js (98%) rename packages/core/content-manager/{ => server}/tests/api/basic.test.e2e.js (94%) rename packages/core/content-manager/{ => server}/tests/api/x-to-many-rf-preview.test.e2e.js (95%) rename packages/core/content-manager/{ => server}/tests/components/repeatable-not-required-min-max.test.e2e.js (98%) rename packages/core/content-manager/{ => server}/tests/components/repeatable-not-required.test.e2e.js (98%) rename packages/core/content-manager/{ => server}/tests/components/repeatable-required-min-max.test.e2e.js (98%) rename packages/core/content-manager/{ => server}/tests/components/repeatable-required.test.e2e.js (98%) rename packages/core/content-manager/{ => server}/tests/components/single-not-required.test.e2e.js (97%) rename packages/core/content-manager/{ => server}/tests/components/single-required.test.e2e.js (97%) rename packages/core/content-manager/{ => server}/tests/content-manager/uid.test.e2e.js (97%) rename packages/core/content-manager/{ => server}/tests/dynamiczones/rec.jpg (100%) rename packages/core/content-manager/{ => server}/tests/dynamiczones/simple.test.e2e.js (97%) rename packages/core/content-manager/{ => server}/tests/dynamiczones/with-media.test.e2e.js (97%) rename packages/core/content-manager/{ => server}/tests/fields/biginteger.test.e2e.js (90%) rename packages/core/content-manager/{ => server}/tests/fields/boolean.test.e2e.js (91%) rename packages/core/content-manager/{ => server}/tests/fields/date.test.e2e.js (92%) rename packages/core/content-manager/{ => server}/tests/fields/datetime.test.e2e.js (92%) rename packages/core/content-manager/{ => server}/tests/fields/decimal.test.e2e.js (89%) rename packages/core/content-manager/{ => server}/tests/fields/email.test.e2e.js (90%) rename packages/core/content-manager/{ => server}/tests/fields/enumeration.test.e2e.js (91%) rename packages/core/content-manager/{ => server}/tests/fields/float.test.e2e.js (89%) rename packages/core/content-manager/{ => server}/tests/fields/integer.test.e2e.js (89%) rename packages/core/content-manager/{ => server}/tests/fields/json.test.e2e.js (90%) rename packages/core/content-manager/{ => server}/tests/fields/password.test.e2e.js (89%) rename packages/core/content-manager/{ => server}/tests/fields/richtext.test.e2e.js (88%) rename packages/core/content-manager/{ => server}/tests/fields/string.test.e2e.js (87%) rename packages/core/content-manager/{ => server}/tests/fields/text.test.e2e.js (87%) rename packages/core/content-manager/{ => server}/tests/fields/time.test.e2e.js (90%) rename packages/core/content-manager/{ => server}/tests/fields/uid.test.e2e.js (93%) rename packages/core/content-manager/{ => server}/tests/front/integration/createPage_specs.js (100%) rename packages/core/content-manager/{ => server}/tests/front/integration/init_specs.js (100%) rename packages/core/content-manager/{ => server}/tests/front/integration/listPage_specs.js (100%) rename packages/core/content-manager/{ => server}/tests/index.test.e2e.js (98%) rename packages/core/content-manager/{ => server}/tests/relation-list.test.e2e.js (95%) rename packages/core/content-manager/{ => server}/tests/search.test.e2e.js (96%) rename packages/core/content-manager/{ => server}/tests/single-type.test.e2e.js (88%) rename packages/core/content-manager/{ => server}/utils/index.d.ts (100%) rename packages/core/content-manager/{ => server}/utils/index.js (100%) rename packages/core/content-manager/{ => server}/utils/pick-writable-attributes.js (100%) rename packages/core/content-manager/{ => server}/utils/wrap-bad-request.js (100%) rename packages/core/content-manager/{ => server}/validation/policies/hasPermissions.js (100%) diff --git a/packages/core/content-manager/config/admin.json b/packages/core/content-manager/config/admin.json deleted file mode 100644 index a52c476cc5..0000000000 --- a/packages/core/content-manager/config/admin.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "admin": { - "schema": {} - } -} \ No newline at end of file diff --git a/packages/core/content-manager/config/functions/bootstrap.js b/packages/core/content-manager/config/functions/bootstrap.js deleted file mode 100644 index 75a33ccfb9..0000000000 --- a/packages/core/content-manager/config/functions/bootstrap.js +++ /dev/null @@ -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(); -}; diff --git a/packages/core/content-manager/server/bootstrap.js b/packages/core/content-manager/server/bootstrap.js index baf393ebe4..5d12cbc871 100644 --- a/packages/core/content-manager/server/bootstrap.js +++ b/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(); +}; diff --git a/packages/core/content-manager/controllers/__tests__/content-types.test.js b/packages/core/content-manager/server/controllers/__tests__/content-types.test.js similarity index 93% rename from packages/core/content-manager/controllers/__tests__/content-types.test.js rename to packages/core/content-manager/server/controllers/__tests__/content-types.test.js index 0147cc972a..9c194b66c1 100644 --- a/packages/core/content-manager/controllers/__tests__/content-types.test.js +++ b/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', () => { diff --git a/packages/core/content-manager/controllers/__tests__/relations.test.js b/packages/core/content-manager/server/controllers/__tests__/relations.test.js similarity index 98% rename from packages/core/content-manager/controllers/__tests__/relations.test.js rename to packages/core/content-manager/server/controllers/__tests__/relations.test.js index 288f4d66aa..b9b629310d 100644 --- a/packages/core/content-manager/controllers/__tests__/relations.test.js +++ b/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', () => { diff --git a/packages/core/content-manager/controllers/__tests__/single-types.test.js b/packages/core/content-manager/server/controllers/__tests__/single-types.test.js similarity index 99% rename from packages/core/content-manager/controllers/__tests__/single-types.test.js rename to packages/core/content-manager/server/controllers/__tests__/single-types.test.js index ceee7ad4e8..e803482c4c 100644 --- a/packages/core/content-manager/controllers/__tests__/single-types.test.js +++ b/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', () => { diff --git a/packages/core/content-manager/controllers/collection-types.js b/packages/core/content-manager/server/controllers/collection-types.js similarity index 100% rename from packages/core/content-manager/controllers/collection-types.js rename to packages/core/content-manager/server/controllers/collection-types.js diff --git a/packages/core/content-manager/controllers/components.js b/packages/core/content-manager/server/controllers/components.js similarity index 100% rename from packages/core/content-manager/controllers/components.js rename to packages/core/content-manager/server/controllers/components.js diff --git a/packages/core/content-manager/controllers/content-types.js b/packages/core/content-manager/server/controllers/content-types.js similarity index 100% rename from packages/core/content-manager/controllers/content-types.js rename to packages/core/content-manager/server/controllers/content-types.js diff --git a/packages/core/content-manager/server/controllers/index.js b/packages/core/content-manager/server/controllers/index.js index 6b90db91ad..c5cf9b56c8 100644 --- a/packages/core/content-manager/server/controllers/index.js +++ b/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, diff --git a/packages/core/content-manager/controllers/relations.js b/packages/core/content-manager/server/controllers/relations.js similarity index 100% rename from packages/core/content-manager/controllers/relations.js rename to packages/core/content-manager/server/controllers/relations.js diff --git a/packages/core/content-manager/controllers/single-types.js b/packages/core/content-manager/server/controllers/single-types.js similarity index 100% rename from packages/core/content-manager/controllers/single-types.js rename to packages/core/content-manager/server/controllers/single-types.js diff --git a/packages/core/content-manager/controllers/uid.js b/packages/core/content-manager/server/controllers/uid.js similarity index 100% rename from packages/core/content-manager/controllers/uid.js rename to packages/core/content-manager/server/controllers/uid.js diff --git a/packages/core/content-manager/controllers/validation/index.js b/packages/core/content-manager/server/controllers/validation/index.js similarity index 100% rename from packages/core/content-manager/controllers/validation/index.js rename to packages/core/content-manager/server/controllers/validation/index.js diff --git a/packages/core/content-manager/controllers/validation/model-configuration.js b/packages/core/content-manager/server/controllers/validation/model-configuration.js similarity index 100% rename from packages/core/content-manager/controllers/validation/model-configuration.js rename to packages/core/content-manager/server/controllers/validation/model-configuration.js diff --git a/packages/core/content-manager/server/index.js b/packages/core/content-manager/server/index.js new file mode 100644 index 0000000000..26967415de --- /dev/null +++ b/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, + }; +}; diff --git a/packages/core/content-manager/config/policies/__tests__/has-draft-and-publish.test.js b/packages/core/content-manager/server/policies/__tests__/has-draft-and-publish.test.js similarity index 100% rename from packages/core/content-manager/config/policies/__tests__/has-draft-and-publish.test.js rename to packages/core/content-manager/server/policies/__tests__/has-draft-and-publish.test.js diff --git a/packages/core/content-manager/config/policies/has-draft-and-publish.js b/packages/core/content-manager/server/policies/has-draft-and-publish.js similarity index 100% rename from packages/core/content-manager/config/policies/has-draft-and-publish.js rename to packages/core/content-manager/server/policies/has-draft-and-publish.js diff --git a/packages/core/content-manager/config/policies/hasPermissions.js b/packages/core/content-manager/server/policies/hasPermissions.js similarity index 88% rename from packages/core/content-manager/config/policies/hasPermissions.js rename to packages/core/content-manager/server/policies/hasPermissions.js index d963a12641..23286ae36d 100644 --- a/packages/core/content-manager/config/policies/hasPermissions.js +++ b/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) => { diff --git a/packages/core/content-manager/server/policies/index.js b/packages/core/content-manager/server/policies/index.js index 87985a9c0b..3549e88066 100644 --- a/packages/core/content-manager/server/policies/index.js +++ b/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, diff --git a/packages/core/content-manager/config/policies/routing.js b/packages/core/content-manager/server/policies/routing.js similarity index 100% rename from packages/core/content-manager/config/policies/routing.js rename to packages/core/content-manager/server/policies/routing.js diff --git a/packages/core/content-manager/services/__tests__/content-types.test.js b/packages/core/content-manager/server/services/__tests__/content-types.test.js similarity index 100% rename from packages/core/content-manager/services/__tests__/content-types.test.js rename to packages/core/content-manager/server/services/__tests__/content-types.test.js diff --git a/packages/core/content-manager/services/__tests__/entity-manager.test.js b/packages/core/content-manager/server/services/__tests__/entity-manager.test.js similarity index 100% rename from packages/core/content-manager/services/__tests__/entity-manager.test.js rename to packages/core/content-manager/server/services/__tests__/entity-manager.test.js diff --git a/packages/core/content-manager/services/__tests__/metrics.test.js b/packages/core/content-manager/server/services/__tests__/metrics.test.js similarity index 100% rename from packages/core/content-manager/services/__tests__/metrics.test.js rename to packages/core/content-manager/server/services/__tests__/metrics.test.js diff --git a/packages/core/content-manager/services/__tests__/uid.test.js b/packages/core/content-manager/server/services/__tests__/uid.test.js similarity index 100% rename from packages/core/content-manager/services/__tests__/uid.test.js rename to packages/core/content-manager/server/services/__tests__/uid.test.js diff --git a/packages/core/content-manager/services/components.js b/packages/core/content-manager/server/services/components.js similarity index 100% rename from packages/core/content-manager/services/components.js rename to packages/core/content-manager/server/services/components.js diff --git a/packages/core/content-manager/services/configuration.js b/packages/core/content-manager/server/services/configuration.js similarity index 100% rename from packages/core/content-manager/services/configuration.js rename to packages/core/content-manager/server/services/configuration.js diff --git a/packages/core/content-manager/services/content-types.js b/packages/core/content-manager/server/services/content-types.js similarity index 100% rename from packages/core/content-manager/services/content-types.js rename to packages/core/content-manager/server/services/content-types.js diff --git a/packages/core/content-manager/services/data-mapper.js b/packages/core/content-manager/server/services/data-mapper.js similarity index 100% rename from packages/core/content-manager/services/data-mapper.js rename to packages/core/content-manager/server/services/data-mapper.js diff --git a/packages/core/content-manager/services/entity-manager.d.ts b/packages/core/content-manager/server/services/entity-manager.d.ts similarity index 100% rename from packages/core/content-manager/services/entity-manager.d.ts rename to packages/core/content-manager/server/services/entity-manager.d.ts diff --git a/packages/core/content-manager/services/entity-manager.js b/packages/core/content-manager/server/services/entity-manager.js similarity index 100% rename from packages/core/content-manager/services/entity-manager.js rename to packages/core/content-manager/server/services/entity-manager.js diff --git a/packages/core/content-manager/server/services/index.js b/packages/core/content-manager/server/services/index.js index 39cef1c296..745c54ba25 100644 --- a/packages/core/content-manager/server/services/index.js +++ b/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, diff --git a/packages/core/content-manager/services/metrics.js b/packages/core/content-manager/server/services/metrics.js similarity index 100% rename from packages/core/content-manager/services/metrics.js rename to packages/core/content-manager/server/services/metrics.js diff --git a/packages/core/content-manager/services/permission-checker.js b/packages/core/content-manager/server/services/permission-checker.js similarity index 100% rename from packages/core/content-manager/services/permission-checker.js rename to packages/core/content-manager/server/services/permission-checker.js diff --git a/packages/core/content-manager/services/permission.js b/packages/core/content-manager/server/services/permission.js similarity index 100% rename from packages/core/content-manager/services/permission.js rename to packages/core/content-manager/server/services/permission.js diff --git a/packages/core/content-manager/services/uid.js b/packages/core/content-manager/server/services/uid.js similarity index 100% rename from packages/core/content-manager/services/uid.js rename to packages/core/content-manager/server/services/uid.js diff --git a/packages/core/content-manager/services/utils/configuration/__tests__/attributes.test.js b/packages/core/content-manager/server/services/utils/configuration/__tests__/attributes.test.js similarity index 100% rename from packages/core/content-manager/services/utils/configuration/__tests__/attributes.test.js rename to packages/core/content-manager/server/services/utils/configuration/__tests__/attributes.test.js diff --git a/packages/core/content-manager/services/utils/configuration/__tests__/settings.test.js b/packages/core/content-manager/server/services/utils/configuration/__tests__/settings.test.js similarity index 100% rename from packages/core/content-manager/services/utils/configuration/__tests__/settings.test.js rename to packages/core/content-manager/server/services/utils/configuration/__tests__/settings.test.js diff --git a/packages/core/content-manager/services/utils/configuration/attributes.js b/packages/core/content-manager/server/services/utils/configuration/attributes.js similarity index 100% rename from packages/core/content-manager/services/utils/configuration/attributes.js rename to packages/core/content-manager/server/services/utils/configuration/attributes.js diff --git a/packages/core/content-manager/services/utils/configuration/index.js b/packages/core/content-manager/server/services/utils/configuration/index.js similarity index 100% rename from packages/core/content-manager/services/utils/configuration/index.js rename to packages/core/content-manager/server/services/utils/configuration/index.js diff --git a/packages/core/content-manager/services/utils/configuration/layouts.js b/packages/core/content-manager/server/services/utils/configuration/layouts.js similarity index 100% rename from packages/core/content-manager/services/utils/configuration/layouts.js rename to packages/core/content-manager/server/services/utils/configuration/layouts.js diff --git a/packages/core/content-manager/services/utils/configuration/metadatas.js b/packages/core/content-manager/server/services/utils/configuration/metadatas.js similarity index 100% rename from packages/core/content-manager/services/utils/configuration/metadatas.js rename to packages/core/content-manager/server/services/utils/configuration/metadatas.js diff --git a/packages/core/content-manager/services/utils/configuration/settings.js b/packages/core/content-manager/server/services/utils/configuration/settings.js similarity index 100% rename from packages/core/content-manager/services/utils/configuration/settings.js rename to packages/core/content-manager/server/services/utils/configuration/settings.js diff --git a/packages/core/content-manager/services/utils/store.js b/packages/core/content-manager/server/services/utils/store.js similarity index 100% rename from packages/core/content-manager/services/utils/store.js rename to packages/core/content-manager/server/services/utils/store.js diff --git a/packages/core/content-manager/tests/api/basic-compo-repeatable.test.e2e.js b/packages/core/content-manager/server/tests/api/basic-compo-repeatable.test.e2e.js similarity index 95% rename from packages/core/content-manager/tests/api/basic-compo-repeatable.test.e2e.js rename to packages/core/content-manager/server/tests/api/basic-compo-repeatable.test.e2e.js index 556b032916..b648bf5049 100644 --- a/packages/core/content-manager/tests/api/basic-compo-repeatable.test.e2e.js +++ b/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; diff --git a/packages/core/content-manager/tests/api/basic-compo.test.e2e.js b/packages/core/content-manager/server/tests/api/basic-compo.test.e2e.js similarity index 95% rename from packages/core/content-manager/tests/api/basic-compo.test.e2e.js rename to packages/core/content-manager/server/tests/api/basic-compo.test.e2e.js index 790e69cff4..b2664a05d2 100644 --- a/packages/core/content-manager/tests/api/basic-compo.test.e2e.js +++ b/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; diff --git a/packages/core/content-manager/tests/api/basic-dp-compo-repeatable.test.e2e.js b/packages/core/content-manager/server/tests/api/basic-dp-compo-repeatable.test.e2e.js similarity index 96% rename from packages/core/content-manager/tests/api/basic-dp-compo-repeatable.test.e2e.js rename to packages/core/content-manager/server/tests/api/basic-dp-compo-repeatable.test.e2e.js index 04eae334b3..c5c4e3ca32 100644 --- a/packages/core/content-manager/tests/api/basic-dp-compo-repeatable.test.e2e.js +++ b/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; diff --git a/packages/core/content-manager/tests/api/basic-dp-compo.test.e2e.js b/packages/core/content-manager/server/tests/api/basic-dp-compo.test.e2e.js similarity index 95% rename from packages/core/content-manager/tests/api/basic-dp-compo.test.e2e.js rename to packages/core/content-manager/server/tests/api/basic-dp-compo.test.e2e.js index 9aa0791d4e..d0d3341d87 100644 --- a/packages/core/content-manager/tests/api/basic-dp-compo.test.e2e.js +++ b/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; diff --git a/packages/core/content-manager/tests/api/basic-dp-dz.test.e2e.js b/packages/core/content-manager/server/tests/api/basic-dp-dz.test.e2e.js similarity index 96% rename from packages/core/content-manager/tests/api/basic-dp-dz.test.e2e.js rename to packages/core/content-manager/server/tests/api/basic-dp-dz.test.e2e.js index 5f39dec8d6..d4b4c1d039 100644 --- a/packages/core/content-manager/tests/api/basic-dp-dz.test.e2e.js +++ b/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; diff --git a/packages/core/content-manager/tests/api/basic-dp.test.e2e.js b/packages/core/content-manager/server/tests/api/basic-dp.test.e2e.js similarity index 96% rename from packages/core/content-manager/tests/api/basic-dp.test.e2e.js rename to packages/core/content-manager/server/tests/api/basic-dp.test.e2e.js index 1582f40a53..d15ed1a927 100644 --- a/packages/core/content-manager/tests/api/basic-dp.test.e2e.js +++ b/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; diff --git a/packages/core/content-manager/tests/api/basic-dz.test.e2e.js b/packages/core/content-manager/server/tests/api/basic-dz.test.e2e.js similarity index 96% rename from packages/core/content-manager/tests/api/basic-dz.test.e2e.js rename to packages/core/content-manager/server/tests/api/basic-dz.test.e2e.js index 954057ae71..fa38880f34 100644 --- a/packages/core/content-manager/tests/api/basic-dz.test.e2e.js +++ b/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; diff --git a/packages/core/content-manager/tests/api/basic-relations.test.e2e.js b/packages/core/content-manager/server/tests/api/basic-relations.test.e2e.js similarity index 98% rename from packages/core/content-manager/tests/api/basic-relations.test.e2e.js rename to packages/core/content-manager/server/tests/api/basic-relations.test.e2e.js index 006d92d6e6..21da72fb65 100644 --- a/packages/core/content-manager/tests/api/basic-relations.test.e2e.js +++ b/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; diff --git a/packages/core/content-manager/tests/api/basic.test.e2e.js b/packages/core/content-manager/server/tests/api/basic.test.e2e.js similarity index 94% rename from packages/core/content-manager/tests/api/basic.test.e2e.js rename to packages/core/content-manager/server/tests/api/basic.test.e2e.js index e6a6660fea..88912f5ca4 100644 --- a/packages/core/content-manager/tests/api/basic.test.e2e.js +++ b/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; diff --git a/packages/core/content-manager/tests/api/x-to-many-rf-preview.test.e2e.js b/packages/core/content-manager/server/tests/api/x-to-many-rf-preview.test.e2e.js similarity index 95% rename from packages/core/content-manager/tests/api/x-to-many-rf-preview.test.e2e.js rename to packages/core/content-manager/server/tests/api/x-to-many-rf-preview.test.e2e.js index b78cd486d4..fd232b6476 100644 --- a/packages/core/content-manager/tests/api/x-to-many-rf-preview.test.e2e.js +++ b/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)); diff --git a/packages/core/content-manager/tests/components/repeatable-not-required-min-max.test.e2e.js b/packages/core/content-manager/server/tests/components/repeatable-not-required-min-max.test.e2e.js similarity index 98% rename from packages/core/content-manager/tests/components/repeatable-not-required-min-max.test.e2e.js rename to packages/core/content-manager/server/tests/components/repeatable-not-required-min-max.test.e2e.js index 1910d4c33d..aedcf2388f 100644 --- a/packages/core/content-manager/tests/components/repeatable-not-required-min-max.test.e2e.js +++ b/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; diff --git a/packages/core/content-manager/tests/components/repeatable-not-required.test.e2e.js b/packages/core/content-manager/server/tests/components/repeatable-not-required.test.e2e.js similarity index 98% rename from packages/core/content-manager/tests/components/repeatable-not-required.test.e2e.js rename to packages/core/content-manager/server/tests/components/repeatable-not-required.test.e2e.js index 7a76cecf10..6ddb635e16 100644 --- a/packages/core/content-manager/tests/components/repeatable-not-required.test.e2e.js +++ b/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; diff --git a/packages/core/content-manager/tests/components/repeatable-required-min-max.test.e2e.js b/packages/core/content-manager/server/tests/components/repeatable-required-min-max.test.e2e.js similarity index 98% rename from packages/core/content-manager/tests/components/repeatable-required-min-max.test.e2e.js rename to packages/core/content-manager/server/tests/components/repeatable-required-min-max.test.e2e.js index 9b730bb717..565700c984 100644 --- a/packages/core/content-manager/tests/components/repeatable-required-min-max.test.e2e.js +++ b/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; diff --git a/packages/core/content-manager/tests/components/repeatable-required.test.e2e.js b/packages/core/content-manager/server/tests/components/repeatable-required.test.e2e.js similarity index 98% rename from packages/core/content-manager/tests/components/repeatable-required.test.e2e.js rename to packages/core/content-manager/server/tests/components/repeatable-required.test.e2e.js index 6a36962fd7..0e19c20cde 100644 --- a/packages/core/content-manager/tests/components/repeatable-required.test.e2e.js +++ b/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; diff --git a/packages/core/content-manager/tests/components/single-not-required.test.e2e.js b/packages/core/content-manager/server/tests/components/single-not-required.test.e2e.js similarity index 97% rename from packages/core/content-manager/tests/components/single-not-required.test.e2e.js rename to packages/core/content-manager/server/tests/components/single-not-required.test.e2e.js index d0b7ccea24..50af149f0d 100644 --- a/packages/core/content-manager/tests/components/single-not-required.test.e2e.js +++ b/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; diff --git a/packages/core/content-manager/tests/components/single-required.test.e2e.js b/packages/core/content-manager/server/tests/components/single-required.test.e2e.js similarity index 97% rename from packages/core/content-manager/tests/components/single-required.test.e2e.js rename to packages/core/content-manager/server/tests/components/single-required.test.e2e.js index 7b67c588ac..28d08d5b5e 100644 --- a/packages/core/content-manager/tests/components/single-required.test.e2e.js +++ b/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; diff --git a/packages/core/content-manager/tests/content-manager/uid.test.e2e.js b/packages/core/content-manager/server/tests/content-manager/uid.test.e2e.js similarity index 97% rename from packages/core/content-manager/tests/content-manager/uid.test.e2e.js rename to packages/core/content-manager/server/tests/content-manager/uid.test.e2e.js index 253c671b6b..1f38025cfe 100644 --- a/packages/core/content-manager/tests/content-manager/uid.test.e2e.js +++ b/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; diff --git a/packages/core/content-manager/tests/dynamiczones/rec.jpg b/packages/core/content-manager/server/tests/dynamiczones/rec.jpg similarity index 100% rename from packages/core/content-manager/tests/dynamiczones/rec.jpg rename to packages/core/content-manager/server/tests/dynamiczones/rec.jpg diff --git a/packages/core/content-manager/tests/dynamiczones/simple.test.e2e.js b/packages/core/content-manager/server/tests/dynamiczones/simple.test.e2e.js similarity index 97% rename from packages/core/content-manager/tests/dynamiczones/simple.test.e2e.js rename to packages/core/content-manager/server/tests/dynamiczones/simple.test.e2e.js index 05f0ad6000..329d0cebd6 100644 --- a/packages/core/content-manager/tests/dynamiczones/simple.test.e2e.js +++ b/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; diff --git a/packages/core/content-manager/tests/dynamiczones/with-media.test.e2e.js b/packages/core/content-manager/server/tests/dynamiczones/with-media.test.e2e.js similarity index 97% rename from packages/core/content-manager/tests/dynamiczones/with-media.test.e2e.js rename to packages/core/content-manager/server/tests/dynamiczones/with-media.test.e2e.js index b27cf67727..f4ef2ebcdf 100644 --- a/packages/core/content-manager/tests/dynamiczones/with-media.test.e2e.js +++ b/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; diff --git a/packages/core/content-manager/tests/fields/biginteger.test.e2e.js b/packages/core/content-manager/server/tests/fields/biginteger.test.e2e.js similarity index 90% rename from packages/core/content-manager/tests/fields/biginteger.test.e2e.js rename to packages/core/content-manager/server/tests/fields/biginteger.test.e2e.js index cde55c5043..cfeb919656 100644 --- a/packages/core/content-manager/tests/fields/biginteger.test.e2e.js +++ b/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; diff --git a/packages/core/content-manager/tests/fields/boolean.test.e2e.js b/packages/core/content-manager/server/tests/fields/boolean.test.e2e.js similarity index 91% rename from packages/core/content-manager/tests/fields/boolean.test.e2e.js rename to packages/core/content-manager/server/tests/fields/boolean.test.e2e.js index 91de27e406..c741fcb706 100644 --- a/packages/core/content-manager/tests/fields/boolean.test.e2e.js +++ b/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; diff --git a/packages/core/content-manager/tests/fields/date.test.e2e.js b/packages/core/content-manager/server/tests/fields/date.test.e2e.js similarity index 92% rename from packages/core/content-manager/tests/fields/date.test.e2e.js rename to packages/core/content-manager/server/tests/fields/date.test.e2e.js index e4a35bd9e4..b8d3a7a50b 100644 --- a/packages/core/content-manager/tests/fields/date.test.e2e.js +++ b/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; diff --git a/packages/core/content-manager/tests/fields/datetime.test.e2e.js b/packages/core/content-manager/server/tests/fields/datetime.test.e2e.js similarity index 92% rename from packages/core/content-manager/tests/fields/datetime.test.e2e.js rename to packages/core/content-manager/server/tests/fields/datetime.test.e2e.js index e8cc3c6074..505e66bd46 100644 --- a/packages/core/content-manager/tests/fields/datetime.test.e2e.js +++ b/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; diff --git a/packages/core/content-manager/tests/fields/decimal.test.e2e.js b/packages/core/content-manager/server/tests/fields/decimal.test.e2e.js similarity index 89% rename from packages/core/content-manager/tests/fields/decimal.test.e2e.js rename to packages/core/content-manager/server/tests/fields/decimal.test.e2e.js index 09f6047905..0a474aa339 100644 --- a/packages/core/content-manager/tests/fields/decimal.test.e2e.js +++ b/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; diff --git a/packages/core/content-manager/tests/fields/email.test.e2e.js b/packages/core/content-manager/server/tests/fields/email.test.e2e.js similarity index 90% rename from packages/core/content-manager/tests/fields/email.test.e2e.js rename to packages/core/content-manager/server/tests/fields/email.test.e2e.js index 6b1821391d..7111d06d80 100644 --- a/packages/core/content-manager/tests/fields/email.test.e2e.js +++ b/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; diff --git a/packages/core/content-manager/tests/fields/enumeration.test.e2e.js b/packages/core/content-manager/server/tests/fields/enumeration.test.e2e.js similarity index 91% rename from packages/core/content-manager/tests/fields/enumeration.test.e2e.js rename to packages/core/content-manager/server/tests/fields/enumeration.test.e2e.js index 63fa009588..aa7535d45f 100644 --- a/packages/core/content-manager/tests/fields/enumeration.test.e2e.js +++ b/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; diff --git a/packages/core/content-manager/tests/fields/float.test.e2e.js b/packages/core/content-manager/server/tests/fields/float.test.e2e.js similarity index 89% rename from packages/core/content-manager/tests/fields/float.test.e2e.js rename to packages/core/content-manager/server/tests/fields/float.test.e2e.js index eff41d3a27..19c8fb19e1 100644 --- a/packages/core/content-manager/tests/fields/float.test.e2e.js +++ b/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; diff --git a/packages/core/content-manager/tests/fields/integer.test.e2e.js b/packages/core/content-manager/server/tests/fields/integer.test.e2e.js similarity index 89% rename from packages/core/content-manager/tests/fields/integer.test.e2e.js rename to packages/core/content-manager/server/tests/fields/integer.test.e2e.js index 2962217e7a..a3ceb9d1ad 100644 --- a/packages/core/content-manager/tests/fields/integer.test.e2e.js +++ b/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; diff --git a/packages/core/content-manager/tests/fields/json.test.e2e.js b/packages/core/content-manager/server/tests/fields/json.test.e2e.js similarity index 90% rename from packages/core/content-manager/tests/fields/json.test.e2e.js rename to packages/core/content-manager/server/tests/fields/json.test.e2e.js index 6378986728..6fe1c3dd93 100644 --- a/packages/core/content-manager/tests/fields/json.test.e2e.js +++ b/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; diff --git a/packages/core/content-manager/tests/fields/password.test.e2e.js b/packages/core/content-manager/server/tests/fields/password.test.e2e.js similarity index 89% rename from packages/core/content-manager/tests/fields/password.test.e2e.js rename to packages/core/content-manager/server/tests/fields/password.test.e2e.js index 01941a9a52..be1d66ecda 100644 --- a/packages/core/content-manager/tests/fields/password.test.e2e.js +++ b/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; diff --git a/packages/core/content-manager/tests/fields/richtext.test.e2e.js b/packages/core/content-manager/server/tests/fields/richtext.test.e2e.js similarity index 88% rename from packages/core/content-manager/tests/fields/richtext.test.e2e.js rename to packages/core/content-manager/server/tests/fields/richtext.test.e2e.js index fdf8491649..79ed3ecb69 100644 --- a/packages/core/content-manager/tests/fields/richtext.test.e2e.js +++ b/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; diff --git a/packages/core/content-manager/tests/fields/string.test.e2e.js b/packages/core/content-manager/server/tests/fields/string.test.e2e.js similarity index 87% rename from packages/core/content-manager/tests/fields/string.test.e2e.js rename to packages/core/content-manager/server/tests/fields/string.test.e2e.js index c5ecd93934..dc8fc4dcb6 100644 --- a/packages/core/content-manager/tests/fields/string.test.e2e.js +++ b/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; diff --git a/packages/core/content-manager/tests/fields/text.test.e2e.js b/packages/core/content-manager/server/tests/fields/text.test.e2e.js similarity index 87% rename from packages/core/content-manager/tests/fields/text.test.e2e.js rename to packages/core/content-manager/server/tests/fields/text.test.e2e.js index 5ab24460f4..b8fa2f6486 100644 --- a/packages/core/content-manager/tests/fields/text.test.e2e.js +++ b/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; diff --git a/packages/core/content-manager/tests/fields/time.test.e2e.js b/packages/core/content-manager/server/tests/fields/time.test.e2e.js similarity index 90% rename from packages/core/content-manager/tests/fields/time.test.e2e.js rename to packages/core/content-manager/server/tests/fields/time.test.e2e.js index cbe935d2ac..3f79d7269b 100644 --- a/packages/core/content-manager/tests/fields/time.test.e2e.js +++ b/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; diff --git a/packages/core/content-manager/tests/fields/uid.test.e2e.js b/packages/core/content-manager/server/tests/fields/uid.test.e2e.js similarity index 93% rename from packages/core/content-manager/tests/fields/uid.test.e2e.js rename to packages/core/content-manager/server/tests/fields/uid.test.e2e.js index dab07fb110..e9155a3331 100644 --- a/packages/core/content-manager/tests/fields/uid.test.e2e.js +++ b/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; diff --git a/packages/core/content-manager/tests/front/integration/createPage_specs.js b/packages/core/content-manager/server/tests/front/integration/createPage_specs.js similarity index 100% rename from packages/core/content-manager/tests/front/integration/createPage_specs.js rename to packages/core/content-manager/server/tests/front/integration/createPage_specs.js diff --git a/packages/core/content-manager/tests/front/integration/init_specs.js b/packages/core/content-manager/server/tests/front/integration/init_specs.js similarity index 100% rename from packages/core/content-manager/tests/front/integration/init_specs.js rename to packages/core/content-manager/server/tests/front/integration/init_specs.js diff --git a/packages/core/content-manager/tests/front/integration/listPage_specs.js b/packages/core/content-manager/server/tests/front/integration/listPage_specs.js similarity index 100% rename from packages/core/content-manager/tests/front/integration/listPage_specs.js rename to packages/core/content-manager/server/tests/front/integration/listPage_specs.js diff --git a/packages/core/content-manager/tests/index.test.e2e.js b/packages/core/content-manager/server/tests/index.test.e2e.js similarity index 98% rename from packages/core/content-manager/tests/index.test.e2e.js rename to packages/core/content-manager/server/tests/index.test.e2e.js index bf5ca8f549..495a0e249b 100644 --- a/packages/core/content-manager/tests/index.test.e2e.js +++ b/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; diff --git a/packages/core/content-manager/tests/relation-list.test.e2e.js b/packages/core/content-manager/server/tests/relation-list.test.e2e.js similarity index 95% rename from packages/core/content-manager/tests/relation-list.test.e2e.js rename to packages/core/content-manager/server/tests/relation-list.test.e2e.js index d1870a9fca..d087078332 100644 --- a/packages/core/content-manager/tests/relation-list.test.e2e.js +++ b/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; diff --git a/packages/core/content-manager/tests/search.test.e2e.js b/packages/core/content-manager/server/tests/search.test.e2e.js similarity index 96% rename from packages/core/content-manager/tests/search.test.e2e.js rename to packages/core/content-manager/server/tests/search.test.e2e.js index 1371812527..1abd09c969 100644 --- a/packages/core/content-manager/tests/search.test.e2e.js +++ b/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']; diff --git a/packages/core/content-manager/tests/single-type.test.e2e.js b/packages/core/content-manager/server/tests/single-type.test.e2e.js similarity index 88% rename from packages/core/content-manager/tests/single-type.test.e2e.js rename to packages/core/content-manager/server/tests/single-type.test.e2e.js index 1e646e7b6b..a9c8f93d69 100644 --- a/packages/core/content-manager/tests/single-type.test.e2e.js +++ b/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; diff --git a/packages/core/content-manager/utils/index.d.ts b/packages/core/content-manager/server/utils/index.d.ts similarity index 100% rename from packages/core/content-manager/utils/index.d.ts rename to packages/core/content-manager/server/utils/index.d.ts diff --git a/packages/core/content-manager/utils/index.js b/packages/core/content-manager/server/utils/index.js similarity index 100% rename from packages/core/content-manager/utils/index.js rename to packages/core/content-manager/server/utils/index.js diff --git a/packages/core/content-manager/utils/pick-writable-attributes.js b/packages/core/content-manager/server/utils/pick-writable-attributes.js similarity index 100% rename from packages/core/content-manager/utils/pick-writable-attributes.js rename to packages/core/content-manager/server/utils/pick-writable-attributes.js diff --git a/packages/core/content-manager/utils/wrap-bad-request.js b/packages/core/content-manager/server/utils/wrap-bad-request.js similarity index 100% rename from packages/core/content-manager/utils/wrap-bad-request.js rename to packages/core/content-manager/server/utils/wrap-bad-request.js diff --git a/packages/core/content-manager/validation/policies/hasPermissions.js b/packages/core/content-manager/server/validation/policies/hasPermissions.js similarity index 100% rename from packages/core/content-manager/validation/policies/hasPermissions.js rename to packages/core/content-manager/server/validation/policies/hasPermissions.js diff --git a/packages/core/content-manager/strapi-server.js b/packages/core/content-manager/strapi-server.js index da4fe6d5c7..8a908be91d 100644 --- a/packages/core/content-manager/strapi-server.js +++ b/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'); diff --git a/packages/plugins/users-permissions/server/content-types/user/index.js b/packages/plugins/users-permissions/server/content-types/user/index.js index 9f197f2a32..d31322a14c 100644 --- a/packages/plugins/users-permissions/server/content-types/user/index.js +++ b/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 }; diff --git a/packages/plugins/users-permissions/server/controllers/user/admin.js b/packages/plugins/users-permissions/server/controllers/user/admin.js index e96232fc6c..db971508b3 100644 --- a/packages/plugins/users-permissions/server/controllers/user/admin.js +++ b/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 }); diff --git a/packages/plugins/users-permissions/server/controllers/user/api.js b/packages/plugins/users-permissions/server/controllers/user/api.js index 2f496fd022..f676ff4187 100644 --- a/packages/plugins/users-permissions/server/controllers/user/api.js +++ b/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));