BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #19657 from KDSBrowne/bbb-shape-access

Browse Source 
Fix: Shape Access Logic for Non-Moderator Viewers
This commit is contained in:
Ramón Souza 2024-02-22 09:52:41 -03:00 committed by GitHub
commit 672c40416d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
bigbluebutton-html5/imports/ui/components/whiteboard/component.jsx
View File

@ -93,7 +93,6 @@ export default Whiteboard = React.memo(function Whiteboard(props) {
fillStyle,
fontStyle,
sizeStyle,
hasShapeAccess,
presentationAreaHeight,
presentationAreaWidth,
maxNumberOfAnnotations,
@ -162,6 +161,8 @@ export default Whiteboard = React.memo(function Whiteboard(props) {
const lastKnownHeight = React.useRef(presentationAreaHeight);
const lastKnownWidth = React.useRef(presentationAreaWidth);
const [shapesVersion, setShapesVersion] = React.useState(0);
React.useEffect(() => {
curPageIdRef.current = curPageId;
}, [curPageId]);
@ -190,6 +191,7 @@ export default Whiteboard = React.memo(function Whiteboard(props) {
React.useEffect(() => {
if (!isEqual(prevShapesRef.current, shapes)) {
prevShapesRef.current = shapes;
setShapesVersion(v => v + 1);
}
}, [shapes]);
@ -221,11 +223,9 @@ export default Whiteboard = React.memo(function Whiteboard(props) {
const prevShape = prevShapesRef.current[remoteShape.id];
if (!localShape) {
if (prevShapesRef.current[`${remoteShape.id}`].meta?.createdBy !== currentUser?.userId) {
delete remoteShape.isModerator
delete remoteShape.questionType
toAdd.push(remoteShape);
}
} else if (!isEqual(localShape, remoteShape) && prevShape) {
const diff = {
id: remoteShape.id,
@ -807,8 +807,8 @@ export default Whiteboard = React.memo(function Whiteboard(props) {
const updatedRecord = {
...record,
meta: {
...prevShapesRef.current[record?.id]?.meta,
updatedBy: currentUser?.userId,
createdBy: shapes[record?.id]?.meta?.createdBy,
},
};
persistShapeWrapper(updatedRecord, whiteboardIdRef.current, isModerator);
@ -915,10 +915,20 @@ export default Whiteboard = React.memo(function Whiteboard(props) {
editor.store.onBeforeChange = (prev, next, source) => {
if (next?.typeName === "instance_page_state") {
if (isPresenter || isModerator) return next;
// Filter selectedShapeIds based on shape owner
if (!isEqual(prev.selectedShapeIds, next.selectedShapeIds)) {
// Filter the selectedShapeIds
next.selectedShapeIds =
next.selectedShapeIds.filter(hasShapeAccess);
next.selectedShapeIds = next.selectedShapeIds.filter(shapeId => {
const shapeOwner = prevShapesRef.current[shapeId]?.meta?.createdBy;
return shapeOwner === currentUser?.userId;
});
}
if (!isEqual(prev.hoveredShapeId, next.hoveredShapeId)) {
const hoveredShapeOwner = prevShapesRef.current[next.hoveredShapeId]?.meta?.createdBy;
if (hoveredShapeOwner !== currentUser?.userId) {
next.hoveredShapeId = null;
}
}
return next;
@ -1012,7 +1022,6 @@ Whiteboard.propTypes = {
fillStyle: PropTypes.string.isRequired,
fontStyle: PropTypes.string.isRequired,
sizeStyle: PropTypes.string.isRequired,
hasShapeAccess: PropTypes.func.isRequired,
presentationAreaHeight: PropTypes.number.isRequired,
presentationAreaWidth: PropTypes.number.isRequired,
maxNumberOfAnnotations: PropTypes.number.isRequired,

30
bigbluebutton-html5/imports/ui/components/whiteboard/container.jsx
View File

@ -48,6 +48,7 @@ const WhiteboardContainer = (props) => {
} = props;
const [annotations, setAnnotations] = useState([]);
const [shapes, setShapes] = useState({});
const meeting = useMeeting((m) => ({
lockSettings: m?.lockSettings,
@ -151,18 +152,17 @@ const WhiteboardContainer = (props) => {
}
}, [annotationStreamData]);
let shapes = {};
let bgShape = [];
const pageAnnotations = annotations
.filter((annotation) => annotation.pageId === currentPresentationPage?.pageId);
shapes = formatAnnotations(
pageAnnotations,
intl,
curPageId,
currentPresentationPage,
);
React.useEffect(() => {
const updatedShapes = formatAnnotations(
annotations.filter((annotation) => annotation.pageId === currentPresentationPage?.pageId),
intl,
curPageId,
currentPresentationPage,
);
setShapes(updatedShapes);
}, [annotations, intl, curPageId, currentPresentationPage]);
const { isIphone } = deviceInfo;
@ -218,15 +218,6 @@ const WhiteboardContainer = (props) => {
typeName: "shape",
});
const hasShapeAccess = (id) => {
const owner = shapes[id]?.meta?.createdBy;
const isBackgroundShape = id?.includes(':BG-');
const hasAccess = (!isBackgroundShape
&& ((owner && owner === currentUser?.userId) || isPresenter || isModerator)) || !shapes[id];
return hasAccess;
};
return (
<Whiteboard
{...{
@ -244,7 +235,6 @@ const WhiteboardContainer = (props) => {
fillStyle,
fontStyle,
sizeStyle,
hasShapeAccess,
handleToggleFullScreen,
sidebarNavigationWidth,
layoutContextDispatch,