Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-02-10 23:36:14 -05:00
Code Issues Activity

Updated members import sanitization

Browse source 
no issue

- Updated sanitization logic to be self contained and return sanitieze input along with error stats
- This should give a nice place for validations to fit in
This commit is contained in:
Nazar Gargol 2020-08-13 22:12:20 +12:00
parent aac3466d95
commit a1e6b8f898
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
core/server/api/canary/members.js
View file

@ -51,7 +51,11 @@ const sanitizeInput = (members) => {
return !(toRemove.includes(member.stripe_customer_id));
});
return sanitized;
const duplicateStripeCount = members.length - sanitized.length;
return {
sanitized,
duplicateStripeCount
};
function serializeMemberLabels(labels) {
@ -428,11 +432,10 @@ module.exports = {
await findOrCreateLabels(memberLabels, frame.options);
return Promise.resolve().then(() => {
const sanitized = sanitizeInput(frame.data.members);
duplicateStripeCustomerIdCount = frame.data.members.length - sanitized.length;
invalid.count += duplicateStripeCustomerIdCount;
const {sanitized, duplicateStripeCount} = sanitizeInput(frame.data.members);
invalid.count += duplicateStripeCount;
if (duplicateStripeCustomerIdCount) {
if (duplicateStripeCount) {
invalid.errors.push(new errors.ValidationError({
message: i18n.t('errors.api.members.duplicateStripeCustomerIds.message'),
context: i18n.t('errors.api.members.duplicateStripeCustomerIds.context'),
@ -584,11 +587,10 @@ module.exports = {
const allLabelModels = [...importSetLabelModels, ...memberLabelModels].filter(model => model !== undefined);
return Promise.resolve().then(async () => {
const sanitized = sanitizeInput(frame.data.members);
duplicateStripeCustomerIdCount = frame.data.members.length - sanitized.length;
invalid.count += duplicateStripeCustomerIdCount;
const {sanitized, duplicateStripeCount} = sanitizeInput(frame.data.members);
invalid.count += duplicateStripeCount;
if (duplicateStripeCustomerIdCount) {
if (duplicateStripeCount) {
invalid.errors.push(new errors.ValidationError({
message: i18n.t('errors.api.members.duplicateStripeCustomerIds.message'),
context: i18n.t('errors.api.members.duplicateStripeCustomerIds.context'),