@strapi/plugin-users-permissions 4.7.0 → 4.7.2-exp.24dd7d95972fa822bf43e9b095b51027402c229e

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

@@ -1,6 +1,6 @@
 import React from 'react';
 import styled from 'styled-components';
-import { Stack, Box, Typography } from '@strapi/design-system';
+import { Flex, Box, Typography } from '@strapi/design-system';
 import map from 'lodash/map';
 import tail from 'lodash/tail';
 import { useIntl } from 'react-intl';
@@ -21,7 +21,7 @@ function BoundRoute({ route }) {
   const colors = getMethodColor(route.method);
 
   return (
-    <Stack spacing={2}>
+    <Flex direction="column" alignItems="stretch" gap={2}>
       <Typography variant="delta" as="h3">
         {formatMessage({
           id: 'users-permissions.BoundRoute.title',
@@ -33,7 +33,7 @@ function BoundRoute({ route }) {
           .{action}
         </Typography>
       </Typography>
-      <Stack horizontal hasRadius background="neutral0" borderColor="neutral200" spacing={0}>
+      <Flex hasRadius background="neutral0" borderColor="neutral200" gap={0}>
         <MethodBox background={colors.background} borderColor={colors.border} padding={2}>
           <Typography fontWeight="bold" textColor={colors.text}>
             {method}
@@ -46,8 +46,8 @@ function BoundRoute({ route }) {
             </Typography>
           ))}
         </Box>
-      </Stack>
-    </Stack>
+      </Flex>
+    </Flex>
   );
 }
 

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

@@ -8,7 +8,7 @@ import React from 'react';
 import { useIntl } from 'react-intl';
 import {
   Button,
-  Stack,
+  Flex,
   Breadcrumbs,
   Crumb,
   Grid,
@@ -58,7 +58,7 @@ const FormModal = ({
           return (
             <Form>
               <ModalBody>
-                <Stack spacing={1}>
+                <Flex direction="column" alignItems="stretch" gap={1}>
                   <Grid gap={5}>
                     {layout.form.map((row) => {
                       return row.map((input) => {
@@ -76,7 +76,7 @@ const FormModal = ({
                       });
                     })}
                   </Grid>
-                </Stack>
+                </Flex>
               </ModalBody>
               <ModalFooter
                 startActions={

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

@@ -1,5 +1,5 @@
 import React, { useReducer } from 'react';
-import { Accordion, AccordionToggle, AccordionContent, Box, Stack } from '@strapi/design-system';
+import { Accordion, AccordionToggle, AccordionContent, Box, Flex } from '@strapi/design-system';
 import { useIntl } from 'react-intl';
 import { useUsersPermissions } from '../../contexts/UsersPermissionsContext';
 import formatPluginName from '../../utils/formatPluginName';
@@ -21,7 +21,7 @@ const Permissions = () => {
     });
 
   return (
-    <Stack spacing={1}>
+    <Flex direction="column" alignItems="stretch" gap={1}>
       {collapses.map((collapse, index) => (
         <Accordion
           expanded={collapse.isOpen}
@@ -47,7 +47,7 @@ const Permissions = () => {
           </AccordionContent>
         </Accordion>
       ))}
-    </Stack>
+    </Flex>
   );
 };
 

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

@@ -1,6 +1,6 @@
 import React from 'react';
 import { useIntl } from 'react-intl';
-import { Typography, Stack, GridItem } from '@strapi/design-system';
+import { Typography, Flex, GridItem } from '@strapi/design-system';
 import { get, isEmpty, without } from 'lodash';
 import { useUsersPermissions } from '../../contexts/UsersPermissionsContext';
 import BoundRoute from '../BoundRoute';
@@ -28,14 +28,14 @@ const Policies = () => {
       style={{ minHeight: '100%' }}
     >
       {selectedAction ? (
-        <Stack spacing={2}>
+        <Flex direction="column" alignItems="stretch" gap={2}>
           {displayedRoutes.map((route, key) => (
             // eslint-disable-next-line react/no-array-index-key
             <BoundRoute key={key} route={route} />
           ))}
-        </Stack>
+        </Flex>
       ) : (
-        <Stack spacing={2}>
+        <Flex direction="column" alignItems="stretch" gap={2}>
           <Typography variant="delta" as="h3">
             {formatMessage({
               id: 'users-permissions.Policies.header.title',
@@ -49,7 +49,7 @@ const Policies = () => {
                 "Select the application's actions or the plugin's actions and click on the cog icon to display the bound route",
             })}
           </Typography>
-        </Stack>
+        </Flex>
       )}
     </GridItem>
   );

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

@@ -1,6 +1,6 @@
 import React, { memo, useReducer, forwardRef, useImperativeHandle } from 'react';
 import PropTypes from 'prop-types';
-import { Typography, Stack, Grid, GridItem } from '@strapi/design-system';
+import { Typography, Flex, Grid, GridItem } from '@strapi/design-system';
 import { useIntl } from 'react-intl';
 import getTrad from '../../utils/getTrad';
 import Policies from '../Policies';
@@ -60,8 +60,8 @@ 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 spacing={6}>
-            <Stack spacing={2}>
+          <Flex direction="column" alignItems="stretch" gap={6}>
+            <Flex direction="column" alignItems="stretch" gap={2}>
               <Typography variant="delta" as="h2">
                 {formatMessage({
                   id: getTrad('Plugins.header.title'),
@@ -74,9 +74,9 @@ const UsersPermissions = forwardRef(({ permissions, routes }, ref) => {
                   defaultMessage: 'Only actions bound by a route are listed below.',
                 })}
               </Typography>
-            </Stack>
+            </Flex>
             <Permissions />
-          </Stack>
+          </Flex>
         </GridItem>
         <Policies />
       </Grid>

package/admin/src/pages/AdvancedSettings/index.js

@@ -20,7 +20,7 @@ import {
   ContentLayout,
   Button,
   Box,
-  Stack,
+  Flex,
   Select,
   Option,
   Typography,
@@ -173,7 +173,7 @@ const AdvancedSettingsPage = () => {
                   paddingLeft={7}
                   paddingRight={7}
                 >
-                  <Stack spacing={4}>
+                  <Flex direction="column" alignItems="stretch" gap={4}>
                     <Typography variant="delta" as="h2">
                       {formatMessage({
                         id: 'global.settings',
@@ -229,7 +229,7 @@ const AdvancedSettingsPage = () => {
                         );
                       })}
                     </Grid>
-                  </Stack>
+                  </Flex>
                 </Box>
               </ContentLayout>
             </Form>

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

@@ -5,7 +5,7 @@ import {
   HeaderLayout,
   Main,
   Button,
-  Stack,
+  Flex,
   Box,
   TextInput,
   Textarea,
@@ -107,7 +107,7 @@ const EditPage = () => {
               })}
             />
             <ContentLayout>
-              <Stack spacing={7}>
+              <Flex direction="column" alignItems="stretch" gap={7}>
                 <Box
                   background="neutral0"
                   hasRadius
@@ -117,7 +117,7 @@ const EditPage = () => {
                   paddingLeft={7}
                   paddingRight={7}
                 >
-                  <Stack spacing={4}>
+                  <Flex direction="column" alignItems="stretch" gap={4}>
                     <Typography variant="delta" as="h2">
                       {formatMessage({
                         id: getTrad('EditPage.form.roles'),
@@ -161,7 +161,7 @@ const EditPage = () => {
                         />
                       </GridItem>
                     </Grid>
-                  </Stack>
+                  </Flex>
                 </Box>
                 {!isLoadingPlugins && (
                   <UsersPermissions
@@ -170,7 +170,7 @@ const EditPage = () => {
                     routes={routes}
                   />
                 )}
-              </Stack>
+              </Flex>
             </ContentLayout>
           </Form>
         )}

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

@@ -16,7 +16,7 @@ import {
   HeaderLayout,
   Main,
   Button,
-  Stack,
+  Flex,
   Box,
   TextInput,
   Textarea,
@@ -119,7 +119,7 @@ const EditPage = () => {
               }
             />
             <ContentLayout>
-              <Stack spacing={7}>
+              <Flex direction="column" alignItems="stretch" gap={7}>
                 <Box
                   background="neutral0"
                   hasRadius
@@ -129,7 +129,7 @@ const EditPage = () => {
                   paddingLeft={7}
                   paddingRight={7}
                 >
-                  <Stack spacing={4}>
+                  <Flex direction="column" alignItems="stretch" gap={4}>
                     <Typography variant="delta" as="h2">
                       {formatMessage({
                         id: getTrad('EditPage.form.roles'),
@@ -173,7 +173,7 @@ const EditPage = () => {
                         />
                       </GridItem>
                     </Grid>
-                  </Stack>
+                  </Flex>
                 </Box>
                 {!isLoadingPlugins && (
                   <UsersPermissions
@@ -182,7 +182,7 @@ const EditPage = () => {
                     routes={routes}
                   />
                 )}
-              </Stack>
+              </Flex>
             </ContentLayout>
           </Form>
         )}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/plugin-users-permissions",
-  "version": "4.7.0",
+  "version": "4.7.2-exp.24dd7d95972fa822bf43e9b095b51027402c229e",
   "description": "Protect your API with a full-authentication process based on JWT",
   "repository": {
     "type": "git",
@@ -27,31 +27,46 @@
     "test:front:watch:ce": "cross-env IS_EE=false jest --config ./jest.config.front.js --watchAll"
   },
   "dependencies": {
-    "@strapi/helper-plugin": "4.7.0",
-    "@strapi/utils": "4.7.0",
+    "@strapi/design-system": "1.6.3",
+    "@strapi/helper-plugin": "4.7.2-exp.24dd7d95972fa822bf43e9b095b51027402c229e",
+    "@strapi/icons": "1.6.3",
+    "@strapi/utils": "4.7.2-exp.24dd7d95972fa822bf43e9b095b51027402c229e",
     "bcryptjs": "2.4.3",
+    "formik": "2.2.9",
     "grant-koa": "5.4.8",
+    "immer": "9.0.19",
     "jsonwebtoken": "9.0.0",
     "jwk-to-pem": "2.0.5",
     "koa": "^2.13.4",
     "koa2-ratelimit": "^1.1.2",
     "lodash": "4.17.21",
+    "match-sorter": "^4.0.2",
+    "prop-types": "^15.7.2",
     "purest": "4.0.2",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2",
     "react-intl": "6.2.8",
+    "react-query": "3.24.3",
     "react-redux": "8.0.5",
-    "react-router": "^5.2.0",
-    "react-router-dom": "5.3.4",
-    "url-join": "4.0.1"
+    "url-join": "4.0.1",
+    "yup": "^0.32.9"
   },
   "devDependencies": {
     "@testing-library/dom": "8.19.0",
     "@testing-library/react": "12.1.4",
     "@testing-library/react-hooks": "8.0.1",
     "@testing-library/user-event": "14.4.3",
+    "history": "^4.9.0",
     "msw": "1.0.1",
-    "react-test-renderer": "^17.0.2"
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2",
+    "react-router-dom": "5.3.4",
+    "react-test-renderer": "^17.0.2",
+    "styled-components": "5.3.3"
+  },
+  "peerDependencies": {
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2",
+    "react-router-dom": "5.3.4",
+    "styled-components": "5.3.3"
   },
   "engines": {
     "node": ">=14.19.1 <=18.x.x",
@@ -64,5 +79,5 @@
     "required": true,
     "kind": "plugin"
   },
-  "gitHead": "948dbb3121330ffd43f3a4f55522c797770e0b2a"
+  "gitHead": "24dd7d95972fa822bf43e9b095b51027402c229e"
 }

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

@@ -38,16 +38,19 @@ module.exports = {
       minLength: 6,
       configurable: false,
       private: true,
+      searchable: false,
     },
     resetPasswordToken: {
       type: 'string',
       configurable: false,
       private: true,
+      searchable: false,
     },
     confirmationToken: {
       type: 'string',
       configurable: false,
       private: true,
+      searchable: false,
     },
     confirmed: {
       type: 'boolean',

package/server/controllers/user.js

@@ -14,13 +14,20 @@ const { validateCreateUserBody, validateUpdateUserBody } = require('./validation
 const { sanitize } = utils;
 const { ApplicationError, ValidationError, NotFoundError } = utils.errors;
 
-const sanitizeOutput = (user, ctx) => {
+const sanitizeOutput = async (user, ctx) => {
   const schema = strapi.getModel('plugin::users-permissions.user');
   const { auth } = ctx.state;
 
   return sanitize.contentAPI.output(user, schema, { auth });
 };
 
+const sanitizeParams = async (params, ctx) => {
+  const schema = strapi.getModel('plugin::users-permissions.user');
+  const { auth } = ctx.state;
+
+  return sanitize.contentAPI.params(params, schema, { auth });
+};
+
 module.exports = {
   /**
    * Create a/an user record.
@@ -136,7 +143,8 @@ module.exports = {
    * @return {Object|Array}
    */
   async find(ctx) {
-    const users = await getService('user').fetchAll(ctx.query);
+    const sanitizedParams = await sanitizeParams(ctx.query, ctx);
+    const users = await getService('user').fetchAll(sanitizedParams);
 
     ctx.body = await Promise.all(users.map((user) => sanitizeOutput(user, ctx)));
   },
@@ -147,9 +155,9 @@ module.exports = {
    */
   async findOne(ctx) {
     const { id } = ctx.params;
-    const { query } = ctx;
+    const sanitizedParams = await sanitizeParams(ctx.query, ctx);
 
-    let data = await getService('user').fetch(id, query);
+    let data = await getService('user').fetch(id, sanitizedParams);
 
     if (data) {
       data = await sanitizeOutput(data, ctx);
@@ -163,7 +171,9 @@ module.exports = {
    * @return {Number}
    */
   async count(ctx) {
-    ctx.body = await getService('user').count(ctx.query);
+    const sanitizedParams = await sanitizeParams(ctx.query, ctx);
+
+    ctx.body = await getService('user').count(sanitizedParams);
   },
 
   /**
@@ -191,7 +201,8 @@ module.exports = {
       return ctx.unauthorized();
     }
 
-    const user = await getService('user').fetch(authUser.id, query);
+    const sanitizedParams = await sanitizeParams(query, ctx);
+    const user = await getService('user').fetch(authUser.id, sanitizedParams);
 
     ctx.body = await sanitizeOutput(user, ctx);
   },