fix responsibility assigment not working

Author: MatiasSinisalo

src/client/components/Courses/Course/index.tsx

@@ -123,8 +123,9 @@ const Course = () => {
     height: '40px',
   }
   const handleAddResponsible = async (user: User) => {
+
     const username = user.username
-    const result = await apiClient.post(`/courses/${chatInstance.id}/responsibilities/assign`, { username: username })
+    const result = await apiClient.post(`/courses/${id}/responsibilities/assign`, { username: username })
     if (result.status === 200) {
       const responsibility = result.data
       setResponsibilities([...responsibilities, responsibility])
@@ -152,7 +153,7 @@ const Course = () => {
     )
   }
   const handleRemoveResponsibility = async (responsibility) => {
-    const result = await apiClient.post(`/courses/${chatInstance.id}/responsibilities/remove`, { username: responsibility.user?.username })
+    const result = await apiClient.post(`/courses/${id}/responsibilities/remove`, { username: responsibility.user?.username })
     if (result.status === 200) {
       const filteredResponsibilities = responsibilities.filter((r) => r.id !== responsibility.id)
       setResponsibilities(filteredResponsibilities)

src/server/routes/course.ts

@@ -142,7 +142,7 @@ courseRouter.get('/:id/enrolments', async (req: express.Request, res: express.Re
 
 //checks if user is a admin or is responsible for the course, returns forbidden error if not
 const enforceUserHasFullAccess = async (user, chatInstance) => {
-  const isResponsibleForCourse = userAssignedAsResponsible(user.id, chatInstance)
+  const isResponsibleForCourse: boolean = userAssignedAsResponsible(user.id, chatInstance)
   const hasFullAccess: boolean = user.isAdmin || isResponsibleForCourse
   if (!hasFullAccess) {
     throw ApplicationError.Forbidden('Unauthorized')
@@ -151,9 +151,9 @@ const enforceUserHasFullAccess = async (user, chatInstance) => {
 }
 
 // returns a chatInstance, throws an chat instance not found if not found
-const getChatInstance = async (id) => {
+const getChatInstance = async (courseId) => {
   const chatInstance = await ChatInstance.findOne({
-    where: { courseId: id },
+    where: { courseId: courseId },
     include: [
       {
         model: Responsibility,
@@ -302,16 +302,16 @@ const getUserByUsername = async (username: string): Promise<User | null> => {
   return user
 }
 courseRouter.post('/:id/responsibilities/assign', async (req, res) => {
-  const chatInstanceId = req.params.id
+  const courseId = req.params.id
   const body = req.body as {
     username: string
   }
   const assignedUserUsername: string = body.username
 
   const request = req as unknown as RequestWithUser
   const { user } = request
-  const chatInstance = await getChatInstance(chatInstanceId)
-  const hasPermission = await enforceUserHasFullAccess(user, chatInstanceId)
+  const chatInstance = await getChatInstance(courseId)
+  const hasPermission = await enforceUserHasFullAccess(user, chatInstance)
   if (!hasPermission) {
     res.status(401).send('Unauthorized')
     return
@@ -351,16 +351,16 @@ courseRouter.post('/:id/responsibilities/assign', async (req, res) => {
 })
 
 courseRouter.post('/:id/responsibilities/remove', async (req, res) => {
-  const chatInstanceId = req.params.id
+  const courseId = req.params.id
   const body = req.body as {
     username: string
   }
   const assignedUserUsername: string = body.username
 
   const request = req as unknown as RequestWithUser
   const { user } = request
-  const chatInstance = await getChatInstance(chatInstanceId)
-  const hasPermission = await enforceUserHasFullAccess(user, chatInstanceId)
+  const chatInstance = await getChatInstance(courseId)
+  const hasPermission = await enforceUserHasFullAccess(user, chatInstance)
   if (!hasPermission) {
     res.status(401).send('Unauthorized')
     return
@@ -382,9 +382,10 @@ courseRouter.post('/:id/responsibilities/remove', async (req, res) => {
   const responsibilityToRemove = await Responsibility.findOne({
     where: {
       userId: assignedUserId,
-      chatInstanceId: chatInstanceId,
+      chatInstanceId: chatInstance.id,
     },
   })
+
   if (!responsibilityToRemove?.createdByUserId) {
     res.status(400).send('Can only remove user that has been manually added')
     return