yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-27 01:09:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14822 from strapi/fix/users-permissions-user-update

Browse Source
This commit is contained in:
Alexandre BODIN 2022-11-10 10:28:16 +01:00 committed by GitHub
commit a8f807d27e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
packages/plugins/users-permissions/server/controllers/validation/user.js
View File

@ -18,7 +18,7 @@ const createUserBodySchema = yup.object().shape({
connect: yup connect: yup
.array() .array()
.of(yup.object().shape({ id: yup.strapiID().required() })) .of(yup.object().shape({ id: yup.strapiID().required() }))
.min(1) .min(1, 'Users must have a role')
.required(), .required(),
}) })
.required() .required()
@ -36,7 +36,16 @@ const updateUserBodySchema = yup.object().shape({
connect: yup connect: yup
.array() .array()
.of(yup.object().shape({ id: yup.strapiID().required() })) .of(yup.object().shape({ id: yup.strapiID().required() }))
.min(1) .required(),
disconnect: yup
.array()
.test('CheckDisconnect', 'Cannot remove role', function test(disconnectValue) {
if (value.connect.length === 0 && disconnectValue.length > 0) {
return false;
}
return true;
})
.required(), .required(),
}) })
: yup.strapiID() : yup.strapiID()