Admin can see every course staff

Author: mike-fam

src/client/components/NavBar.tsx

@@ -42,7 +42,7 @@ export const NavBar: React.FunctionComponent<Props> = () => {
                         </RouterLink>
                     </Box>
                     <Spacer />
-                    {user && (user.isAdmin || user.courseStaff.length > 0) && (
+                    {user && (user.isAdmin || user.getCourseStaff.length > 0) && (
                         <Menu>
                             <MenuButton
                                 as={NavBarMenuButton}
@@ -56,7 +56,7 @@ export const NavBar: React.FunctionComponent<Props> = () => {
                                     <RouterLink to="/rooms">Rooms</RouterLink>
                                 </MenuItem>
                                 {(user.isAdmin ||
-                                    user.courseStaff.filter(
+                                    user.getCourseStaff.filter(
                                         (courseStaff) =>
                                             courseStaff.role ===
                                             StaffRole.Coordinator

src/client/components/helpers/SecretRoute.tsx

@@ -15,11 +15,11 @@ export const SecretRoute: React.FC<Props> = ({
     if (user.isAdmin) {
         return <Route {...props} />;
     }
-    if (user.courseStaff.length === 0) {
+    if (user.getCourseStaff.length === 0) {
         return <Redirect to="/permission-denied" />;
     }
     if (
-        user.courseStaff.filter((courseStaff) =>
+        user.getCourseStaff.filter((courseStaff) =>
             allowedRoles.includes(courseStaff.role)
         ).length === 0
     ) {

src/client/components/student-enrolment/DataValidator.tsx

@@ -16,15 +16,15 @@ export const DataValidator: React.FC<Props> = ({ data, setHasError }) => {
             return;
         }
         if (!data[0].includes("STUDENT_CODE")) {
-            setErrors((prev) => prev.push("Column \"STUDENT_CODE\" not found"));
+            setErrors((prev) => prev.push('Column "STUDENT_CODE" not found'));
         }
         if (!data[0].includes("ACTIVITY_GROUP_CODE")) {
             setErrors((prev) =>
-                prev.push("Column \"ACTIVITY_GROUP_CODE\" not found")
+                prev.push('Column "ACTIVITY_GROUP_CODE" not found')
             );
         }
         if (!data[0].includes("ACTIVITY_CODE")) {
-            setErrors((prev) => prev.push("Column \"ACTIVITY_CODE\" not found"));
+            setErrors((prev) => prev.push('Column "ACTIVITY_CODE" not found'));
         }
         const studentIndex = data[0].indexOf("STUDENT_CODE");
         const activityGroupIndex = data[0].indexOf("ACTIVITY_GROUP_CODE");

src/client/containers/CoursePageContainer.tsx

@@ -191,7 +191,7 @@ export const CoursePageContainer: React.FC<Props> = () => {
         if (user.isAdmin) {
             return true;
         }
-        return user.courseStaff.some(
+        return user.getCourseStaff.some(
             (courseStaff) => courseStaff.course.code === courseCode
         );
     }, [user, courseCode]);

src/client/containers/CourseSelectContainer.tsx

@@ -42,7 +42,7 @@ export const CourseSelectContainer: React.FC<Props> = ({
             );
         } else {
             setAvailCourses(
-                user.courseStaff
+                user.getCourseStaff
                     .filter((courseStaff) =>
                         allowedRoles.includes(courseStaff.role)
                     )

src/client/containers/RoomPageContainer.tsx

@@ -145,7 +145,7 @@ export const RoomPageContainer: React.FC<Props> = () => {
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [addRoomMutationData]);
     useEffect(() => {
-        user.courseStaff.forEach((courseStaff) => {
+        user.getCourseStaff.forEach((courseStaff) => {
             setCourses((prev) =>
                 prev.set(
                     courseStaff.course.id,

src/client/generated/graphql.tsx

@@ -76,6 +76,7 @@ export type User = {
     questions: Array<Question>;
     claimedQuestions: Array<Question>;
     courseMetas: Array<CourseUserMeta>;
+    getCourseStaff: Array<CourseStaff>;
 };
 
 export type Question = {
@@ -357,7 +358,7 @@ export type MeQuery = { __typename?: "Query" } & {
         User,
         "id" | "username" | "name" | "isAdmin"
     > & {
-            courseStaff: Array<
+            getCourseStaff: Array<
                 { __typename?: "CourseStaff" } & Pick<CourseStaff, "role"> & {
                         course: { __typename?: "Course" } & Pick<
                             Course,
@@ -895,7 +896,7 @@ export const MeDocument = gql`
             username
             name
             isAdmin
-            courseStaff {
+            getCourseStaff {
                 course {
                     id
                     code

src/client/graphql/me.graphql

@@ -4,7 +4,7 @@ query Me {
         username
         name
         isAdmin
-        courseStaff {
+        getCourseStaff {
             course {
                 id
                 code

src/server/resolvers/user-resolver.ts

@@ -1,11 +1,20 @@
-import { Ctx, Query, Resolver } from "type-graphql";
+import { Ctx, FieldResolver, Query, Resolver } from "type-graphql";
 import { User } from "../entities";
 import { MyContext } from "../types/context";
+import { CourseStaff } from "../entities/course-staff";
 
-@Resolver()
+@Resolver(() => User)
 export class UserResolver {
     @Query(() => User)
     async me(@Ctx() { req }: MyContext): Promise<User> {
         return req.user;
     }
+
+    @FieldResolver(() => [CourseStaff])
+    async getCourseStaff(@Ctx() { req }: MyContext): Promise<CourseStaff[]> {
+        if (req.user.isAdmin) {
+            return await CourseStaff.find();
+        }
+        return await req.user.courseStaff;
+    }
 }