Skip to content
This repository was archived by the owner on Nov 16, 2023. It is now read-only.

Update the permission check of add/delete item's categories and tags #312

Merged
yiyione merged 9 commits into from
Jun 21, 2021
Merged

Update the permission check of add/delete item's categories and tags #312

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
24b861c
update the permission check of add/delete item's tag & category
yiyione Jun 10, 2021
cdbaa7b
update the permission check of add/delete item's tag & category
yiyione Jun 10, 2021
5dfa0a3
update
yiyione Jun 10, 2021
5167afe
update
yiyione Jun 10, 2021
ed46180
Merge branch 'master' into yiyi/category_and_tag_permission
yiyione Jun 10, 2021
a8ef127
use Array.prototype.some() instead of ...map().includes()
yiyione Jun 10, 2021
7ce8630
move all OFFICIAL_EXAMPLE to a same place
yiyione Jun 11, 2021
61453a3
fix
yiyione Jun 11, 2021
5c34f2c
merge checkReadPermission/checkWritePermission
yiyione Jun 11, 2021
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
Prev Previous commit
merge checkReadPermission/checkWritePermission
  • Loading branch information
@yiyione
yiyione committed Jun 11, 2021
commit 5c34f2ce264b57a20710d8074d310a057ea63723
33 changes: 11 additions & 22 deletions rest_server/src/controllers/item_controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ const yaml = require('js-yaml');
const protocolValidator = require('../utils/protocol');
const error = require('../models/error');

async function checkReadPermission(userInfo, item, categories) {
if (userInfo.admin === true) {
async function checkWritePermission(tokenInfo, item, categories) {
if (tokenInfo.admin === true) {
return true;
}
if (categories === undefined) {
Expand All @@ -18,11 +18,18 @@ async function checkReadPermission(userInfo, item, categories) {
!categories.some(
category => category.name === ItemCategory.OFFICIAL_EXAMPLE,
) &&
userInfo.username === item.author
tokenInfo.username === item.author
) {
return true;
}
if (item.isPublic) {
return false;
}

async function checkReadPermission(userInfo, item, categories) {
if (
item.isPublic ||
(await checkWritePermission(userInfo, item, categories))
) {
return true;
}
if (!item.isPrivate && (userInfo.grouplist && item.groupList)) {
Expand All @@ -35,24 +42,6 @@ async function checkReadPermission(userInfo, item, categories) {
return false;
}

async function checkWritePermission(tokenInfo, item, categories) {
if (tokenInfo.admin === true) {
return true;
}
if (categories === undefined) {
categories = await MarketplaceItem.getCategories(item);
}
if (
!categories.some(
category => category.name === ItemCategory.OFFICIAL_EXAMPLE,
) &&
tokenInfo.username === item.author
) {
return true;
}
return false;
}

const list = asyncHandler(async (req, res, next) => {
try {
const result = await MarketplaceItem.list(
Expand Down