grimhilt/artemio-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

improve permissions access on playlist

Browse Source
This commit is contained in:
grimhilt 2023-08-14 01:19:06 +02:00
parent 4d6414d143
commit 5b2dd86e30
2 changed files with 41 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/pages/playlist/content.jsx
View File

@ -8,9 +8,9 @@ import { useState } from 'react';
import ModalFileSelector from '../files/file-selector'; import ModalFileSelector from '../files/file-selector';
import API from '../../services/api'; import API from '../../services/api';
import setNotification from '../errors/error-notification'; import setNotification from '../errors/error-notification';
import GrantAccess, { Perm } from '../../tools/grant-access';
const Content = ({ form, playlistId }) => { const Content = ({ form, playlistId, playlist }) => {
const [fileSelector, setFileSelector] = useState(false); const [fileSelector, setFileSelector] = useState(false);
const toggleFileSelector = () => setFileSelector(!fileSelector); const toggleFileSelector = () => setFileSelector(!fileSelector);
@ -24,15 +24,15 @@ const Content = ({ form, playlistId }) => {
file.seconds = 10; file.seconds = 10;
const index = form.values.files.length; const index = form.values.files.length;
form.insertListItem('files', file); form.insertListItem('files', file);
API.addFileToPlaylist(playlistId, { position: file.position, file_id: file.id, seconds: file.seconds }) API.playlists.addFile(playlistId, { position: file.position, file_id: file.id, seconds: file.seconds })
.then((res) => { .then((res) => {
if (res.status !== 200) { if (res.status !== 200) {
setNotification(true, `Error when adding file (${res.status})`); setNotification(true, `Error when adding file (${res.status})`);
} }
}) })
.catch((err) => { .catch((err) => {
console.log("here") console.log('here');
form.removeListItem('files', index) form.removeListItem('files', index);
setNotification(true, err); setNotification(true, err);
}); });
}); });
@ -55,7 +55,7 @@ const Content = ({ form, playlistId }) => {
let newPosition = (below_position + above_position) / 2; let newPosition = (below_position + above_position) / 2;
// sending modification to server // sending modification to server
API.playlistChangeOrder(playlistId, { file_id: formFiles[from].id, position: newPosition }) API.playlists.changeOrder(playlistId, { file_id: formFiles[from].id, position: newPosition })
.then((res) => { .then((res) => {
if (res.status === 200) { if (res.status === 200) {
resolve(true); resolve(true);
@ -95,7 +95,7 @@ const Content = ({ form, playlistId }) => {
const changeSeconds = (seconds, index) => { const changeSeconds = (seconds, index) => {
const fileId = form.values.files[index].id; const fileId = form.values.files[index].id;
API.playlistChangeSeconds(playlistId, { file_id: fileId, seconds: seconds }) API.playlists.changeSeconds(playlistId, { file_id: fileId, seconds: seconds })
.then((res) => { .then((res) => {
if (res.status === 200) { if (res.status === 200) {
setOriginSecs(); setOriginSecs();
@ -111,7 +111,7 @@ const Content = ({ form, playlistId }) => {
}; };
const handleDelete = (index) => { const handleDelete = (index) => {
API.playlistRemoveFile(playlistId, { file_id: form.values.files[index].pfid }) API.playlists.removeFile(playlistId, { file_id: form.values.files[index].pfid })
.then((res) => { .then((res) => {
if (res.status === 200) { if (res.status === 200) {
form.removeListItem('files', index); form.removeListItem('files', index);
@ -175,6 +175,11 @@ const Content = ({ form, playlistId }) => {
</StrictModeDroppable> </StrictModeDroppable>
</DragDropContext> </DragDropContext>
<GrantAccess
role={Perm.EDIT_PLAYLIST}
item={playlist}
children={
<>
<Group position="center" mt="md"> <Group position="center" mt="md">
<Button vairant="light" onClick={toggleFileSelector}> <Button vairant="light" onClick={toggleFileSelector}>
Select File(s) Select File(s)
@ -186,6 +191,9 @@ const Content = ({ form, playlistId }) => {
handleClose={toggleFileSelector} handleClose={toggleFileSelector}
handleSubmit={(files) => handleAddFiles(files)} handleSubmit={(files) => handleAddFiles(files)}
/> />
</>
}
/>
</Box> </Box>
); );
}; };

16
src/tools/grant-access.jsx
View File

@ -29,6 +29,20 @@ export const checkPerm = (perm, user, item = {}) => {
return user.roles.length >= 1 && checkBit(user.roles[0].permissions, Perm.CREATE_USER); return user.roles.length >= 1 && checkBit(user.roles[0].permissions, Perm.CREATE_USER);
case Perm.OWN_PLAYLIST: case Perm.OWN_PLAYLIST:
return item?.owner_id === user.id; return item?.owner_id === user.id;
case Perm.VIEW_PLAYLIST:
return (
checkPerm(Perm.OWN_PLAYLIST, user, item) ||
item?.view.find(
(role) => role.user_id === user.id || user.roles.find((user_role) => user_role.id === role.id)
)
);
case Perm.EDIT_PLAYLIST:
return (
checkPerm(Perm.OWN_PLAYLIST, user, item) ||
item?.edit.find(
(role) => role.user_id === user.id || user.roles.find((user_role) => user_role.id === role.id)
)
);
default: default:
return false; return false;
} }
@ -36,7 +50,7 @@ export const checkPerm = (perm, user, item = {}) => {
const GrantAccess = ({ role, roles, children, item }) => { const GrantAccess = ({ role, roles, children, item }) => {
const { user } = useAuth(); const { user } = useAuth();
if (role && checkPerm(role, user)) { if (role && checkPerm(role, user, item)) {
return children; return children;
} else if (roles) { } else if (roles) {
let flag = false; let flag = false;