@strapi/admin 4.9.0-alpha.0 → 4.9.0-beta.2

package/ee/server/validation/role.js

@@ -20,38 +20,46 @@ const rolesDeleteSchema = yup
       .of(yup.strapiID())
       .min(1)
       .required()
-      .test('roles-deletion-checks', 'Roles deletion checks have failed', async function (ids) {
-        try {
-          await strapi.admin.services.role.checkRolesIdForDeletion(ids);
+      .test(
+        'roles-deletion-checks',
+        'Roles deletion checks have failed',
+        async function rolesDeletionChecks(ids) {
+          try {
+            await strapi.admin.services.role.checkRolesIdForDeletion(ids);
 
-          if (features.isEnabled('sso')) {
-            await strapi.admin.services.role.ssoCheckRolesIdForDeletion(ids);
+            if (features.isEnabled('sso')) {
+              await strapi.admin.services.role.ssoCheckRolesIdForDeletion(ids);
+            }
+          } catch (e) {
+            return this.createError({ path: 'ids', message: e.message });
           }
-        } catch (e) {
-          return this.createError({ path: 'ids', message: e.message });
-        }
 
-        return true;
-      }),
+          return true;
+        }
+      ),
   })
   .noUnknown();
 
 const roleDeleteSchema = yup
   .strapiID()
   .required()
-  .test('no-admin-single-delete', 'Role deletion checks have failed', async function (id) {
-    try {
-      await strapi.admin.services.role.checkRolesIdForDeletion([id]);
+  .test(
+    'no-admin-single-delete',
+    'Role deletion checks have failed',
+    async function noAdminSingleDelete(id) {
+      try {
+        await strapi.admin.services.role.checkRolesIdForDeletion([id]);
 
-      if (features.isEnabled('sso')) {
-        await strapi.admin.services.role.ssoCheckRolesIdForDeletion([id]);
+        if (features.isEnabled('sso')) {
+          await strapi.admin.services.role.ssoCheckRolesIdForDeletion([id]);
+        }
+      } catch (e) {
+        return this.createError({ path: 'id', message: e.message });
       }
-    } catch (e) {
-      return this.createError({ path: 'id', message: e.message });
-    }
 
-    return true;
-  });
+      return true;
+    }
+  );
 
 module.exports = {
   validateRoleCreateInput: validateYupSchema(roleCreateSchema),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/admin",
-  "version": "4.9.0-alpha.0",
+  "version": "4.9.0-beta.2",
   "description": "Strapi Admin",
   "repository": {
     "type": "git",
@@ -46,23 +46,23 @@
     "@casl/ability": "^5.4.3",
     "@fingerprintjs/fingerprintjs": "3.3.6",
     "@pmmmwh/react-refresh-webpack-plugin": "0.5.10",
-    "@strapi/babel-plugin-switch-ee-ce": "4.9.0-alpha.0",
-    "@strapi/data-transfer": "4.9.0-alpha.0",
-    "@strapi/design-system": "1.6.3",
-    "@strapi/helper-plugin": "4.9.0-alpha.0",
-    "@strapi/icons": "1.6.3",
-    "@strapi/permissions": "4.9.0-alpha.0",
-    "@strapi/provider-audit-logs-local": "4.9.0-alpha.0",
-    "@strapi/typescript-utils": "4.9.0-alpha.0",
-    "@strapi/utils": "4.9.0-alpha.0",
-    "axios": "1.2.2",
+    "@strapi/babel-plugin-switch-ee-ce": "4.9.0-beta.2",
+    "@strapi/data-transfer": "4.9.0-beta.2",
+    "@strapi/design-system": "1.6.6",
+    "@strapi/helper-plugin": "4.9.0-beta.2",
+    "@strapi/icons": "1.6.6",
+    "@strapi/permissions": "4.9.0-beta.2",
+    "@strapi/provider-audit-logs-local": "4.9.0-beta.2",
+    "@strapi/typescript-utils": "4.9.0-beta.2",
+    "@strapi/utils": "4.9.0-beta.2",
+    "axios": "1.3.4",
     "babel-loader": "^9.1.2",
     "babel-plugin-styled-components": "2.0.2",
     "bcryptjs": "2.4.3",
     "browserslist-to-esbuild": "1.2.0",
-    "chalk": "^4.1.1",
+    "chalk": "^4.1.2",
     "chokidar": "^3.5.1",
-    "codemirror": "^5.65.11",
+    "codemirror5": "npm:codemirror@^5.65.11",
     "cross-env": "^7.0.3",
     "css-loader": "^6.7.3",
     "date-fns": "2.29.3",
@@ -104,6 +104,7 @@
     "node-schedule": "2.1.0",
     "p-map": "4.0.0",
     "passport-local": "1.0.0",
+    "pluralize": "8.0.0",
     "prop-types": "^15.7.2",
     "qs": "6.11.0",
     "react": "^17.0.2",
@@ -119,11 +120,11 @@
     "react-query": "3.24.3",
     "react-redux": "8.0.5",
     "react-refresh": "0.14.0",
-    "react-router": "5.2.0",
     "react-router-dom": "5.3.4",
+    "react-select": "5.7.0",
     "react-window": "1.8.7",
     "redux": "^4.2.1",
-    "reselect": "^4.0.0",
+    "reselect": "^4.1.7",
     "rimraf": "3.0.2",
     "sanitize-html": "2.7.3",
     "semver": "7.3.8",
@@ -131,7 +132,7 @@
     "style-loader": "3.3.1",
     "styled-components": "5.3.3",
     "typescript": "4.6.2",
-    "webpack": "^5.75.0",
+    "webpack": "^5.76.0",
     "webpack-cli": "^5.0.1",
     "webpack-dev-server": "^4.11.1",
     "webpackbar": "^5.0.2",
@@ -165,5 +166,5 @@
       }
     }
   },
-  "gitHead": "35f783d0dc07db101e7e62cb4d682f751551f452"
+  "gitHead": "d893ead642592a15a95fefb71c544aaabe4db20b"
 }

package/server/bootstrap.js

@@ -78,13 +78,13 @@ module.exports = async () => {
   const userService = getService('user');
   const roleService = getService('role');
   const apiTokenService = getService('api-token');
+  const transferService = getService('transfer');
   const tokenService = getService('token');
 
   await roleService.createRolesIfNoneExist();
   await roleService.resetSuperAdminPermissions();
   await roleService.displayWarningIfNoSuperAdmin();
 
-  await permissionService.ensureBoundPermissionsInDatabase();
   await permissionService.cleanPermissionsInDatabase();
 
   await userService.displayWarningIfUsersDontHaveRole();
@@ -93,5 +93,6 @@ module.exports = async () => {
   await syncAPITokensPermissions();
 
   apiTokenService.checkSaltIsDefined();
+  transferService.token.checkSaltIsDefined();
   tokenService.checkSecretIsDefined();
 };

package/server/config/admin-actions.js

@@ -164,5 +164,53 @@ module.exports = {
       section: 'settings',
       category: 'project',
     },
+    {
+      uid: 'transfer.tokens.access',
+      displayName: 'Access the transfer tokens settings page',
+      pluginName: 'admin',
+      section: 'settings',
+      category: 'transfer tokens',
+      subCategory: 'transfer tokens',
+    },
+    {
+      uid: 'transfer.tokens.create',
+      displayName: 'Create (generate)',
+      pluginName: 'admin',
+      section: 'settings',
+      category: 'transfer tokens',
+      subCategory: 'general',
+    },
+    {
+      uid: 'transfer.tokens.read',
+      displayName: 'Read',
+      pluginName: 'admin',
+      section: 'settings',
+      category: 'transfer tokens',
+      subCategory: 'general',
+    },
+    {
+      uid: 'transfer.tokens.update',
+      displayName: 'Update',
+      pluginName: 'admin',
+      section: 'settings',
+      category: 'transfer tokens',
+      subCategory: 'general',
+    },
+    {
+      uid: 'transfer.tokens.regenerate',
+      displayName: 'Regenerate',
+      pluginName: 'admin',
+      section: 'settings',
+      category: 'transfer tokens',
+      subCategory: 'general',
+    },
+    {
+      uid: 'transfer.tokens.delete',
+      displayName: 'Delete (revoke)',
+      pluginName: 'admin',
+      section: 'settings',
+      category: 'transfer tokens',
+      subCategory: 'general',
+    },
   ],
 };

package/server/content-types/User.js

@@ -56,16 +56,19 @@ module.exports = {
       configurable: false,
       required: false,
       private: true,
+      searchable: false,
     },
     resetPasswordToken: {
       type: 'string',
       configurable: false,
       private: true,
+      searchable: false,
     },
     registrationToken: {
       type: 'string',
       configurable: false,
       private: true,
+      searchable: false,
     },
     isActive: {
       type: 'boolean',
@@ -93,6 +96,7 @@ module.exports = {
       type: 'string',
       configurable: false,
       required: false,
+      searchable: false,
     },
   },
 };

package/server/content-types/api-token.js

@@ -47,6 +47,7 @@ module.exports = {
       minLength: 1,
       configurable: false,
       required: true,
+      searchable: false,
     },
     lastUsedAt: {
       type: 'datetime',

package/server/content-types/index.js

@@ -6,4 +6,6 @@ module.exports = {
   role: { schema: require('./Role') },
   'api-token': { schema: require('./api-token') },
   'api-token-permission': { schema: require('./api-token-permission') },
+  'transfer-token': { schema: require('./transfer-token') },
+  'transfer-token-permission': { schema: require('./transfer-token-permission') },
 };

package/server/content-types/transfer-token-permission.js

@@ -0,0 +1,36 @@
+'use strict';
+
+module.exports = {
+  collectionName: 'strapi_transfer_token_permissions',
+  info: {
+    name: 'Transfer Token Permission',
+    description: '',
+    singularName: 'transfer-token-permission',
+    pluralName: 'transfer-token-permissions',
+    displayName: 'Transfer Token Permission',
+  },
+  options: {},
+  pluginOptions: {
+    'content-manager': {
+      visible: false,
+    },
+    'content-type-builder': {
+      visible: false,
+    },
+  },
+  attributes: {
+    action: {
+      type: 'string',
+      minLength: 1,
+      configurable: false,
+      required: true,
+    },
+    token: {
+      configurable: false,
+      type: 'relation',
+      relation: 'manyToOne',
+      inversedBy: 'permissions',
+      target: 'admin::transfer-token',
+    },
+  },
+};

package/server/content-types/transfer-token.js

@@ -0,0 +1,66 @@
+'use strict';
+
+module.exports = {
+  collectionName: 'strapi_transfer_tokens',
+  info: {
+    name: 'Transfer Token',
+    singularName: 'transfer-token',
+    pluralName: 'transfer-tokens',
+    displayName: 'Transfer Token',
+    description: '',
+  },
+  options: {},
+  pluginOptions: {
+    'content-manager': {
+      visible: false,
+    },
+    'content-type-builder': {
+      visible: false,
+    },
+  },
+  attributes: {
+    name: {
+      type: 'string',
+      minLength: 1,
+      configurable: false,
+      required: true,
+      unique: true,
+    },
+    description: {
+      type: 'string',
+      minLength: 1,
+      configurable: false,
+      required: false,
+      default: '',
+    },
+    accessKey: {
+      type: 'string',
+      minLength: 1,
+      configurable: false,
+      required: true,
+    },
+    lastUsedAt: {
+      type: 'datetime',
+      configurable: false,
+      required: false,
+    },
+    permissions: {
+      type: 'relation',
+      target: 'admin::transfer-token-permission',
+      relation: 'oneToMany',
+      mappedBy: 'token',
+      configurable: false,
+      required: false,
+    },
+    expiresAt: {
+      type: 'datetime',
+      configurable: false,
+      required: false,
+    },
+    lifespan: {
+      type: 'biginteger',
+      configurable: false,
+      required: false,
+    },
+  },
+};

package/server/controllers/api-token.js

@@ -1,9 +1,10 @@
 'use strict';
 
-const { stringEquals } = require('@strapi/utils/lib');
-const { ApplicationError } = require('@strapi/utils').errors;
-const { trim } = require('lodash/fp');
-const has = require('lodash/has');
+const {
+  stringEquals,
+  errors: { ApplicationError },
+} = require('@strapi/utils');
+const { trim, has } = require('lodash/fp');
 const { getService } = require('../utils');
 const {
   validateApiTokenCreationInput,
@@ -93,11 +94,11 @@ module.exports = {
      * - having a space at the end or start of the value.
      * - having only spaces as value;
      */
-    if (has(attributes, 'name')) {
+    if (has('name', attributes)) {
       attributes.name = trim(body.name);
     }
 
-    if (has(attributes, 'description') || attributes.description === null) {
+    if (has('description', attributes) || attributes.description === null) {
       attributes.description = trim(body.description);
     }
 
@@ -108,7 +109,7 @@ module.exports = {
       return ctx.notFound('API Token not found');
     }
 
-    if (has(attributes, 'name')) {
+    if (has('name', attributes)) {
       const nameAlreadyTaken = await apiTokenService.getByName(attributes.name);
 
       /**

package/server/controllers/index.js

@@ -7,6 +7,7 @@ module.exports = {
   authentication: require('./authentication'),
   permission: require('./permission'),
   role: require('./role'),
+  transfer: require('./transfer'),
   user: require('./user'),
   webhooks: require('./webhooks'),
   'content-api': require('./content-api'),

package/server/controllers/permission.js

@@ -29,11 +29,9 @@ module.exports = {
    * @param {KoaContext} ctx - koa context
    */
   async getAll(ctx) {
-    const { role: roleId } = ctx.query;
+    const { sectionsBuilder, actionProvider, conditionProvider } = getService('permission');
 
-    const { sectionsBuilder, conditionProvider } = getService('permission');
-
-    const actions = await getService('action').getAllowedActionsForRole(roleId);
+    const actions = actionProvider.values();
     const conditions = conditionProvider.values();
     const sections = await sectionsBuilder.build(actions);
 

package/server/controllers/role.js

@@ -1,12 +1,32 @@
 'use strict';
 
 const { ApplicationError } = require('@strapi/utils').errors;
-const { validateRoleUpdateInput } = require('../validation/role');
+const {
+  validateRoleUpdateInput,
+  validateRoleCreateInput,
+  validateRoleDeleteInput,
+  validateRolesDeleteInput,
+} = require('../validation/role');
 const { validatedUpdatePermissionsInput } = require('../validation/permission');
-const { EDITOR_CODE, AUTHOR_CODE, SUPER_ADMIN_CODE } = require('../services/constants');
+const { SUPER_ADMIN_CODE } = require('../services/constants');
 const { getService } = require('../utils');
 
 module.exports = {
+  /**
+   * Create a new role
+   * @param {KoaContext} ctx - koa context
+   */
+  async create(ctx) {
+    await validateRoleCreateInput(ctx.request.body);
+
+    const roleService = getService('role');
+
+    const role = await roleService.create(ctx.request.body);
+    const sanitizedRole = roleService.sanitizeRole(role);
+
+    ctx.created({ data: sanitizedRole });
+  },
+
   /**
    * Returns on role by id
    * @param {KoaContext} ctx - koa context
@@ -99,10 +119,10 @@ module.exports = {
     const { id } = ctx.params;
     const { body: input } = ctx.request;
 
-    const { findOne, assignPermissions } = getService('role');
-    const { sanitizePermission, actionProvider } = getService('permission');
+    const roleService = getService('role');
+    const permissionService = getService('permission');
 
-    const role = await findOne({ id });
+    const role = await roleService.findOne({ id });
 
     if (!role) {
       return ctx.notFound('role.notFound');
@@ -112,30 +132,57 @@ module.exports = {
       throw new ApplicationError("Super admin permissions can't be edited.");
     }
 
-    await validatedUpdatePermissionsInput(input, role);
+    await validatedUpdatePermissionsInput(input);
 
-    let permissionsToAssign;
+    if (!role) {
+      return ctx.notFound('role.notFound');
+    }
 
-    if ([EDITOR_CODE, AUTHOR_CODE].includes(role.code)) {
-      permissionsToAssign = input.permissions.map((permission) => {
-        const action = actionProvider.get(permission.action);
+    const permissions = await roleService.assignPermissions(role.id, input.permissions);
 
-        if (action.section !== 'contentTypes') {
-          return permission;
-        }
+    const sanitizedPermissions = permissions.map(permissionService.sanitizePermission);
 
-        const conditions = role.code === AUTHOR_CODE ? ['admin::is-creator'] : [];
+    ctx.body = {
+      data: sanitizedPermissions,
+    };
+  },
 
-        return { ...permission, conditions };
-      });
-    } else {
-      permissionsToAssign = input.permissions;
-    }
+  /**
+   * Delete a role
+   * @param {KoaContext} ctx - koa context
+   */
+  async deleteOne(ctx) {
+    const { id } = ctx.params;
 
-    const permissions = await assignPermissions(role.id, permissionsToAssign);
+    await validateRoleDeleteInput(id);
 
-    ctx.body = {
-      data: permissions.map(sanitizePermission),
-    };
+    const roleService = getService('role');
+
+    const roles = await roleService.deleteByIds([id]);
+
+    const sanitizedRole = roles.map((role) => roleService.sanitizeRole(role))[0] || null;
+
+    return ctx.deleted({
+      data: sanitizedRole,
+    });
+  },
+
+  /**
+   * delete several roles
+   * @param {KoaContext} ctx - koa context
+   */
+  async deleteMany(ctx) {
+    const { body } = ctx.request;
+
+    await validateRolesDeleteInput(body);
+
+    const roleService = getService('role');
+
+    const roles = await roleService.deleteByIds(body.ids);
+    const sanitizedRoles = roles.map(roleService.sanitizeRole);
+
+    return ctx.deleted({
+      data: sanitizedRoles,
+    });
   },
 };

package/server/controllers/transfer/index.js

@@ -0,0 +1,13 @@
+'use strict';
+
+const { mapKeys } = require('lodash/fp');
+
+const runner = require('./runner');
+const token = require('./token');
+
+const prefixActionsName = (prefix, dict) => mapKeys((key) => `${prefix}-${key}`, dict);
+
+module.exports = {
+  ...prefixActionsName('runner', runner),
+  ...prefixActionsName('token', token),
+};

package/server/controllers/transfer/runner.js

@@ -0,0 +1,28 @@
+'use strict';
+
+const { createPushController, createPullController } =
+  require('@strapi/data-transfer').strapi.remote.handlers;
+const {
+  errors: { UnauthorizedError },
+} = require('@strapi/utils');
+
+const dataTransferAuthStrategy = require('../../strategies/data-transfer');
+
+/**
+ * @param {import('koa').Context} ctx
+ * @param {string} [scope]
+ */
+const verify = async (ctx, scope) => {
+  const { auth } = ctx.state;
+
+  if (!auth) {
+    throw new UnauthorizedError();
+  }
+
+  await dataTransferAuthStrategy.verify(auth, { scope });
+};
+
+module.exports = {
+  push: createPushController({ verify }),
+  pull: createPullController({ verify }),
+};