Skip to content

fix(PM-1139): challenge task access issue for project manager #739

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 3 commits into from
Apr 30, 2025
Merged

fix(PM-1139): challenge task access issue for project manager #739

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c2311d9
fix: challenge task access issue for project manager
hentrymartin Apr 29, 2025
b1202f4
removed circle config changes
hentrymartin Apr 30, 2025
26c4ad2
comment
hentrymartin Apr 30, 2025
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
1 change: 1 addition & 0 deletions app-constants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ const UserRoles = {
Manager: "Connect Manager",
User: "Topcoder User",
SelfServiceCustomer: "Self-Service Customer",
ProjectManager: "Project Manager",
};

const prizeSetTypes = {
Expand Down
4 changes: 2 additions & 2 deletions src/common/helper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ const elasticsearch = require("elasticsearch");

const projectHelper = require("./project-helper");
const m2mHelper = require("./m2m-helper");
const { hasAdminRole } = require("./role-helper");
const { hasAdminRole, hasProjectManagerRole } = require("./role-helper");

// Bus API Client
let busApiClient;
Expand Down Expand Up @@ -960,7 +960,7 @@ async function _ensureAccessibleForTaskChallenge(currentUser, challenge) {
}
const canAccesChallenge = _.isUndefined(currentUser)
? false
: currentUser.isMachine || hasAdminRole(currentUser) || !_.isEmpty(memberResources);
: currentUser.isMachine || hasAdminRole(currentUser) || hasProjectManagerRole(currentUser) || !_.isEmpty(memberResources);
if (!canAccesChallenge) {
throw new errors.ForbiddenError(`You don't have access to view this challenge`);
}
Expand Down
16 changes: 16 additions & 0 deletions src/common/role-helper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,22 @@ function hasAdminRole(authUser) {
return false;
}

/**
* Check if the user has project manager role
* @param {Object} authUser the user
*/
function hasProjectManagerRole(authUser) {
if (authUser && authUser.roles) {
for (const role of authUser.roles) {
if (role.toLowerCase() === constants.UserRoles.ProjectManager.toLowerCase()) {
return true;
}
}
}
return false;
}

module.exports = {
hasAdminRole,
hasProjectManagerRole,
};
5 changes: 3 additions & 2 deletions src/services/ChallengeService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ const PhaseAdvancer = require("../phase-management/PhaseAdvancer");
const { ChallengeDomain } = require("@topcoder-framework/domain-challenge");
const { QueryDomain } = require("@topcoder-framework/domain-acl");

const { hasAdminRole } = require("../common/role-helper");
const { hasAdminRole, hasProjectManagerRole } = require("../common/role-helper");
const {
enrichChallengeForResponse,
sanitizeRepeatedFieldsInUpdateRequest,
Expand Down Expand Up @@ -152,6 +152,7 @@ async function searchChallenges(currentUser, criteria) {
];

const _hasAdminRole = hasAdminRole(currentUser);
const _hasProjectManagerRole = hasProjectManagerRole(currentUser);

const includedTrackIds = _.isArray(criteria.trackIds) ? criteria.trackIds : [];
const includedTypeIds = _.isArray(criteria.typeIds) ? criteria.typeIds : [];
Expand Down Expand Up @@ -588,7 +589,7 @@ async function searchChallenges(currentUser, criteria) {
// FIXME: Tech Debt
let excludeTasks = true;
// if you're an admin or m2m, security rules wont be applied
if (currentUser && (_hasAdminRole || _.get(currentUser, "isMachine", false))) {
if (currentUser && (_hasAdminRole || _hasProjectManagerRole || _.get(currentUser, "isMachine", false))) {
excludeTasks = false;
}

Expand Down