yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-02 10:55:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: validation message shape

Browse Source
This commit is contained in:
Ben Irvin 2025-01-29 16:54:15 +01:00
parent 1f8e39868e
commit e07a466901
7 changed files with 46 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/core/admin/admin/src/pages/Auth/components/Register.tsx
View File

@ -47,7 +47,7 @@ const REGISTER_USER_SCHEMA = yup.object().shape({
id: 'components.Input.error.contain.maxBytes',
defaultMessage: 'Password must be less than 73 bytes',
},
(value) => {
function (value) {
if (!value) return true;
return new TextEncoder().encode(value).length <= 72;
}
@ -115,7 +115,7 @@ const REGISTER_ADMIN_SCHEMA = yup.object().shape({
id: 'components.Input.error.contain.maxBytes',
defaultMessage: 'Password must be less than 73 bytes',
},
(value) => {
function (value) {
if (!value) return true;
return new TextEncoder().encode(value).length <= 72;
}

19
packages/core/admin/admin/src/pages/Auth/components/ResetPassword.tsx
View File

@ -30,11 +30,20 @@ const RESET_PASSWORD_SCHEMA = yup.object().shape({
values: { min: 8 },
})
// bcrypt has a max length of 72 bytes (not characters!)
.test('required-byte-size', 'Password must be less than 73 bytes', (value) => {
if (!value) return true;
const byteSize = new TextEncoder().encode(value).length;
return byteSize <= 72;
})
.test(
'required-byte-size',
{
message: {
id: 'components.Input.error.contain.maxBytes',
defaultMessage: 'Password must be less than 73 bytes',
},
},
function (value) {
if (!value) return true;
const byteSize = new TextEncoder().encode(value).length;
return byteSize <= 72;
}
)
.matches(/[a-z]/, {
message: {
id: 'components.Input.error.contain.lowercase',

2
packages/core/admin/admin/src/pages/Settings/pages/Users/utils/validation.ts
View File

@ -33,7 +33,7 @@ const COMMON_USER_SCHEMA = {
id: 'components.Input.error.contain.maxBytes',
defaultMessage: 'Password must be less than 73 bytes',
},
(value) => {
function (value) {
if (!value) return true;
return new TextEncoder().encode(value).length <= 72;
}

2
packages/core/admin/server/src/validation/common-validators.ts
View File

@ -23,7 +23,7 @@ export const username = yup.string().min(1);
export const password = yup
.string()
.min(8)
.test('required-byte-size', '${path} must be less than 73 bytes', (value) => {
.test('required-byte-size', '${path} must be less than 73 bytes', function (value) {
if (!value) return true;
const byteSize = new TextEncoder().encode(value).length;
return byteSize <= 72;

7
packages/plugins/users-permissions/server/controllers/validation/__tests__/auth.test.js
View File

@ -477,7 +477,12 @@ describe('user-permissions auth', () => {
const authorization = auth({ strapi: global.strapi });
if (expectedMessage) {
await expect(authorization.resetPassword(ctx)).rejects.toThrow(expectedMessage);
await expect(authorization.resetPassword(ctx)).rejects.toThrowError(
expect.objectContaining({
name: 'ValidationError',
message: expectedMessage,
})
);
expect(ctx.send).toHaveBeenCalledTimes(0);
} else {
await authorization.resetPassword(ctx);

48
packages/plugins/users-permissions/server/controllers/validation/auth.js
View File

@ -14,16 +14,14 @@ const createRegisterSchema = (config) =>
password: yup
.string()
.required()
.test(
'max-bytes',
{
message: 'Password must be less than 73 bytes',
},
(value) => {
if (!value) return true;
return new TextEncoder().encode(value).length <= 72;
.test(function (value) {
if (!value) return true;
const isValid = new TextEncoder().encode(value).length <= 72;
if (!isValid) {
return this.createError({ message: 'Password must be less than 73 bytes' });
}
)
return true;
})
.test(async function (value) {
if (typeof config?.validatePassword === 'function') {
try {
@ -59,16 +57,14 @@ const createResetPasswordSchema = (config) =>
password: yup
.string()
.required()
.test(
'max-bytes',
{
message: 'Password must be less than 73 bytes',
},
(value) => {
if (!value) return true;
return new TextEncoder().encode(value).length <= 72;
.test(function (value) {
if (!value) return true;
const isValid = new TextEncoder().encode(value).length <= 72;
if (!isValid) {
return this.createError({ message: 'Password must be less than 73 bytes' });
}
)
return true;
})
.test(async function (value) {
if (typeof config?.validatePassword === 'function') {
try {
@ -97,16 +93,14 @@ const createChangePasswordSchema = (config) =>
password: yup
.string()
.required()
.test(
'max-bytes',
{
message: 'Password must be less than 73 bytes',
},
(value) => {
if (!value) return true;
return new TextEncoder().encode(value).length <= 72;
.test(function (value) {
if (!value) return true;
const isValid = new TextEncoder().encode(value).length <= 72;
if (!isValid) {
return this.createError({ message: 'Password must be less than 73 bytes' });
}
)
return true;
})
.test(async function (value) {
if (typeof config?.validatePassword === 'function') {
try {

1
tests/api/plugins/users-permissions/content-api/auth.test.api.js
View File

@ -34,6 +34,7 @@ describe('Auth API', () => {
});
afterAll(async () => {
await strapi.db.query('plugin::users-permissions.user').deleteMany();
await strapi.destroy();
});