diff --git a/src/pages/assignments/[id].tsx b/src/pages/assignments/[id].tsx
index e95d6cd6..9cafc5ba 100644
--- a/src/pages/assignments/[id].tsx
+++ b/src/pages/assignments/[id].tsx
@@ -20,12 +20,12 @@ import {BsBook, BsChevronLeft, BsClipboard, BsHeadphones, BsMegaphone, BsPen} fr
import {toast} from "react-toastify";
import {futureAssignmentFilter} from "@/utils/assignments";
import {withIronSessionSsr} from "iron-session/next";
-import {checkAccess} from "@/utils/permissions";
+import {checkAccess, doesEntityAllow} from "@/utils/permissions";
import {mapBy, redirect, serialize} from "@/utils";
import {getAssignment} from "@/utils/assignments.be";
-import {getEntitiesUsers, getUsers} from "@/utils/users.be";
-import {getEntitiesWithRoles} from "@/utils/entities.be";
-import {getGroups, getGroupsByEntities} from "@/utils/groups.be";
+import {getEntitiesUsers, getEntityUsers, getUsers} from "@/utils/users.be";
+import {getEntitiesWithRoles, getEntityWithRoles} from "@/utils/entities.be";
+import {getGroups, getGroupsByEntities, getGroupsByEntity} from "@/utils/groups.be";
import {sessionOptions} from "@/lib/session";
import {EntityWithRoles} from "@/interfaces/entity";
import Head from "next/head";
@@ -33,6 +33,7 @@ import Layout from "@/components/High/Layout";
import Separator from "@/components/Low/Separator";
import Link from "next/link";
import { requestUser } from "@/utils/api";
+import { useEntityPermission } from "@/hooks/useEntityPermissions";
export const getServerSideProps = withIronSessionSsr(async ({req, res, params}) => {
const user = await requestUser(req, res)
@@ -44,33 +45,31 @@ export const getServerSideProps = withIronSessionSsr(async ({req, res, params})
res.setHeader("Cache-Control", "public, s-maxage=10, stale-while-revalidate=59");
const {id} = params as {id: string};
- const entityIDS = mapBy(user.entities, "id") || [];
const assignment = await getAssignment(id);
- if (!assignment)
- return {
- redirect: {
- destination: "/assignments",
- permanent: false,
- },
- };
+ if (!assignment) return redirect("/assignments")
- const users = await (checkAccess(user, ["developer", "admin"]) ? getUsers() : getEntitiesUsers(entityIDS));
- const entities = await (checkAccess(user, ["developer", "admin"]) ? getEntitiesWithRoles() : getEntitiesWithRoles(entityIDS));
- const groups = await (checkAccess(user, ["developer", "admin"]) ? getGroups() : getGroupsByEntities(entityIDS));
+ const entity = await getEntityWithRoles(assignment.entity || "")
+ if (!entity) return redirect("/assignments")
- return {props: serialize({user, users, entities, assignment, groups})};
+ if (!doesEntityAllow(user, entity, 'view_assignments')) return redirect("/assignments")
+
+ const users = await (checkAccess(user, ["developer", "admin"]) ? getUsers() : getEntityUsers(entity.id));
+
+ return {props: serialize({user, users, entity, assignment})};
}, sessionOptions);
interface Props {
user: User;
users: User[];
assignment: Assignment;
- groups: Group[];
- entities: EntityWithRoles[];
+ entity: EntityWithRoles
}
-export default function AssignmentView({user, users, entities, groups, assignment}: Props) {
+export default function AssignmentView({user, users, entity, assignment}: Props) {
+ const canDeleteAssignment = useEntityPermission(user, entity, 'delete_assignment')
+ const canStartAssignment = useEntityPermission(user, entity, 'start_assignment')
+
const setExams = useExamStore((state) => state.setExams);
const setShowSolutions = useExamStore((state) => state.setShowSolutions);
const setUserSolutions = useExamStore((state) => state.setUserSolutions);
@@ -79,6 +78,7 @@ export default function AssignmentView({user, users, entities, groups, assignmen
const router = useRouter();
const deleteAssignment = async () => {
+ if (!canDeleteAssignment) return
if (!confirm("Are you sure you want to delete this assignment?")) return;
axios
@@ -89,18 +89,19 @@ export default function AssignmentView({user, users, entities, groups, assignmen
};
const startAssignment = () => {
- if (assignment) {
- axios
- .post(`/api/assignments/${assignment.id}/start`)
- .then(() => {
- toast.success(`The assignment "${assignment.name}" has been started successfully!`);
- router.replace(router.asPath);
- })
- .catch((e) => {
- console.log(e);
- toast.error("Something went wrong, please try again later!");
- });
- }
+ if (!canStartAssignment) return
+ if (!confirm("Are you sure you want to start this assignment?")) return;
+
+ axios
+ .post(`/api/assignments/${assignment.id}/start`)
+ .then(() => {
+ toast.success(`The assignment "${assignment.name}" has been started successfully!`);
+ router.replace(router.asPath);
+ })
+ .catch((e) => {
+ console.log(e);
+ toast.error("Something went wrong, please try again later!");
+ });
};
const formatTimestamp = (timestamp: string) => {
diff --git a/src/pages/assignments/creator/[id].tsx b/src/pages/assignments/creator/[id].tsx
index 32f60d8b..2bf0b20d 100644
--- a/src/pages/assignments/creator/[id].tsx
+++ b/src/pages/assignments/creator/[id].tsx
@@ -19,7 +19,7 @@ import { requestUser } from "@/utils/api";
import {getAssignment} from "@/utils/assignments.be";
import {getEntitiesWithRoles} from "@/utils/entities.be";
import {getGroups, getGroupsByEntities} from "@/utils/groups.be";
-import {checkAccess} from "@/utils/permissions";
+import {checkAccess, doesEntityAllow, findAllowedEntities} from "@/utils/permissions";
import {calculateAverageLevel} from "@/utils/score";
import {getEntitiesUsers, getUsers} from "@/utils/users.be";
import axios from "axios";
@@ -40,42 +40,26 @@ export const getServerSideProps = withIronSessionSsr(async ({req, res, params})
const user = await requestUser(req, res)
if (!user) return redirect("/login")
- if (!user) {
- return {
- redirect: {
- destination: "/login",
- permanent: false,
- },
- };
- }
-
- if (!checkAccess(user, ["admin", "developer", "corporate", "teacher", "mastercorporate"]))
- return {
- redirect: {
- destination: "/dashboard",
- permanent: false,
- },
- };
-
res.setHeader("Cache-Control", "public, s-maxage=10, stale-while-revalidate=59");
const {id} = params as {id: string};
const entityIDS = mapBy(user.entities, "id") || [];
const assignment = await getAssignment(id);
- if (!assignment)
- return {
- redirect: {
- destination: "/assignments",
- permanent: false,
- },
- };
+ if (!assignment) return redirect("/assignments")
- const users = await (checkAccess(user, ["developer", "admin"]) ? getUsers() : getEntitiesUsers(entityIDS));
const entities = await (checkAccess(user, ["developer", "admin"]) ? getEntitiesWithRoles() : getEntitiesWithRoles(entityIDS));
- const groups = await (checkAccess(user, ["developer", "admin"]) ? getGroups() : getGroupsByEntities(entityIDS));
+ const entity = entities.find((e) => assignment.entity === assignment.entity)
- return {props: serialize({user, users, entities, assignment, groups})};
+ if (!entity) return redirect("/assignments")
+ if (!doesEntityAllow(user, entity, 'edit_assignment')) return redirect("/assignments")
+
+ const allowedEntities = findAllowedEntities(user, entities, 'edit_assignment')
+
+ const users = await (checkAccess(user, ["developer", "admin"]) ? getUsers() : getEntitiesUsers(mapBy(allowedEntities, 'id')));
+ const groups = await (checkAccess(user, ["developer", "admin"]) ? getGroups() : getGroupsByEntities(mapBy(allowedEntities, 'id')));
+
+ return {props: serialize({user, users, entities: allowedEntities, assignment, groups})};
}, sessionOptions);
interface Props {
diff --git a/src/pages/assignments/creator/index.tsx b/src/pages/assignments/creator/index.tsx
index a9eace89..edf0a3fc 100644
--- a/src/pages/assignments/creator/index.tsx
+++ b/src/pages/assignments/creator/index.tsx
@@ -18,7 +18,7 @@ import {mapBy, redirect, serialize} from "@/utils";
import { requestUser } from "@/utils/api";
import {getEntitiesWithRoles} from "@/utils/entities.be";
import {getGroups, getGroupsByEntities} from "@/utils/groups.be";
-import {checkAccess} from "@/utils/permissions";
+import {checkAccess, findAllowedEntities} from "@/utils/permissions";
import {calculateAverageLevel} from "@/utils/score";
import {getEntitiesUsers, getUsers} from "@/utils/users.be";
import axios from "axios";
@@ -39,14 +39,14 @@ export const getServerSideProps = withIronSessionSsr(async ({req, res}) => {
const user = await requestUser(req, res)
if (!user) return redirect("/login")
- if (!checkAccess(user, ["admin", "developer", "corporate", "teacher", "mastercorporate"]))
- return redirect("/")
-
const entityIDS = mapBy(user.entities, "id") || [];
-
- const users = await (checkAccess(user, ["developer", "admin"]) ? getUsers() : getEntitiesUsers(entityIDS));
const entities = await (checkAccess(user, ["developer", "admin"]) ? getEntitiesWithRoles() : getEntitiesWithRoles(entityIDS));
- const groups = await (checkAccess(user, ["developer", "admin"]) ? getGroups() : getGroupsByEntities(entityIDS));
+
+ const allowedEntities = findAllowedEntities(user, entities, 'create_assignment')
+ if (allowedEntities.length === 0) return redirect("/assignments")
+
+ const users = await (checkAccess(user, ["developer", "admin"]) ? getUsers() : getEntitiesUsers(mapBy(allowedEntities, 'id')));
+ const groups = await (checkAccess(user, ["developer", "admin"]) ? getGroups() : getGroupsByEntities(mapBy(allowedEntities, 'id')));
return {props: serialize({user, users, entities, groups})};
}, sessionOptions);
@@ -535,6 +535,7 @@ export default function AssignmentsPage({user, users, groups, entities}: Props)
!name ||
!startDate ||
!endDate ||
+ !entity ||
assignees.length === 0 ||
(!useRandomExams && examIDs.length < selectedModules.length)
}
diff --git a/src/pages/assignments/index.tsx b/src/pages/assignments/index.tsx
index 962d5535..6a33c1ca 100644
--- a/src/pages/assignments/index.tsx
+++ b/src/pages/assignments/index.tsx
@@ -2,8 +2,10 @@ import Layout from "@/components/High/Layout";
import Separator from "@/components/Low/Separator";
import AssignmentCard from "@/dashboards/AssignmentCard";
import AssignmentView from "@/dashboards/AssignmentView";
+import { useAllowedEntities } from "@/hooks/useEntityPermissions";
import {useListSearch} from "@/hooks/useListSearch";
import usePagination from "@/hooks/usePagination";
+import { EntityWithRoles } from "@/interfaces/entity";
import {Assignment} from "@/interfaces/results";
import {CorporateUser, Group, User} from "@/interfaces/user";
import {sessionOptions} from "@/lib/session";
@@ -20,7 +22,7 @@ import {
import {getAssignments, getEntitiesAssignments} from "@/utils/assignments.be";
import {getEntitiesWithRoles} from "@/utils/entities.be";
import {getGroups, getGroupsByEntities} from "@/utils/groups.be";
-import {checkAccess} from "@/utils/permissions";
+import {checkAccess, findAllowedEntities} from "@/utils/permissions";
import {getEntitiesUsers, getUsers} from "@/utils/users.be";
import {withIronSessionSsr} from "iron-session/next";
import {groupBy} from "lodash";
@@ -38,11 +40,18 @@ export const getServerSideProps = withIronSessionSsr(async ({req, res}) => {
return redirect("/")
const entityIDS = mapBy(user.entities, "id") || [];
-
- const users = await (checkAccess(user, ["developer", "admin"]) ? getUsers() : getEntitiesUsers(entityIDS));
const entities = await (checkAccess(user, ["developer", "admin"]) ? getEntitiesWithRoles() : getEntitiesWithRoles(entityIDS));
- const assignments = await (checkAccess(user, ["developer", "admin"]) ? getAssignments() : getEntitiesAssignments(entityIDS));
- const groups = await (checkAccess(user, ["developer", "admin"]) ? getGroups() : getGroupsByEntities(entityIDS));
+
+ const allowedEntities = findAllowedEntities(user, entities, "view_assignments")
+
+ const users =
+ await (checkAccess(user, ["developer", "admin"]) ? getUsers() : getEntitiesUsers(mapBy(allowedEntities, 'id')));
+
+ const assignments =
+ await (checkAccess(user, ["developer", "admin"]) ? getAssignments() : getEntitiesAssignments(mapBy(allowedEntities, 'id')));
+
+ const groups =
+ await (checkAccess(user, ["developer", "admin"]) ? getGroups() : getGroupsByEntities(mapBy(allowedEntities, 'id')));
return {props: serialize({user, users, entities, assignments, groups})};
}, sessionOptions);
@@ -52,12 +61,16 @@ const SEARCH_FIELDS = [["name"]];
interface Props {
assignments: Assignment[];
corporateAssignments?: ({corporate?: CorporateUser} & Assignment)[];
+ entities: EntityWithRoles[]
groups: Group[];
user: User;
users: User[];
}
-export default function AssignmentsPage({assignments, corporateAssignments, user, users, groups}: Props) {
+export default function AssignmentsPage({assignments, corporateAssignments, entities, user, users, groups}: Props) {
+ const entitiesAllowCreate = useAllowedEntities(user, entities, 'create_assignment')
+ const entitiesAllowEdit = useAllowedEntities(user, entities, 'edit_assignment')
+
const activeAssignments = useMemo(() => assignments.filter(activeAssignmentFilter), [assignments]);
const plannedAssignments = useMemo(() => assignments.filter(futureAssignmentFilter), [assignments]);
const pastAssignments = useMemo(() => assignments.filter(pastAssignmentFilter), [assignments]);
@@ -139,13 +152,22 @@ export default function AssignmentsPage({assignments, corporateAssignments, user
0 ? "/assignments/creator" : ""}
className="w-[250px] h-[200px] flex flex-col gap-2 items-center justify-center bg-white hover:bg-mti-purple-ultralight text-mti-purple-light hover:text-mti-purple-dark border border-mti-gray-platinum hover:drop-shadow p-4 cursor-pointer rounded-xl transition ease-in-out duration-300">
New Assignment
{plannedItems.map((a) => (
-
router.push(`/assignments/creator/${a.id}`)} key={a.id} />
+ 0
+ ? () => router.push(`/assignments/creator/${a.id}`)
+ : undefined
+ }
+ key={a.id}
+ />
))}
diff --git a/src/pages/classrooms/[id].tsx b/src/pages/classrooms/[id].tsx
index a2c3d8ec..774c411d 100644
--- a/src/pages/classrooms/[id].tsx
+++ b/src/pages/classrooms/[id].tsx
@@ -1,18 +1,21 @@
/* eslint-disable @next/next/no-img-element */
import Layout from "@/components/High/Layout";
import Tooltip from "@/components/Low/Tooltip";
+import { useEntityPermission } from "@/hooks/useEntityPermissions";
import {useListSearch} from "@/hooks/useListSearch";
import usePagination from "@/hooks/usePagination";
+import { EntityWithRoles } from "@/interfaces/entity";
import {GroupWithUsers, User} from "@/interfaces/user";
import {sessionOptions} from "@/lib/session";
import {USER_TYPE_LABELS} from "@/resources/user";
-import { redirect } from "@/utils";
+import { mapBy, redirect, serialize } from "@/utils";
import { requestUser } from "@/utils/api";
+import { getEntitiesWithRoles, getEntityWithRoles } from "@/utils/entities.be";
import {convertToUsers, getGroup} from "@/utils/groups.be";
import {shouldRedirectHome} from "@/utils/navigation.disabled";
-import {checkAccess, getTypesOfUser} from "@/utils/permissions";
+import {checkAccess, doesEntityAllow, findAllowedEntities, getTypesOfUser} from "@/utils/permissions";
import {getUserName} from "@/utils/users";
-import {getLinkedUsers, getSpecificUsers} from "@/utils/users.be";
+import {getEntityUsers, getLinkedUsers, getSpecificUsers} from "@/utils/users.be";
import axios from "axios";
import clsx from "clsx";
import {withIronSessionSsr} from "iron-session/next";
@@ -34,21 +37,20 @@ export const getServerSideProps = withIronSessionSsr(async ({req, res, params})
const {id} = params as {id: string};
const group = await getGroup(id);
- if (!group || (checkAccess(user, getTypesOfUser(["admin", "developer"])) && group.admin !== user.id && !group.participants.includes(user.id))) {
- return {
- redirect: {
- destination: "/groups",
- permanent: false,
- },
- };
- }
+ if (!group || !group.entity) return redirect("/classrooms")
- const linkedUsers = await getLinkedUsers(user.id, user.type);
+ const entity = await getEntityWithRoles(group.entity)
+ if (!entity) return redirect("/classrooms")
+
+ const canView = doesEntityAllow(user, entity, "view_classrooms")
+ if (!canView) return redirect("/")
+
+ const linkedUsers = await getEntityUsers(entity.id)
const users = await getSpecificUsers([...group.participants, group.admin]);
const groupWithUser = convertToUsers(group, users);
return {
- props: {user, group: JSON.parse(JSON.stringify(groupWithUser)), users: JSON.parse(JSON.stringify(linkedUsers.users))},
+ props: serialize({user, group: groupWithUser, users: linkedUsers, entity}),
};
}, sessionOptions);
@@ -56,13 +58,19 @@ interface Props {
user: User;
group: GroupWithUsers;
users: User[];
+ entity: EntityWithRoles
}
-export default function Home({user, group, users}: Props) {
+export default function Home({user, group, users, entity}: Props) {
const [isAdding, setIsAdding] = useState(false);
const [isLoading, setIsLoading] = useState(false);
const [selectedUsers, setSelectedUsers] = useState([]);
+ const canAddParticipants = useEntityPermission(user, entity, "add_to_classroom")
+ const canRemoveParticipants = useEntityPermission(user, entity, "remove_from_classroom")
+ const canRenameClassroom = useEntityPermission(user, entity, "rename_classrooms")
+ const canDeleteClassroom = useEntityPermission(user, entity, "delete_classroom")
+
const nonParticipantUsers = useMemo(
() => users.filter((x) => ![...group.participants.map((g) => g.id), group.admin.id, user.id].includes(x.id)),
[users, group.participants, group.admin.id, user.id],
@@ -82,7 +90,7 @@ export default function Home({user, group, users}: Props) {
const removeParticipants = () => {
if (selectedUsers.length === 0) return;
- if (!allowGroupEdit) return;
+ if (!canRemoveParticipants) return;
if (!confirm(`Are you sure you want to remove ${selectedUsers.length} participant${selectedUsers.length === 1 ? "" : "s"} from this group?`))
return;
@@ -103,7 +111,7 @@ export default function Home({user, group, users}: Props) {
const addParticipants = () => {
if (selectedUsers.length === 0) return;
- if (!allowGroupEdit || !isAdding) return;
+ if (!canAddParticipants || !isAdding) return;
if (!confirm(`Are you sure you want to add ${selectedUsers.length} participant${selectedUsers.length === 1 ? "" : "s"} to this group?`))
return;
@@ -123,7 +131,7 @@ export default function Home({user, group, users}: Props) {
};
const renameGroup = () => {
- if (!allowGroupEdit) return;
+ if (!canRenameClassroom) return;
const name = prompt("Rename this group:", group.name);
if (!name) return;
@@ -143,7 +151,7 @@ export default function Home({user, group, users}: Props) {
};
const deleteGroup = () => {
- if (!allowGroupEdit) return;
+ if (!canDeleteClassroom) return;
if (!confirm("Are you sure you want to delete this group?")) return;
setIsLoading(true);
@@ -192,18 +200,18 @@ export default function Home({user, group, users}: Props) {
{getUserName(group.admin)}
- {allowGroupEdit && !isAdding && (
+ {!isAdding && (
+
+
+
+ Assignment Management
+ permissions.includes(k))}
+ onChange={() => mapBy(ASSIGNMENT_MANAGEMENT, 'key').forEach(togglePermissions)}
+ >
+ Select all
+
+
+
+
+ {ASSIGNMENT_MANAGEMENT.map(({label, key}) => (
+ togglePermissions(key)}>
+ { label }
+
+ )) }
+
+
diff --git a/src/pages/entities/index.tsx b/src/pages/entities/index.tsx
index 226b1950..96b26998 100644
--- a/src/pages/entities/index.tsx
+++ b/src/pages/entities/index.tsx
@@ -9,7 +9,7 @@ import {shouldRedirectHome} from "@/utils/navigation.disabled";
import {getUserName} from "@/utils/users";
import {convertToUsers, getGroupsForUser} from "@/utils/groups.be";
import {countEntityUsers, getEntityUsers, getSpecificUsers} from "@/utils/users.be";
-import {checkAccess, getTypesOfUser} from "@/utils/permissions";
+import {checkAccess, findAllowedEntities, getTypesOfUser} from "@/utils/permissions";
import Link from "next/link";
import {uniq} from "lodash";
import {BsPlus} from "react-icons/bs";
@@ -18,7 +18,7 @@ import {getEntitiesWithRoles} from "@/utils/entities.be";
import {EntityWithRoles} from "@/interfaces/entity";
import Separator from "@/components/Low/Separator";
import { requestUser } from "@/utils/api";
-import { redirect } from "@/utils";
+import { mapBy, redirect, serialize } from "@/utils";
type EntitiesWithCount = {entity: EntityWithRoles; users: User[]; count: number};
@@ -28,16 +28,16 @@ export const getServerSideProps = withIronSessionSsr(async ({req, res}) => {
if (shouldRedirectHome(user)) return redirect("/")
- const entities = await getEntitiesWithRoles(
- checkAccess(user, getTypesOfUser(["admin", "developer"])) ? user.entities.map((x) => x.id) : undefined,
- );
+ const entityIDs = mapBy(user.entities, 'id')
+ const entities = await getEntitiesWithRoles(entityIDs);
+ const allowedEntities = findAllowedEntities(user, entities, 'view_entities')
const entitiesWithCount = await Promise.all(
- entities.map(async (e) => ({entity: e, count: await countEntityUsers(e.id), users: await getEntityUsers(e.id, 5)})),
+ allowedEntities.map(async (e) => ({entity: e, count: await countEntityUsers(e.id), users: await getEntityUsers(e.id, 5)})),
);
return {
- props: {user, entities: JSON.parse(JSON.stringify(entitiesWithCount))},
+ props: serialize({user, entities: entitiesWithCount}),
};
}, sessionOptions);
diff --git a/src/resources/entityPermissions.ts b/src/resources/entityPermissions.ts
index 966d0962..d785aacb 100644
--- a/src/resources/entityPermissions.ts
+++ b/src/resources/entityPermissions.ts
@@ -36,4 +36,10 @@ export type RolePermission =
"rename_entity_role" |
"edit_role_permissions" |
"assign_to_role" |
- "delete_entity_role";
+ "delete_entity_role" |
+ "view_assignments" |
+ "create_assignment" |
+ "edit_assignment" |
+ "delete_assignment" |
+ "start_assignment" |
+ "archive_assignment";
diff --git a/src/utils/entities.be.ts b/src/utils/entities.be.ts
index 5f846c59..f6162119 100644
--- a/src/utils/entities.be.ts
+++ b/src/utils/entities.be.ts
@@ -1,9 +1,17 @@
import {Entity, EntityWithRoles, Role} from "@/interfaces/entity";
import client from "@/lib/mongodb";
+import { RolePermission } from "@/resources/entityPermissions";
import { v4 } from "uuid";
import {getRolesByEntities, getRolesByEntity} from "./roles.be";
const db = client.db(process.env.MONGODB_DB);
+const DEFAULT_PERMISSIONS: RolePermission[] = [
+ "view_students",
+ "view_teachers",
+ "view_assignments",
+ "view_classrooms",
+ "view_entity_roles"
+]
export const getEntityWithRoles = async (id: string): Promise => {
const entity = await getEntity(id);
@@ -40,7 +48,7 @@ export const createEntity = async (entity: Entity) => {
await db.collection("roles").insertOne({
id: v4(),
label: "Default",
- permissions: [],
+ permissions: DEFAULT_PERMISSIONS,
entityID: entity.id
})
}