Login: Correct auth for socketio

stephendade · Jan 6, 2025 · 8219b50 · 8219b50
1 parent 539a52d
commit 8219b50
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/server/index.js b/server/index.js
@@ -754,7 +754,16 @@ app.post('/api/removeudpoutput', authenticateToken, [check('removeoutputIP').isI
   res.send(JSON.stringify({ UDPoutputs: newOutput }))
 })
 
-io.on('connection', authenticateToken, function () {
+io.engine.use((req, res, next) => {
+  const isHandshake = req._query.sid === undefined
+  if (isHandshake) {
+    authenticateToken(req, res, next)
+  } else {
+    next()
+  }
+})
+
+io.on('connection', function () {
   // only set interval if not already set
   if (FCStatusLoop !== null) {
     return

diff --git a/src/basePage.js b/src/basePage.js
@@ -58,7 +58,11 @@ class basePage extends Component {
 
 
     if (this.state.usedSocketIO) {
-      this.socket = io();
+      this.socket = io({
+        extraHeaders: {
+          authorization: `Bearer ${this.state.token}`
+        }
+      })
 
       // Socket.io client
       this.socket.on('disconnect', function () {