@strapi/plugin-users-permissions 4.0.0-beta.15 → 4.0.0-beta.19

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,21 +1,31 @@
 {
   "name": "@strapi/plugin-users-permissions",
-  "version": "4.0.0-beta.15",
+  "version": "4.0.0-beta.19",
   "description": "Protect your API with a full-authentication process based on JWT",
-  "strapi": {
-    "displayName": "Roles & Permissions",
-    "name": "users-permissions",
-    "description": "Protect your API with a full authentication process based on JWT. This plugin comes also with an ACL strategy that allows you to manage the permissions between the groups of users.",
-    "required": true,
-    "kind": "plugin"
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/strapi/strapi.git"
   },
+  "license": "SEE LICENSE IN LICENSE",
+  "author": {
+    "name": "Strapi Solutions SAS",
+    "email": "hi@strapi.io",
+    "url": "https://strapi.io"
+  },
+  "maintainers": [
+    {
+      "name": "Strapi Solutions SAS",
+      "email": "hi@strapi.io",
+      "url": "https://strapi.io"
+    }
+  ],
   "scripts": {
     "test": "echo \"no tests yet\""
   },
   "dependencies": {
     "@purest/providers": "^1.0.2",
-    "@strapi/helper-plugin": "4.0.0-beta.15",
-    "@strapi/utils": "4.0.0-beta.15",
+    "@strapi/helper-plugin": "4.0.0-beta.19",
+    "@strapi/utils": "4.0.0-beta.19",
     "bcryptjs": "2.4.3",
     "grant-koa": "5.4.8",
     "jsonwebtoken": "^8.1.0",
@@ -30,31 +40,22 @@
     "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": {
     "koa": "^2.13.1"
   },
-  "author": {
-    "name": "Strapi team",
-    "email": "hi@strapi.io",
-    "url": "https://strapi.io"
-  },
-  "maintainers": [
-    {
-      "name": "Strapi team",
-      "email": "hi@strapi.io",
-      "url": "https://strapi.io"
-    }
-  ],
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/strapi/strapi.git"
-  },
   "engines": {
     "node": ">=12.x.x <=16.x.x",
     "npm": ">=6.0.0"
   },
-  "license": "SEE LICENSE IN LICENSE",
-  "gitHead": "c69713bf7f437a7cee66ffdeed95227d6246a872"
+  "strapi": {
+    "displayName": "Roles & Permissions",
+    "name": "users-permissions",
+    "description": "Protect your API with a full authentication process based on JWT. This plugin comes also with an ACL strategy that allows you to manage the permissions between the groups of users.",
+    "required": true,
+    "kind": "plugin"
+  },
+  "gitHead": "6e0f2052136c7d337d72b944cd0564d4559896d0"
 }

package/server/bootstrap/index.js

@@ -41,9 +41,6 @@ const initGrant = async pluginStore => {
   const baseURL = `${strapi.config.server.url}/${apiPrefix}/auth`;
 
   const grantConfig = {
-    defaults: {
-      prefix: `${apiPrefix}/connect`,
-    },
     email: {
       enabled: true,
       icon: 'envelope',

package/server/controllers/auth.js

@@ -162,10 +162,18 @@ module.exports = {
   async connect(ctx, next) {
     const grant = require('grant-koa');
 
-    const grantConfig = await strapi
+    const providers = await strapi
       .store({ type: 'plugin', name: 'users-permissions', key: 'grant' })
       .get();
 
+    const apiPrefix = strapi.config.get('api.rest.prefix');
+    const grantConfig = {
+      defaults: {
+        prefix: `${apiPrefix}/connect`,
+      },
+      ...providers,
+    };
+
     const [requestPath] = ctx.request.url.split('?');
     const provider = requestPath.split('/connect/')[1].split('/')[0];
 

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');
 
@@ -27,7 +28,7 @@ module.exports = ({ strapi }) => {
   const getProfile = async (provider, query, callback) => {
     const access_token = query.access_token || query.code || query.oauth_token;
 
-    const grant = await strapi
+    const providers = await strapi
       .store({ type: 'plugin', name: 'users-permissions', key: 'grant' })
       .get();
 
@@ -200,8 +201,8 @@ module.exports = ({ strapi }) => {
         const twitter = purest({
           provider: 'twitter',
           config: purestConfig,
-          key: grant.twitter.key,
-          secret: grant.twitter.secret,
+          key: providers.twitter.key,
+          secret: providers.twitter.secret,
         });
 
         twitter
@@ -224,8 +225,8 @@ module.exports = ({ strapi }) => {
       case 'instagram': {
         const instagram = purest({
           provider: 'instagram',
-          key: grant.instagram.key,
-          secret: grant.instagram.secret,
+          key: providers.instagram.key,
+          secret: providers.instagram.secret,
           config: purestConfig,
         });
 
@@ -297,7 +298,7 @@ module.exports = ({ strapi }) => {
 
         twitch
           .get('users')
-          .auth(access_token, grant.twitch.key)
+          .auth(access_token, providers.twitch.key)
           .request((err, res, body) => {
             if (err) {
               callback(err);
@@ -402,7 +403,7 @@ module.exports = ({ strapi }) => {
       }
       case 'auth0': {
         const purestAuth0Conf = {};
-        purestAuth0Conf[`https://${grant.auth0.subdomain}.auth0.com`] = {
+        purestAuth0Conf[`https://${providers.auth0.subdomain}.auth0.com`] = {
           __domain: {
             auth: {
               auth: { bearer: '[0]' },
@@ -441,7 +442,7 @@ module.exports = ({ strapi }) => {
         break;
       }
       case 'cas': {
-        const provider_url = 'https://' + _.get(grant['cas'], 'subdomain');
+        const provider_url = 'https://' + _.get(providers.cas, 'subdomain');
         const cas = purest({
           provider: 'cas',
           config: {
@@ -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 {