Merge pull request #632 from allgood/websocket-auth

Author: canove

Diff for: backend/src/libs/socket.ts

@@ -1,7 +1,9 @@
 import { Server as SocketIO } from "socket.io";
 import { Server } from "http";
+import { verify } from "jsonwebtoken";
 import AppError from "../errors/AppError";
 import { logger } from "../utils/logger";
+import authConfig from "../config/auth";
 
 let io: SocketIO;
 
@@ -13,6 +15,17 @@ export const initIO = (httpServer: Server): SocketIO => {
   });
 
   io.on("connection", socket => {
+    const { token } = socket.handshake.query;
+    let tokenData = null;
+    try {
+      tokenData = verify(token, authConfig.secret);
+      logger.debug(JSON.stringify(tokenData), "io-onConnection: tokenData");
+    } catch (error) {
+      logger.error(JSON.stringify(error), "Error decoding token");
+      socket.disconnect();
+      return io;
+    }
+
     logger.info("Client Connected");
     socket.on("joinChatBox", (ticketId: string) => {
       logger.info("A client joined a ticket channel");
@@ -32,6 +45,8 @@ export const initIO = (httpServer: Server): SocketIO => {
     socket.on("disconnect", () => {
       logger.info("Client disconnected");
     });
+
+    return socket;
   });
   return io;
 };

Diff for: frontend/src/services/socket-io.js

@@ -2,7 +2,13 @@ import openSocket from "socket.io-client";
 import { getBackendUrl } from "../config";
 
 function connectToSocket() {
-    return openSocket(getBackendUrl());
+    const token = localStorage.getItem("token");
+    return openSocket(getBackendUrl(), {
+      transports: ["websocket", "polling", "flashsocket"],
+      query: {
+        token: JSON.parse(token),
+      },
+    });
 }
 
 export default connectToSocket;