@strapi/admin 4.9.0-alpha.0 → 4.9.0-exp.90df253ba90fd6879eb56a720a1f80d04ff745b8

package/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/utils/getDisplayedFilters.js

@@ -13,6 +13,26 @@ const customOperators = [
 ];
 
 const getDisplayedFilters = ({ formatMessage, users }) => {
+  const getDisplaynameFromUser = (user) => {
+    if (user.username) {
+      return user.username;
+    }
+    if (user.firstname && user.lastname) {
+      return formatMessage(
+        {
+          id: 'Settings.permissions.auditLogs.user.fullname',
+          defaultMessage: '{firstname} {lastname}',
+        },
+        {
+          firstname: user.firstname,
+          lastname: user.lastname,
+        }
+      );
+    }
+
+    return user.email;
+  };
+
   const actionOptions = Object.keys(actionTypes).map((action) => {
     return {
       label: formatMessage(
@@ -30,16 +50,7 @@ const getDisplayedFilters = ({ formatMessage, users }) => {
     users &&
     users.results.map((user) => {
       return {
-        label: formatMessage(
-          {
-            id: 'Settings.permissions.auditLogs.user.fullname',
-            defaultMessage: '{firstname} {lastname}',
-          },
-          {
-            firstname: user.firstname,
-            lastname: user.lastname,
-          }
-        ),
+        label: getDisplaynameFromUser(user),
         // Combobox expects a string value
         customValue: user.id.toString(),
       };

package/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/utils/tableHeaders.js

@@ -31,7 +31,7 @@ const tableHeaders = [
       },
       sortable: false,
     },
-    cellFormatter: (user) => (user ? user.fullname : ''),
+    cellFormatter: (user) => (user ? user.displayName : ''),
   },
 ];
 

package/ee/admin/pages/SettingsPage/pages/SingleSignOn/index.js

@@ -6,15 +6,21 @@ import {
   LoadingIndicatorPage,
   useFocusWhenNavigate,
 } from '@strapi/helper-plugin';
-import Check from '@strapi/icons/Check';
-import { ContentLayout, HeaderLayout, Layout } from '@strapi/design-system/Layout';
-import { Button } from '@strapi/design-system/Button';
-import { Main } from '@strapi/design-system/Main';
-import { Stack } from '@strapi/design-system/Stack';
-import { Typography } from '@strapi/design-system/Typography';
-import { ToggleInput } from '@strapi/design-system/ToggleInput';
-import { Select, Option } from '@strapi/design-system/Select';
-import { Grid, GridItem } from '@strapi/design-system/Grid';
+import { Check } from '@strapi/icons';
+import {
+  ContentLayout,
+  HeaderLayout,
+  Layout,
+  Button,
+  Main,
+  Typography,
+  ToggleInput,
+  Select,
+  Option,
+  Grid,
+  GridItem,
+  Flex,
+} from '@strapi/design-system';
 import { useIntl } from 'react-intl';
 import isEqual from 'lodash/isEqual';
 import { getRequestUrl } from '../../../../../../admin/src/utils';
@@ -100,7 +106,15 @@ export const SingleSignOn = () => {
             {showLoader ? (
               <LoadingIndicatorPage />
             ) : (
-              <Stack spacing={4} background="neutral0" padding={6} shadow="filterShadow" hasRadius>
+              <Flex
+                direction="column"
+                alignItems="stretch"
+                gap={4}
+                background="neutral0"
+                padding={6}
+                shadow="filterShadow"
+                hasRadius
+              >
                 <Typography variant="delta" as="h2">
                   {formatMessage({
                     id: 'global.settings',
@@ -176,7 +190,7 @@ export const SingleSignOn = () => {
                     </Select>
                   </GridItem>
                 </Grid>
-              </Stack>
+              </Flex>
             )}
           </ContentLayout>
         </form>

package/ee/admin/pages/SettingsPage/pages/Users/ListPage/CreateAction/index.js

@@ -0,0 +1,52 @@
+import React from 'react';
+import { useIntl } from 'react-intl';
+import PropTypes from 'prop-types';
+import { Flex, Button, Tooltip, Icon } from '@strapi/design-system';
+import { Envelop, ExclamationMarkCircle } from '@strapi/icons';
+import isNil from 'lodash/isNil';
+import { useLicenseLimits } from '../../../../../../hooks';
+
+const CreateAction = ({ onClick }) => {
+  const { formatMessage } = useIntl();
+  const { license } = useLicenseLimits();
+  const { permittedSeats, shouldStopCreate } = license?.data ?? {};
+
+  return (
+    <Flex gap={2}>
+      {!isNil(permittedSeats) && shouldStopCreate && (
+        <Tooltip
+          description={formatMessage({
+            id: 'Settings.application.admin-seats.at-limit-tooltip',
+            defaultMessage: 'At limit: add seats to invite more users',
+          })}
+          position="left"
+        >
+          <Icon
+            width={`${14 / 16}rem`}
+            height={`${14 / 16}rem`}
+            color="danger500"
+            as={ExclamationMarkCircle}
+          />
+        </Tooltip>
+      )}
+      <Button
+        data-testid="create-user-button"
+        onClick={onClick}
+        startIcon={<Envelop />}
+        size="S"
+        disabled={shouldStopCreate}
+      >
+        {formatMessage({
+          id: 'Settings.permissions.users.create',
+          defaultMessage: 'Invite new user',
+        })}
+      </Button>
+    </Flex>
+  );
+};
+
+CreateAction.propTypes = {
+  onClick: PropTypes.func.isRequired,
+};
+
+export default CreateAction;

package/ee/admin/pages/SettingsPage/utils/customRoutes.js

@@ -1,6 +1,6 @@
 const routes = [];
 
-if (window.strapi.features.isEnabled(window.strapi.features.SSO)) {
+if (strapi.features.isEnabled(strapi.features.SSO)) {
   routes.push({
     async Component() {
       const component = await import(
@@ -14,21 +14,7 @@ if (window.strapi.features.isEnabled(window.strapi.features.SSO)) {
   });
 }
 
-if (window.strapi.isEE) {
-  routes.push({
-    async Component() {
-      const component = await import(
-        /* webpackChunkName: "review-workflows-settings" */ '../pages/ReviewWorkflows'
-      );
-
-      return component;
-    },
-    to: '/settings/review-workflows',
-    exact: true,
-  });
-}
-
-if (window.strapi.features.isEnabled(strapi.features.AUDIT_LOGS)) {
+if (strapi.features.isEnabled(strapi.features.AUDIT_LOGS)) {
   routes.push({
     async Component() {
       const component = await import(

package/ee/admin/permissions/customPermissions.js

@@ -4,9 +4,6 @@ const customPermissions = {
       main: [{ action: 'admin::audit-logs.read', subject: null }],
       read: [{ action: 'admin::audit-logs.read', subject: null }],
     },
-    'review-workflows': {
-      main: [{ action: 'admin::review-workflows.read', subject: null }],
-    },
     sso: {
       main: [{ action: 'admin::provider-login.read', subject: null }],
       read: [{ action: 'admin::provider-login.read', subject: null }],

package/ee/server/bootstrap.js

@@ -17,13 +17,7 @@ module.exports = async () => {
     await actionProvider.registerMany(actions.auditLogs);
   }
 
-  if (features.isEnabled('review-workflows')) {
-    const { bootstrap: rwBootstrap } = getService('review-workflows');
+  await getService('seat-enforcement').seatEnforcementWorkflow();
 
-    await rwBootstrap();
-    await actionProvider.registerMany(actions.reviewWorkflows);
-  }
-
-  // TODO: check admin seats
   await executeCEBootstrap();
 };

package/ee/server/config/admin-actions.js

@@ -29,14 +29,4 @@ module.exports = {
       subCategory: 'options',
     },
   ],
-  reviewWorkflows: [
-    {
-      uid: 'review-workflows.read',
-      displayName: 'Read',
-      pluginName: 'admin',
-      section: 'settings',
-      category: 'review workflows',
-      subCategory: 'options',
-    },
-  ],
 };

package/ee/server/controllers/admin.js

@@ -0,0 +1,49 @@
+'use strict';
+
+const { isNil } = require('lodash/fp');
+// eslint-disable-next-line node/no-extraneous-require
+const ee = require('@strapi/strapi/lib/utils/ee');
+const { env } = require('@strapi/utils');
+const { getService } = require('../../../server/utils');
+
+module.exports = {
+  async licenseLimitInformation() {
+    const permittedSeats = ee.seats;
+
+    let shouldNotify = false;
+    let licenseLimitStatus = null;
+    let enforcementUserCount;
+
+    const currentActiveUserCount = await getService('user').getCurrentActiveUserCount();
+
+    const eeDisabledUsers = await getService('seat-enforcement').getDisabledUserList();
+
+    if (eeDisabledUsers) {
+      enforcementUserCount = currentActiveUserCount + eeDisabledUsers.length;
+    } else {
+      enforcementUserCount = currentActiveUserCount;
+    }
+
+    if (!isNil(permittedSeats) && enforcementUserCount > permittedSeats) {
+      shouldNotify = true;
+      licenseLimitStatus = 'OVER_LIMIT';
+    }
+
+    if (!isNil(permittedSeats) && enforcementUserCount === permittedSeats) {
+      shouldNotify = true;
+      licenseLimitStatus = 'AT_LIMIT';
+    }
+
+    const data = {
+      enforcementUserCount,
+      currentActiveUserCount,
+      permittedSeats,
+      shouldNotify,
+      shouldStopCreate: isNil(permittedSeats) ? false : currentActiveUserCount >= permittedSeats,
+      licenseLimitStatus,
+      isHostedOnStrapiCloud: env('STRAPI_HOSTING', null) === 'strapi.cloud',
+    };
+
+    return { data };
+  },
+};

package/ee/server/controllers/index.js

@@ -2,10 +2,8 @@
 
 module.exports = {
   authentication: require('./authentication'),
-  permission: require('./permission'),
   role: require('./role'),
   user: require('./user'),
   auditLogs: require('./audit-logs'),
-  workflows: require('./workflows'),
-  stages: require('./workflows/stages'),
+  admin: require('./admin'),
 };

package/ee/server/controllers/role.js

@@ -1,14 +1,11 @@
 'use strict';
 
-const { ApplicationError } = require('@strapi/utils').errors;
 const {
   validateRoleCreateInput,
   validateRoleDeleteInput,
   validateRolesDeleteInput,
 } = require('../validation/role');
 const { getService } = require('../../../server/utils');
-const { validatedUpdatePermissionsInput } = require('../validation/permission');
-const { SUPER_ADMIN_CODE } = require('../../../server/services/constants');
 
 module.exports = {
   /**
@@ -64,40 +61,4 @@ module.exports = {
       data: sanitizedRoles,
     });
   },
-
-  /**
-   * Updates the permissions assigned to a role
-   * @param {KoaContext} ctx - koa context
-   */
-  async updatePermissions(ctx) {
-    const { id } = ctx.params;
-    const { body: input } = ctx.request;
-
-    const roleService = getService('role');
-    const permissionService = getService('permission');
-
-    const role = await roleService.findOne({ id });
-
-    if (!role) {
-      return ctx.notFound('role.notFound');
-    }
-
-    if (role.code === SUPER_ADMIN_CODE) {
-      throw new ApplicationError("Super admin permissions can't be edited.");
-    }
-
-    await validatedUpdatePermissionsInput(input);
-
-    if (!role) {
-      return ctx.notFound('role.notFound');
-    }
-
-    const permissions = await roleService.assignPermissions(role.id, input.permissions);
-
-    const sanitizedPermissions = permissions.map(permissionService.sanitizePermission);
-
-    return ctx.send({
-      data: sanitizedPermissions,
-    });
-  },
 };

package/ee/server/controllers/user.js

@@ -1,17 +1,41 @@
 'use strict';
 
-const { get } = require('lodash');
-const { pick } = require('lodash/fp');
-const { ApplicationError } = require('@strapi/utils').errors;
+// eslint-disable-next-line node/no-extraneous-require
+const ee = require('@strapi/strapi/lib/utils/ee');
+const _ = require('lodash');
+const { pick, isNil } = require('lodash/fp');
+const { ApplicationError, ForbiddenError } = require('@strapi/utils').errors;
 const { validateUserCreationInput } = require('../validation/user');
+const { validateUserUpdateInput } = require('../../../server/validation/user');
 const { getService } = require('../../../server/utils');
 
 const pickUserCreationAttributes = pick(['firstname', 'lastname', 'email', 'roles']);
 
+const hasAdminSeatsAvaialble = async () => {
+  if (!strapi.EE) {
+    return true;
+  }
+
+  const permittedSeats = ee.seats;
+  if (isNil(permittedSeats)) {
+    return true;
+  }
+
+  const userCount = await strapi.service('admin::user').getCurrentActiveUserCount();
+
+  if (userCount < permittedSeats) {
+    return true;
+  }
+};
+
 module.exports = {
   async create(ctx) {
+    if (!(await hasAdminSeatsAvaialble())) {
+      throw new ForbiddenError('License seat limit reached. You cannot create a new user');
+    }
+
     const { body } = ctx.request;
-    const cleanData = { ...body, email: get(body, `email`, ``).toLowerCase() };
+    const cleanData = { ...body, email: _.get(body, `email`, ``).toLowerCase() };
 
     await validateUserCreationInput(cleanData);
 
@@ -37,4 +61,38 @@ module.exports = {
 
     ctx.created({ data: userInfo });
   },
+
+  async update(ctx) {
+    const { id } = ctx.params;
+    const { body: input } = ctx.request;
+
+    await validateUserUpdateInput(input);
+
+    if (_.has(input, 'email')) {
+      const uniqueEmailCheck = await getService('user').exists({
+        id: { $ne: id },
+        email: input.email,
+      });
+
+      if (uniqueEmailCheck) {
+        throw new ApplicationError('A user with this email address already exists');
+      }
+    }
+
+    const user = await getService('user').findOne(id, null);
+
+    if (!(await hasAdminSeatsAvaialble()) && !user.isActive && input.isActive) {
+      throw new ForbiddenError('License seat limit reached. You cannot active this user');
+    }
+
+    const updatedUser = await getService('user').updateById(id, input);
+
+    if (!updatedUser) {
+      return ctx.notFound('User does not exist');
+    }
+
+    ctx.body = {
+      data: getService('user').sanitizeUser(updatedUser),
+    };
+  },
 };

package/ee/server/index.js

@@ -2,7 +2,6 @@
 
 module.exports = {
   register: require('./register'),
-  contentTypes: require('./content-types'),
   bootstrap: require('./bootstrap'),
   destroy: require('./destroy'),
   routes: require('./routes'),

package/ee/server/routes/index.js

@@ -11,55 +11,6 @@ const enableFeatureMiddleware = (featureName) => (ctx, next) => {
 };
 
 module.exports = [
-  {
-    method: 'POST',
-    path: '/roles',
-    handler: 'role.create',
-    config: {
-      policies: [
-        'admin::isAuthenticatedAdmin',
-        {
-          name: 'admin::hasPermissions',
-          config: {
-            actions: ['admin::roles.create'],
-          },
-        },
-      ],
-    },
-  },
-  {
-    method: 'DELETE',
-    path: '/roles/:id',
-    handler: 'role.deleteOne',
-    config: {
-      policies: [
-        'admin::isAuthenticatedAdmin',
-        {
-          name: 'admin::hasPermissions',
-          config: {
-            actions: ['admin::roles.delete'],
-          },
-        },
-      ],
-    },
-  },
-  {
-    method: 'POST',
-    path: '/roles/batch-delete',
-    handler: 'role.deleteMany',
-    config: {
-      policies: [
-        'admin::isAuthenticatedAdmin',
-        {
-          name: 'admin::hasPermissions',
-          config: {
-            actions: ['admin::roles.delete'],
-          },
-        },
-      ],
-    },
-  },
-
   // SSO
   {
     method: 'GET',
@@ -149,87 +100,23 @@ module.exports = [
     },
   },
 
-  // Review workflow
-  {
-    method: 'GET',
-    path: '/review-workflows/workflows',
-    handler: 'workflows.find',
-    config: {
-      middlewares: [enableFeatureMiddleware('review-workflows')],
-      policies: [
-        'admin::isAuthenticatedAdmin',
-        {
-          name: 'admin::hasPermissions',
-          config: {
-            actions: ['admin::review-workflows.read'],
-          },
-        },
-      ],
-    },
-  },
-  {
-    method: 'GET',
-    path: '/review-workflows/workflows/:id',
-    handler: 'workflows.findById',
-    config: {
-      middlewares: [enableFeatureMiddleware('review-workflows')],
-      policies: [
-        'admin::isAuthenticatedAdmin',
-        {
-          name: 'admin::hasPermissions',
-          config: {
-            actions: ['admin::review-workflows.read'],
-          },
-        },
-      ],
-    },
-  },
-  {
-    method: 'GET',
-    path: '/review-workflows/workflows/:workflow_id/stages',
-    handler: 'stages.find',
-    config: {
-      middlewares: [enableFeatureMiddleware('review-workflows')],
-      policies: [
-        'admin::isAuthenticatedAdmin',
-        {
-          name: 'admin::hasPermissions',
-          config: {
-            actions: ['admin::review-workflows.read'],
-          },
-        },
-      ],
-    },
-  },
-  {
-    method: 'PUT',
-    path: '/review-workflows/workflows/:workflow_id/stages',
-    handler: 'stages.replace',
-    config: {
-      middlewares: [enableFeatureMiddleware('review-workflows')],
-      policies: [
-        'admin::isAuthenticatedAdmin',
-        {
-          name: 'admin::hasPermissions',
-          config: {
-            actions: ['admin::review-workflows.read'],
-          },
-        },
-      ],
-    },
-  },
+  // License limit infos
   {
     method: 'GET',
-    path: '/review-workflows/workflows/:workflow_id/stages/:id',
-    handler: 'stages.findById',
+    path: '/license-limit-information',
+    handler: 'admin.licenseLimitInformation',
     config: {
-      middlewares: [enableFeatureMiddleware('review-workflows')],
       policies: [
         'admin::isAuthenticatedAdmin',
         {
           name: 'admin::hasPermissions',
           config: {
-            actions: ['admin::review-workflows.read'],
+            actions: [
+              'admin::users.create',
+              'admin::users.read',
+              'admin::users.update',
+              'admin::users.delete',
+            ],
           },
         },
       ],

package/ee/server/services/audit-logs.js

@@ -37,11 +37,21 @@ const defaultEvents = [
   'permission.delete',
 ];
 
-const getSanitizedUser = (user) => ({
-  id: user.id,
-  email: user.email,
-  fullname: `${user.firstname} ${user.lastname}`,
-});
+const getSanitizedUser = (user) => {
+  let displayName = user.email;
+
+  if (user.username) {
+    displayName = user.username;
+  } else if (user.firstname && user.lastname) {
+    displayName = `${user.firstname} ${user.lastname}`;
+  }
+
+  return {
+    id: user.id,
+    email: user.email,
+    displayName,
+  };
+};
 
 const getEventMap = (defaultEvents) => {
   const getDefaultPayload = (...args) => args[0];

package/ee/server/services/index.js

@@ -3,7 +3,6 @@
 module.exports = {
   passport: require('./passport'),
   role: require('./role'),
-  workflows: require('./review-workflows/workflows'),
-  stages: require('./review-workflows/stages'),
-  'review-workflows': require('./review-workflows/review-workflows'),
+  user: require('./user'),
+  'seat-enforcement': require('./seat-enforcement'),
 };