Merged in release/2022-06-10 (pull request #507)

release/2022-06-10

Approved-by: Patrick Fic

client/src/pages/dms/dms.container.jsx

@@ -48,6 +48,7 @@ export const socket = SocketIO(
     : window.location.origin,
   {
     path: "/ws",
+    withCredentials: true,
     auth: async (callback) => {
       const token = auth.currentUser && (await auth.currentUser.getIdToken());
       callback({ token });

server.js

@@ -36,6 +36,7 @@ const io = new Server(server, {
       "https://www.imex.online",
     ],
     methods: ["GET", "POST"],
+    credentials: true,
   },
 });
 exports.io = io;
@@ -48,7 +49,7 @@ app.use(bodyParser.json({ limit: "50mb" }));
 app.use(bodyParser.urlencoded({ limit: "50mb", extended: true }));
 //app.use(enforce.HTTPS({ trustProtoHeader: true }));
 app.use(
-  cors()
+  cors({ credentials: true })
   // cors({
   //   credentials: true,
   //   origin: [