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
Next Next commit
use Array.prototype.some() instead of ...map().includes()
  • Loading branch information
@yiyione
yiyione committed Jun 10, 2021
commit a8ef12743f518def02925f568ef6e9863eb1d2d3
6 changes: 2 additions & 4 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 @@ -16,9 +16,8 @@ async function checkReadPermission(userInfo, item, categories) {
if (categories === undefined) {
categories = await MarketplaceItem.getCategories(item);
}
const categoriesArray = categories.map(category => category.name);
if (
!categoriesArray.includes(OFFICIAL_EXAMPLE) &&
!categories.some(category => category.name === OFFICIAL_EXAMPLE) &&
userInfo.username === item.author
) {
return true;
Expand All @@ -43,9 +42,8 @@ async function checkWritePermission(tokenInfo, item, categories) {
if (categories === undefined) {
categories = await MarketplaceItem.getCategories(item);
}
const categoriesArray = categories.map(category => category.name);
if (
!categoriesArray.includes(OFFICIAL_EXAMPLE) &&
!categories.some(category => category.name === OFFICIAL_EXAMPLE) &&
tokenInfo.username === item.author
) {
return true;
Expand Down