@strapi/plugin-users-permissions 0.0.0-next.ce51df0e18404afc8a1aa7f504c1006a7a221459 → 0.0.0-next.d010ff3a1ec0f4358fc2c66651621b87ade1322d

package/admin/src/index.js

@@ -32,8 +32,13 @@ export default {
           },
           id: 'roles',
           to: `/settings/users-permissions/roles`,
-          Component: () =>
-            import(/* webpackChunkName: "users-roles-settings-page" */ './pages/Roles'),
+          async Component() {
+            const component = await import(
+              /* webpackChunkName: "users-roles-settings-page" */ './pages/Roles'
+            );
+
+            return component;
+          },
           permissions: PERMISSIONS.accessRoles,
         },
         {
@@ -43,8 +48,13 @@ export default {
           },
           id: 'providers',
           to: `/settings/users-permissions/providers`,
-          Component: () =>
-            import(/* webpackChunkName: "users-providers-settings-page" */ './pages/Providers'),
+          async Component() {
+            const component = await import(
+              /* webpackChunkName: "users-providers-settings-page" */ './pages/Providers'
+            );
+
+            return component;
+          },
           permissions: PERMISSIONS.readProviders,
         },
         {
@@ -54,8 +64,13 @@ export default {
           },
           id: 'email-templates',
           to: `/settings/users-permissions/email-templates`,
-          Component: () =>
-            import(/* webpackChunkName: "users-email-settings-page" */ './pages/EmailTemplates'),
+          async Component() {
+            const component = await import(
+              /* webpackChunkName: "users-email-settings-page" */ './pages/EmailTemplates'
+            );
+
+            return component;
+          },
           permissions: PERMISSIONS.readEmailTemplates,
         },
         {
@@ -65,10 +80,13 @@ export default {
           },
           id: 'advanced-settings',
           to: `/settings/users-permissions/advanced-settings`,
-          Component: () =>
-            import(
+          async Component() {
+            const component = await import(
               /* webpackChunkName: "users-advanced-settings-page" */ './pages/AdvancedSettings'
-            ),
+            );
+
+            return component;
+          },
           permissions: PERMISSIONS.readAdvancedSettings,
         },
       ]

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

@@ -145,7 +145,11 @@ export const CreatePage = () => {
                           id: 'global.name',
                           defaultMessage: 'Name',
                         })}
-                        error={errors?.name ? formatMessage({ id: errors.name }) : false}
+                        error={
+                          errors?.name
+                            ? formatMessage({ id: errors.name, defaultMessage: 'Name is required' })
+                            : false
+                        }
                         required
                       />
                     </GridItem>
@@ -159,7 +163,12 @@ export const CreatePage = () => {
                           defaultMessage: 'Description',
                         })}
                         error={
-                          errors?.description ? formatMessage({ id: errors.description }) : false
+                          errors?.description
+                            ? formatMessage({
+                                id: errors.description,
+                                defaultMessage: 'Description is required',
+                              })
+                            : false
                         }
                         required
                       />

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

@@ -166,7 +166,11 @@ export const EditPage = () => {
                           id: 'global.name',
                           defaultMessage: 'Name',
                         })}
-                        error={errors?.name ? formatMessage({ id: errors.name }) : false}
+                        error={
+                          errors?.name
+                            ? formatMessage({ id: errors.name, defaultMessage: 'Name is required' })
+                            : false
+                        }
                         required
                       />
                     </GridItem>
@@ -180,7 +184,12 @@ export const EditPage = () => {
                           defaultMessage: 'Description',
                         })}
                         error={
-                          errors?.description ? formatMessage({ id: errors.description }) : false
+                          errors?.description
+                            ? formatMessage({
+                                id: errors.description,
+                                defaultMessage: 'Description is required',
+                              })
+                            : false
                         }
                         required
                       />

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/plugin-users-permissions",
-  "version": "0.0.0-next.ce51df0e18404afc8a1aa7f504c1006a7a221459",
+  "version": "0.0.0-next.d010ff3a1ec0f4358fc2c66651621b87ade1322d",
   "description": "Protect your API with a full-authentication process based on JWT",
   "repository": {
     "type": "git",
@@ -29,10 +29,10 @@
     "lint": "run -T eslint ."
   },
   "dependencies": {
-    "@strapi/design-system": "1.9.0",
-    "@strapi/helper-plugin": "0.0.0-next.ce51df0e18404afc8a1aa7f504c1006a7a221459",
-    "@strapi/icons": "1.9.0",
-    "@strapi/utils": "0.0.0-next.ce51df0e18404afc8a1aa7f504c1006a7a221459",
+    "@strapi/design-system": "1.11.0",
+    "@strapi/helper-plugin": "0.0.0-next.d010ff3a1ec0f4358fc2c66651621b87ade1322d",
+    "@strapi/icons": "1.11.0",
+    "@strapi/utils": "0.0.0-next.d010ff3a1ec0f4358fc2c66651621b87ade1322d",
     "bcryptjs": "2.4.3",
     "formik": "2.4.0",
     "grant-koa": "5.4.8",
@@ -54,7 +54,7 @@
     "@testing-library/dom": "9.2.0",
     "@testing-library/react": "14.0.0",
     "@testing-library/user-event": "14.4.3",
-    "msw": "1.2.1",
+    "msw": "1.3.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-router-dom": "5.3.4",
@@ -77,5 +77,5 @@
     "required": true,
     "kind": "plugin"
   },
-  "gitHead": "ce51df0e18404afc8a1aa7f504c1006a7a221459"
+  "gitHead": "d010ff3a1ec0f4358fc2c66651621b87ade1322d"
 }

package/server/bootstrap/index.js

@@ -113,7 +113,8 @@ const userSchemaAdditions = () => {
     'updatedBy',
     'updatedAt',
     'publishedAt',
-    'strapi_reviewWorkflows_stage',
+    'strapi_stage',
+    'strapi_assignee',
   ];
 
   return currentSchema.filter((key) => !(ignoreDiffs.includes(key) || defaultSchema.includes(key)));

package/server/controllers/auth.js

@@ -26,7 +26,7 @@ const {
 } = require('./validation/auth');
 
 const { getAbsoluteAdminUrl, getAbsoluteServerUrl, sanitize } = utils;
-const { ApplicationError, ValidationError } = utils.errors;
+const { ApplicationError, ValidationError, ForbiddenError } = utils.errors;
 
 const sanitizeUser = (user, ctx) => {
   const { auth } = ctx.state;
@@ -100,6 +100,10 @@ module.exports = {
     try {
       const user = await getService('providers').connect(provider, ctx.query);
 
+      if (user.blocked) {
+        throw new ForbiddenError('Your account has been blocked by an administrator');
+      }
+
       return ctx.send({
         jwt: getService('jwt').issue({ id: user.id }),
         user: await sanitizeUser(user, ctx),