fix(joinGameHandler): Allow teachers and admins to join any game console

packages/client/src/modules/play/GameConsole/GameConsoleView.tsx

@@ -15,6 +15,7 @@ import { useTranslation } from "../../translations/useTranslation";
 
 export { GameConsoleView };
 
+// TODO: protect page using user role.
 function GameConsoleView() {
   const [selectedScreen, setSelectedScreen] = useState<string>("Teams");
   return (

packages/client/src/modules/play/context/playContext.tsx

@@ -418,6 +418,10 @@ function useGameSocket({
       setIsInitialised(true);
     });
 
+    newSocket.on("game:leave", () => {
+      navigate("/play/my-games");
+    });
+
     newSocket.on("game:update", ({ update }: { update: Partial<IGame> }) => {
       setGame((previous) => {
         if (previous === null) {

packages/server/src/modules/websocket/eventHandlers/joinGameHandler.ts

@@ -10,8 +10,12 @@ import {
   gameServices,
   playerServices,
   productionActionServices,
+  roleServices,
   teamServices,
 } from "../services";
+import { BusinessError } from "../../utils/businessError";
+import { Game } from "../../games/types";
+import { User } from "../../users/types";
 
 export { handleJoinGame };
 
@@ -29,10 +33,8 @@ function handleJoinGame(io: Server, socket: Socket) {
       socket.data.gameId = gameId;
       socket.data.user = user;
 
-      const isPlayer = game?.teacherId !== user.id;
-
       let gameInitData: GameInitEmitted;
-      if (isPlayer) {
+      if (await hasPlayerAccess(user, game)) {
         const player = await playerServices.findOne(gameId, user.id, {
           include: {
             user: true,
@@ -82,7 +84,7 @@ function handleJoinGame(io: Server, socket: Socket) {
           players: [player],
           teams: [team],
         };
-      } else {
+      } else if (await hasTeacherAccess(user, game)) {
         const [players, teams, consumptionActions, productionActions] =
           await Promise.all([
             playerServices.findMany(gameId, {
@@ -116,9 +118,37 @@ function handleJoinGame(io: Server, socket: Socket) {
           players,
           teams,
         };
+      } else {
+        socket.emit("game:leave");
+        throw new BusinessError(
+          `User ${user.id} is not authorized to join game ${game.id}`
+        );
       }
 
       socket.emit("game:init", gameInitData);
     })
   );
 }
+
+async function hasTeacherAccess(user: User, game: Game) {
+  if (game.teacherId === user.id) {
+    return true;
+  }
+
+  // TODO: protect game access with a list of allowed teachers?
+  const userRole = await roleServices.findOne(user.roleId);
+  if (["admin", "teacher"].includes(userRole?.name || "")) {
+    return true;
+  }
+
+  return false;
+}
+
+async function hasPlayerAccess(user: User, game: Game) {
+  const player = await playerServices.findOne(game.id, user.id);
+  if (player) {
+    return true;
+  }
+
+  return false;
+}

packages/server/src/modules/websocket/services/index.ts

@@ -5,5 +5,6 @@ export * from "./playerActionServices";
 export * from "./playerServices";
 export * from "./productionActionServices";
 export * from "./profileServices";
+export * from "./roleServices";
 export * from "./teamActionServices";
 export * from "./teamServices";

packages/server/src/modules/websocket/services/roleServices.ts

@@ -0,0 +1,16 @@
+import { Role } from "@prisma/client";
+import { database } from "../../../database";
+
+const model = database.role;
+
+export const roleServices = {
+  findOne,
+};
+
+async function findOne(id: number): Promise<Role | null> {
+  return model.findFirst({
+    where: {
+      id,
+    },
+  });
+}

packages/server/src/modules/websocket/types.ts

@@ -27,6 +27,7 @@ type ListenEvents = any;
 
 type EmitEvents = {
   "game:init": (args: GameInitEmitted) => void;
+  "game:leave": () => void;
   "game:update": (args: { update: Partial<Game> }) => void;
   "player:update": (args: { updates: Partial<PlayerEmitted>[] }) => void;
   "player-actions:update": (args: {