@strapi/plugin-users-permissions 4.0.0-beta.14 → 4.0.0-beta.18

package/admin/src/components/Permissions/index.js

@@ -1,7 +1,8 @@
-import React, { memo, useCallback, useReducer } from 'react';
+import React, { useReducer } from 'react';
 import { Accordion, AccordionToggle, AccordionContent } from '@strapi/design-system/Accordion';
 import { useIntl } from 'react-intl';
 import { Box } from '@strapi/design-system/Box';
+import { Stack } from '@strapi/design-system/Stack';
 import { useUsersPermissions } from '../../contexts/UsersPermissionsContext';
 import formatPluginName from '../../utils/formatPluginName';
 import PermissionRow from './PermissionRow';
@@ -15,20 +16,20 @@ const Permissions = () => {
     init(state, modifiedData)
   );
 
-  const handleToggle = useCallback(index => {
+  const handleToggle = index =>
     dispatch({
       type: 'TOGGLE_COLLAPSE',
       index,
     });
-  }, []);
 
   return (
-    <>
+    <Stack size={1}>
       {collapses.map((collapse, index) => (
         <Accordion
           expanded={collapse.isOpen}
           toggle={() => handleToggle(index)}
           key={collapse.name}
+          variant={index % 2 === 0 ? 'secondary' : undefined}
         >
           <AccordionToggle
             title={formatPluginName(collapse.name)}
@@ -42,14 +43,14 @@ const Permissions = () => {
             variant={index % 2 ? 'primary' : 'secondary'}
           />
           <AccordionContent>
-            <Box background="neutral0">
+            <Box>
               <PermissionRow permissions={modifiedData[collapse.name]} name={collapse.name} />
             </Box>
           </AccordionContent>
         </Accordion>
       ))}
-    </>
+    </Stack>
   );
 };
 
-export default memo(Permissions);
+export default Permissions;

package/admin/src/components/Policies/index.js

@@ -3,18 +3,21 @@ import { useIntl } from 'react-intl';
 import { Typography } from '@strapi/design-system/Typography';
 import { Stack } from '@strapi/design-system/Stack';
 import { GridItem } from '@strapi/design-system/Grid';
-import { get, isEmpty, takeRight, toLower, without } from 'lodash';
+import { get, isEmpty, without } from 'lodash';
 import { useUsersPermissions } from '../../contexts/UsersPermissionsContext';
 import BoundRoute from '../BoundRoute';
 
 const Policies = () => {
   const { formatMessage } = useIntl();
   const { selectedAction, routes } = useUsersPermissions();
+
   const path = without(selectedAction.split('.'), 'controllers');
   const controllerRoutes = get(routes, path[0]);
+  const pathResolved = path.slice(1).join('.');
+
   const displayedRoutes = isEmpty(controllerRoutes)
     ? []
-    : controllerRoutes.filter(o => toLower(o.handler) === toLower(takeRight(path, 2).join('.')));
+    : controllerRoutes.filter(o => o.handler.endsWith(pathResolved));
 
   return (
     <GridItem

package/admin/src/components/UsersPermissions/index.js

@@ -1,4 +1,4 @@
-import React, { memo, useReducer, useCallback, forwardRef, useImperativeHandle } from 'react';
+import React, { memo, useReducer, forwardRef, useImperativeHandle } from 'react';
 import PropTypes from 'prop-types';
 import { Typography } from '@strapi/design-system/Typography';
 import { Stack } from '@strapi/design-system/Stack';
@@ -31,28 +31,25 @@ const UsersPermissions = forwardRef(({ permissions, routes }, ref) => {
     },
   }));
 
-  const handleChange = useCallback(({ target: { name, value } }) => {
+  const handleChange = ({ target: { name, value } }) =>
     dispatch({
       type: 'ON_CHANGE',
       keys: name.split('.'),
       value: value === 'empty__string_value' ? '' : value,
     });
-  }, []);
 
-  const handleChangeSelectAll = useCallback(({ target: { name, value } }) => {
+  const handleChangeSelectAll = ({ target: { name, value } }) =>
     dispatch({
       type: 'ON_CHANGE_SELECT_ALL',
       keys: name.split('.'),
       value,
     });
-  }, []);
 
-  const handleSelectedAction = useCallback(actionToSelect => {
+  const handleSelectedAction = actionToSelect =>
     dispatch({
       type: 'SELECT_ACTION',
       actionToSelect,
     });
-  }, []);
 
   const providerValue = {
     ...state,
@@ -65,7 +62,7 @@ const UsersPermissions = forwardRef(({ permissions, routes }, ref) => {
     <UsersPermissionsProvider value={providerValue}>
       <Grid gap={0} shadow="filterShadow" hasRadius background="neutral0">
         <GridItem col={7} paddingTop={6} paddingBottom={6} paddingLeft={7} paddingRight={7}>
-          <Stack size={4}>
+          <Stack size={6}>
             <Stack size={2}>
               <Typography variant="delta" as="h2">
                 {formatMessage({

package/admin/src/pages/Roles/ListPage/index.js

@@ -16,6 +16,7 @@ import {
   NoPermissions,
   LoadingIndicatorPage,
   SearchURLQuery,
+  useFocusWhenNavigate,
   useQueryParams,
   EmptyStateLayout,
   ConfirmDialog,
@@ -42,6 +43,7 @@ const RoleListPage = () => {
   const [showConfirmDelete, setShowConfirmDelete] = useState(false);
   const [isConfirmButtonLoading, setIsConfirmButtonLoading] = useState(false);
   const [roleToDelete, setRoleToDelete] = useState();
+  useFocusWhenNavigate();
 
   const queryClient = useQueryClient();
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/plugin-users-permissions",
-  "version": "4.0.0-beta.14",
+  "version": "4.0.0-beta.18",
   "description": "Protect your API with a full-authentication process based on JWT",
   "strapi": {
     "displayName": "Roles & Permissions",
@@ -14,8 +14,8 @@
   },
   "dependencies": {
     "@purest/providers": "^1.0.2",
-    "@strapi/helper-plugin": "4.0.0-beta.14",
-    "@strapi/utils": "4.0.0-beta.14",
+    "@strapi/helper-plugin": "4.0.0-beta.18",
+    "@strapi/utils": "4.0.0-beta.18",
     "bcryptjs": "2.4.3",
     "grant-koa": "5.4.8",
     "jsonwebtoken": "^8.1.0",
@@ -30,6 +30,7 @@
     "react-router-dom": "5.2.0",
     "redux-saga": "^0.16.0",
     "request": "^2.83.0",
+    "url-join": "4.0.1",
     "uuid": "^3.1.0"
   },
   "devDependencies": {
@@ -56,5 +57,5 @@
     "npm": ">=6.0.0"
   },
   "license": "SEE LICENSE IN LICENSE",
-  "gitHead": "0c0789354d34c685b94474911b79c1b679155dfa"
+  "gitHead": "3e9e3f13cb85822e6d92b0e448ae0b94d440dac1"
 }

package/server/content-types/permission/index.js

@@ -13,6 +13,9 @@ module.exports = {
     'content-manager': {
       visible: false,
     },
+    'content-type-builder': {
+      visible: false,
+    },
   },
   attributes: {
     action: {

package/server/content-types/role/index.js

@@ -13,6 +13,9 @@ module.exports = {
     'content-manager': {
       visible: false,
     },
+    'content-type-builder': {
+      visible: false,
+    },
   },
   attributes: {
     name: {

package/server/services/providers.js

@@ -7,6 +7,7 @@
 // Public node modules.
 const _ = require('lodash');
 const jwt = require('jsonwebtoken');
+const urlJoin = require('url-join');
 
 const { getAbsoluteServerUrl } = require('@strapi/utils');
 
@@ -167,7 +168,7 @@ module.exports = ({ strapi }) => {
                 return callback(null, {
                   username: userbody.login,
                   email: Array.isArray(emailsbody)
-                    ? emailsbody.find(email => email.primary === true).email
+                    ? emailsbody.find((email) => email.primary === true).email
                     : null,
                 });
               });
@@ -550,7 +551,7 @@ module.exports = ({ strapi }) => {
           }
 
           if (
-            !_.isEmpty(_.find(users, user => user.provider !== provider)) &&
+            !_.isEmpty(_.find(users, (user) => user.provider !== provider)) &&
             advanced.unique_email
           ) {
             return resolve([
@@ -588,7 +589,7 @@ module.exports = ({ strapi }) => {
 
   const buildRedirectUri = (provider = '') => {
     const apiPrefix = strapi.config.get('api.rest.prefix');
-    return `${getAbsoluteServerUrl(strapi.config)}/${apiPrefix}/connect/${provider}/callback`;
+    return urlJoin(getAbsoluteServerUrl(strapi.config), apiPrefix, 'connect', provider, 'callback');
   };
 
   return {