TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-11-30 11:54:33 +03:00
Code Issues Projects Releases Wiki Activity

🐛 Fixed CSV import json-schema email validation (#12239)

Browse Source 
no-issue

By using the "email" validation, we were validating emails in CSV
imports using a different validator to the rest of the API. AJV's built
in email validation was failing on emails with "special" characters,
such as letters with an umlaut above them.

This commit brings the validation for CSV imports in line with the rest
of the API.
This commit is contained in:
Fabien 'egg' O'Carroll 2020-09-29 12:51:35 +01:00 committed by GitHub
parent 4e45373730
commit 854a41e556
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/server/api/canary/utils/validators/input/schemas/members-upload.json
View File

@ -19,7 +19,7 @@
"type": "string",
"minLength": 1,
"maxLength": 191,
"format": "email"
"pattern": "^([^,]|$)"
},
"note": {
"type": ["string", "null"],

35
test/regression/api/canary/admin/members_spec.js
View File

@ -474,20 +474,35 @@ describe('Members API', function () {
should.exist(jsonResponse.meta.stats);
jsonResponse.meta.stats.imported.count.should.equal(0);
jsonResponse.meta.stats.invalid.count.should.equal(2);
jsonResponse.meta.stats.invalid.count.should.equal(3);
should.equal(jsonResponse.meta.stats.invalid.errors.length, 4);
jsonResponse.meta.stats.invalid.errors[0].message.should.equal('Validation failed for \'name\'.');
jsonResponse.meta.stats.invalid.errors[0].count.should.equal(1);
const validationErrors = jsonResponse.meta.stats.invalid.errors;
jsonResponse.meta.stats.invalid.errors[1].message.should.equal('Validation failed for \'email\'.');
jsonResponse.meta.stats.invalid.errors[1].count.should.equal(2);
should.equal(validationErrors.length, 4);
jsonResponse.meta.stats.invalid.errors[2].message.should.equal('Validation failed for \'created_at\'.');
jsonResponse.meta.stats.invalid.errors[2].count.should.equal(1);
const nameValidationErrors = validationErrors.find(
obj => obj.message === 'Validation failed for \'name\'.'
);
should.exist(nameValidationErrors);
nameValidationErrors.count.should.equal(1);
jsonResponse.meta.stats.invalid.errors[3].message.should.equal('Validation failed for \'complimentary_plan\'.');
jsonResponse.meta.stats.invalid.errors[3].count.should.equal(1);
const emailValidationErrors = validationErrors.find(
obj => obj.message === 'Validation (isEmail) failed for email'
);
should.exist(emailValidationErrors);
emailValidationErrors.count.should.equal(1);
const createdAtValidationErrors = validationErrors.find(
obj => obj.message === 'Validation failed for \'created_at\'.'
);
should.exist(createdAtValidationErrors);
createdAtValidationErrors.count.should.equal(1);
const compedPlanValidationErrors = validationErrors.find(
obj => obj.message === 'Validation failed for \'complimentary_plan\'.'
);
should.exist(compedPlanValidationErrors);
compedPlanValidationErrors.count.should.equal(1);
should.exist(jsonResponse.meta.import_label);
jsonResponse.meta.import_label.slug.should.equal('new-global-label');

5
test/utils/fixtures/csv/members-invalid-values.csv
View File

@ -1,3 +1,4 @@
email,name,note,subscribed_to_emails,complimentary_plan,stripe_customer_id,created_at,labels
invalid_email_value1,",name starting with coma",,not_boolean,false,,not_a_date,labels
invalid_email_value2,"good name",,true,not_boolean,,2019-10-30T14:52:08.000Z,more-labels
valid@email.com,",name starting with coma",,not_boolean,false,,not_a_date,labels
valid2@email.com,"good name",,true,not_boolean,,2019-10-30T14:52:08.000Z,more-labels
invalid_email_value,"good name",,true,false,,2019-10-30T14:52:08.000Z,more-labels

1 email name note subscribed_to_emails complimentary_plan stripe_customer_id created_at labels
2 invalid_email_value1 valid@email.com ,name starting with coma not_boolean false not_a_date labels
3 invalid_email_value2 valid2@email.com good name true not_boolean 2019-10-30T14:52:08.000Z more-labels
4 invalid_email_value good name true false 2019-10-30T14:52:08.000Z more-labels