Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 17 additions & 0 deletions app/routes/report/report.js
Original file line number Diff line number Diff line change
Expand Up @@ -360,6 +360,23 @@ router.route('/')
const {
query: {ignore_extra_fields, upload_contents},
} = req;

let userProjects;
try {
userProjects = await getUserProjects(db.models.project, req.user);
userProjects = userProjects.map((proj) => {
return proj.name;
});
} catch (error) {
const message = `Error while trying to get project access ${error}`;
logger.error(message);
return res.status(HTTP_STATUS.INTERNAL_SERVER_ERROR).json({error: {message}});
}

if (req.body.project && !userProjects.includes(req.body.project)) {
return res.status(HTTP_STATUS.FORBIDDEN).json({error: `User does not have access to project ${req.body.project}`});
}

if (req.body.sampleInfo) {
// Clean sampleInfo input
const cleanSampleInfo = [];
Expand Down
18 changes: 17 additions & 1 deletion app/routes/report/reportAsync.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,13 @@ const {v4: uuidv4} = require('uuid');
const reportAsyncMiddleware = require('../../middleware/reportAsync');

const {addJobToReportQueue} = require('../../queue');

const db = require('../../models');
const logger = require('../../log');

const router = express.Router({mergeParams: true});

const validateAgainstSchema = require('../../libs/validateAgainstSchema');
const {getUserProjects} = require('../../libs/helperFunctions');

// Generate schema's
const reportUploadSchema = require('../../schemas/report/reportUpload')(true);
Expand All @@ -24,6 +25,21 @@ router.route('/')
query: {ignore_extra_fields},
} = req;

let userProjects;
try {
userProjects = await getUserProjects(db.models.project, req.user);
userProjects = userProjects.map((proj) => {
return proj.name;
});
} catch (error) {
const message = `Error while trying to get project access ${error}`;
logger.error(message);
return res.status(HTTP_STATUS.INTERNAL_SERVER_ERROR).json({error: {message}});
}

if (req.body.project && !userProjects.includes(req.body.project)) {
return res.status(HTTP_STATUS.FORBIDDEN).json({error: `User does not have access to project ${req.body.project}`});
}
if (req.body.sampleInfo) {
// Clean sampleInfo input
const cleanSampleInfo = [];
Expand Down
Loading