Skip to content

#488 Project List endpoint returns member email for some projects #490

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 2, 2020
Merged

#488 Project List endpoint returns member email for some projects #490

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 25 additions & 2 deletions src/routes/projects/get.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,18 @@ const ES_PROJECT_TYPE = config.get('elasticsearchConfig.docType');
// var permissions = require('tc-core-library-js').middleware.permissions
const permissions = tcMiddleware.permissions;
const PROJECT_ATTRIBUTES = _.without(_.keys(models.Project.rawAttributes), 'utm', 'deletedAt');
const PROJECT_MEMBER_ATTRIBUTES = _.without(_.keys(models.ProjectMember.rawAttributes), 'deletedAt');
const PROJECT_MEMBER_ATTRIBUTES = _.concat(_.without(_.keys(models.ProjectMember.rawAttributes), 'deletedAt'),
['firstName', 'lastName', 'handle', 'email']);
const PROJECT_MEMBER_INVITE_ATTRIBUTES = _.without(_.keys(models.ProjectMemberInvite.rawAttributes), 'deletedAt');
const PROJECT_ATTACHMENT_ATTRIBUTES = _.without(_.keys(models.ProjectAttachment.rawAttributes), 'deletedAt');
const PROJECT_PHASE_ATTRIBUTES = _.without(
_.keys(models.ProjectPhase.rawAttributes),
'deletedAt',
);
const PROJECT_PHASE_PRODUCTS_ATTRIBUTES = _.without(
_.keys(models.PhaseProduct.rawAttributes),
'deletedAt',
);

/**
* Parse the ES search criteria and prepare search request body
Expand Down Expand Up @@ -52,13 +61,21 @@ const parseElasticSearchCriteria = (projectId, fields) => {
sourceInclude = sourceInclude.concat(_.map(memberFields, single => `invites.${single}`));
}

if (_.get(fields, 'project_phases', null)) {
const phaseFields = _.get(fields, 'project_phases');
sourceInclude = sourceInclude.concat(_.map(phaseFields, single => `phases.${single}`));
}
if (_.get(fields, 'project_phases_products', null)) {
const phaseFields = _.get(fields, 'project_phases_products');
sourceInclude = sourceInclude.concat(_.map(phaseFields, single => `phases.products.${single}`));
}
if (_.get(fields, 'attachments', null)) {
const attachmentFields = _.get(fields, 'attachments');
sourceInclude = sourceInclude.concat(_.map(attachmentFields, single => `attachments.${single}`));
}

if (sourceInclude) {
searchCriteria._sourceInclude = sourceInclude; // eslint-disable-line no-underscore-dangle
searchCriteria._sourceIncludes = sourceInclude; // eslint-disable-line no-underscore-dangle
}


Expand Down Expand Up @@ -87,9 +104,14 @@ const retrieveProjectFromES = (projectId, req) => {
projects: PROJECT_ATTRIBUTES,
project_members: PROJECT_MEMBER_ATTRIBUTES,
project_member_invites: PROJECT_MEMBER_INVITE_ATTRIBUTES,
project_phases: PROJECT_PHASE_ATTRIBUTES,
project_phases_products: PROJECT_PHASE_PRODUCTS_ATTRIBUTES,
attachments: PROJECT_ATTACHMENT_ATTRIBUTES,
});

// if user is not admin, ignore email field for project_members
fields = util.ignoreEmailField(req, fields);

const searchCriteria = parseElasticSearchCriteria(projectId, fields) || {};
return new Promise((accept, reject) => {
const es = util.getElasticSearchClient();
Expand All @@ -108,6 +130,7 @@ const retrieveProjectFromDB = (projectId, req) => {
projects: PROJECT_ATTRIBUTES,
project_members: PROJECT_MEMBER_ATTRIBUTES,
});

return models.Project
.findOne({
where: { id: projectId },
Expand Down
Loading