Migrate admin to programmatic loading

jsconfig.json

@@ -1,8 +1,9 @@
 {
   "compilerOptions": {
+    "rootDir": ".",
     "module": "commonjs",
     "target": "es6"
   },
   "include": ["packages/**/*"],
-  "exclude": ["**/node_modules/*"]
+  "exclude": ["node_modules"]
 }

packages/core/admin/ee/server/config/functions/bootstrap.js

@@ -2,11 +2,12 @@
 
 // eslint-disable-next-line node/no-extraneous-require
 const { features } = require('@strapi/strapi/lib/utils/ee');
-const executeCEBootstrap = require('../../../config/functions/bootstrap');
+const executeCEBootstrap = require('../../../../server/config/functions/bootstrap');
 const {
   features: { sso: ssoActions },
 } = require('../admin-actions');
-const { getService } = require('../../../utils');
+
+const { getService } = require('../../../../server/utils');
 
 module.exports = async () => {
   const { actionProvider } = getService('permission');

packages/core/admin/ee/server/config/index.js

@@ -0,0 +1,8 @@
+'use strict';
+
+module.exports = {
+  functions: {
+    bootstrap: require('./functions/bootstrap'),
+  },
+  routes: require('./routes').routes,
+};

packages/core/admin/ee/server/controllers/authentication/middlewares.js

@@ -2,7 +2,7 @@
 
 const passport = require('koa-passport');
 
-const { getService } = require('../../../utils');
+const { getService } = require('../../../../server/utils');
 const utils = require('./utils');
 
 const defaultConnectionError = () => new Error('Invalid connection payload');

packages/core/admin/ee/server/controllers/index.js

@@ -0,0 +1,8 @@
+'use strict';
+
+module.exports = {
+  authentication: require('./authentication'),
+  permission: require('./permission'),
+  role: require('./role'),
+  user: require('./user'),
+};

packages/core/admin/ee/server/controllers/permission.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const { getService } = require('../../utils');
-const { formatConditions } = require('../../controllers/formatters');
+const { getService } = require('../../../server/utils');
+const { formatConditions } = require('../../../server/controllers/formatters');
 
 module.exports = {
   async getAll(ctx) {

packages/core/admin/ee/server/controllers/role.js

@@ -6,9 +6,9 @@ const {
   validateRoleDeleteInput,
   validateRolesDeleteInput,
 } = require('../validation/role');
-const { getService } = require('../../utils');
+const { getService } = require('../../../server//utils');
 const { validatedUpdatePermissionsInput } = require('../validation/permission');
-const { SUPER_ADMIN_CODE } = require('../../services/constants');
+const { SUPER_ADMIN_CODE } = require('../../../server/services/constants');
 
 module.exports = {
   /**

packages/core/admin/ee/server/controllers/user.js

@@ -2,7 +2,7 @@
 
 const { pick } = require('lodash/fp');
 const { validateUserCreationInput } = require('../validation/user');
-const { getService } = require('../../utils');
+const { getService } = require('../../../server/utils');
 
 const pickUserCreationAttributes = pick(['firstname', 'lastname', 'email', 'roles']);
 

packages/core/admin/ee/server/index.js

@@ -0,0 +1,8 @@
+'use strict';
+
+module.exports = {
+  // TODO: update load middleware to not load the admin middleware from here
+  config: require('./config'),
+  services: require('./services'),
+  controllers: require('./controllers'),
+};

packages/core/admin/ee/server/services/__tests__/passport.test.js

@@ -7,7 +7,7 @@ jest.mock('koa-passport', () => ({
 
 const passport = require('koa-passport');
 
-const { init } = require('../../../services/passport');
+const { init } = require('../../../../server/services/passport');
 
 describe('Passport', () => {
   afterEach(() => {

packages/core/admin/ee/server/services/index.js

@@ -0,0 +1,6 @@
+'use strict';
+
+module.exports = {
+  passport: require('./passport'),
+  role: require('./role'),
+};

packages/core/admin/ee/server/services/passport.js

@@ -3,7 +3,7 @@
 // eslint-disable-next-line node/no-extraneous-require
 const { features } = require('@strapi/strapi/lib/utils/ee');
 
-const createLocalStrategy = require('../../services/passport/local-strategy');
+const createLocalStrategy = require('../../../server/services/passport/local-strategy');
 const sso = require('./passport/sso');
 
 const getPassportStrategies = () => {

packages/core/admin/ee/server/services/passport/sso.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const { authEventsMapper } = require('../../../services/passport');
+const { authEventsMapper } = require('../../../../server/services/passport');
 const createProviderRegistry = require('./provider-registry');
 
 const providerRegistry = createProviderRegistry();

packages/core/admin/ee/server/tests/provider-login.test.e2e.js

@@ -1,8 +1,8 @@
 'use strict';
 
-const { createStrapiInstance } = require('../../../../../test/helpers/strapi');
-const { createAuthRequest, createRequest } = require('../../../../../test/helpers/request');
-const { createUtils } = require('../../../../../test/helpers/utils');
+const { createStrapiInstance } = require('../../../../../../test/helpers/strapi');
+const { createAuthRequest, createRequest } = require('../../../../../../test/helpers/request');
+const { createUtils } = require('../../../../../../test/helpers/utils');
 
 const edition = process.env.STRAPI_DISABLE_EE === 'true' ? 'CE' : 'EE';
 

packages/core/admin/ee/server/validation/permission.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const { formatYupErrors } = require('@strapi/utils');
-const validators = require('../../validation/common-validators');
+const validators = require('../../../server/validation/common-validators');
 
 const handleReject = error => Promise.reject(formatYupErrors(error));
 

packages/core/admin/ee/server/validation/user.js

@@ -3,7 +3,7 @@
 const { yup, formatYupErrors } = require('@strapi/utils');
 // eslint-disable-next-line node/no-extraneous-require
 const { features } = require('@strapi/strapi/lib/utils/ee');
-const { schemas } = require('../../validation/user');
+const { schemas } = require('../../../server/validation/user');
 
 const handleReject = error => Promise.reject(formatYupErrors(error));
 

packages/core/admin/ee/strapi-server.js

@@ -0,0 +1,3 @@
+'use strict';
+
+module.exports = require('./server');

packages/core/admin/server/config/functions/bootstrap.js

@@ -55,11 +55,4 @@ module.exports = async () => {
   await userService.displayWarningIfUsersDontHaveRole();
 
   await syncAuthSettings();
-
-  strapi.admin.destroy = async () => {
-    const { conditionProvider, actionProvider } = getService('permission');
-
-    await conditionProvider.clear();
-    await actionProvider.clear();
-  };
 };

packages/core/admin/server/config/index.js

@@ -0,0 +1,15 @@
+'use strict';
+
+module.exports = {
+  functions: {
+    bootstrap: require('./functions/bootstrap'),
+    register: require('./functions/register'),
+  },
+  policies: {
+    hasPermissions: require('./policies/hasPermissions'),
+    isAuthenticatedAdmin: require('./policies/isAuthenticatedAdmin'),
+  },
+  routes: require('./routes').routes,
+  layout: require('./layout'),
+  ...require('./settings'),
+};

packages/core/admin/server/content-types/index.js

@@ -0,0 +1,7 @@
+'use strict';
+
+module.exports = {
+  permission: require('./Permission'),
+  user: require('./User'),
+  role: require('./Role'),
+};

packages/core/admin/server/controllers/__tests__/permission.test.js

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

packages/core/admin/server/controllers/__tests__/role.test.js

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

packages/core/admin/server/controllers/__tests__/user.test.js

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

packages/core/admin/server/controllers/index.js

@@ -0,0 +1,11 @@
+'use strict';
+
+module.exports = {
+  admin: require('./admin'),
+  'authenticated-user': require('./authenticated-user'),
+  authentication: require('./authentication'),
+  permission: require('./permission'),
+  role: require('./role'),
+  user: require('./user'),
+  webhooks: require('./Webhooks'),
+};

packages/core/admin/server/index.js

@@ -0,0 +1,18 @@
+'use strict';
+
+const { getService } = require('./utils');
+
+module.exports = {
+  // TODO: update load middleware to not load the admin middleware from here
+  // TODO: load bootstrap / register independently
+  async destroy() {
+    const { conditionProvider, actionProvider } = getService('permission');
+
+    await conditionProvider.clear();
+    await actionProvider.clear();
+  },
+  config: require('./config'),
+  services: require('./services'),
+  controllers: require('./controllers'),
+  models: require('./content-types'),
+};

packages/core/admin/server/services/index.js

@@ -0,0 +1,15 @@
+'use strict';
+
+module.exports = {
+  user: require('./user'),
+  token: require('./token'),
+  role: require('./role'),
+  permission: require('./permission'),
+  passport: require('./passport'),
+  metrics: require('./metrics'),
+  'content-type': require('./content-type'),
+  constants: require('./constants'),
+  condition: require('./condition'),
+  auth: require('./auth'),
+  action: require('./action'),
+};