3 files changed, 11 insertions, 14 deletions

diff --git a/server/lib/peertube-socket.ts b/server/lib/peertube-socket.ts
index c4df399ca..5fc5bc20b 100644
--- a/server/lib/peertube-socket.ts
+++ b/server/lib/peertube-socket.ts
@@ -1,4 +1,3 @@
-import { Socket } from 'dgram'
 import { Server } from 'http'
 import * as SocketIO from 'socket.io'
 import { MVideo } from '@server/types/models'
@@ -18,7 +17,7 @@ class PeerTubeSocket {
   private constructor () {}
 
   init (server: Server) {
-    const io = SocketIO(server)
+    const io = new SocketIO.Server(server)
 
     io.of('/user-notifications')
       .use(authenticateSocket)
diff --git a/server/middlewares/oauth.ts b/server/middlewares/oauth.ts
index b1149174b..bd60a3639 100644
--- a/server/middlewares/oauth.ts
+++ b/server/middlewares/oauth.ts
@@ -1,8 +1,8 @@
 import * as express from 'express'
-import { logger } from '../helpers/logger'
 import { Socket } from 'socket.io'
-import { getAccessToken } from '../lib/oauth-model'
 import { oAuthServer } from '@server/lib/auth'
+import { logger } from '../helpers/logger'
+import { getAccessToken } from '../lib/oauth-model'
 
 function authenticate (req: express.Request, res: express.Response, next: express.NextFunction, authenticateInQuery = false) {
   const options = authenticateInQuery ? { allowBearerTokensInQueryString: true } : {}
@@ -24,7 +24,7 @@ function authenticate (req: express.Request, res: express.Response, next: expres
 }
 
 function authenticateSocket (socket: Socket, next: (err?: any) => void) {
-  const accessToken = socket.handshake.query.accessToken
+  const accessToken = socket.handshake.query['accessToken']
 
   logger.debug('Checking socket access token %s.', accessToken)
 
@@ -38,7 +38,7 @@ function authenticateSocket (socket: Socket, next: (err?: any) => void) {
         return next(new Error('Invalid access token.'))
       }
 
-      socket.handshake.query.user = tokenDB.User
+      socket.handshake.query['user'] = tokenDB.User
 
       return next()
     })
diff --git a/server/tests/api/check-params/user-notifications.ts b/server/tests/api/check-params/user-notifications.ts
index 4aab7eba4..6fa0502be 100644
--- a/server/tests/api/check-params/user-notifications.ts
+++ b/server/tests/api/check-params/user-notifications.ts
@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
 
 import 'mocha'
-import * as io from 'socket.io-client'
+import { io } from 'socket.io-client'
 
 import {
   cleanupTests,
@@ -235,11 +235,11 @@ describe('Test user notifications API validators', function () {
   })
 
   describe('When connecting to my notification socket', function () {
+
     it('Should fail with no token', function (next) {
       const socket = io(`http://localhost:${server.port}/user-notifications`, { reconnection: false })
 
-      socket.on('error', function () {
-        socket.removeListener('error', this)
+      socket.once('connect_error', function () {
         socket.disconnect()
         next()
       })
@@ -256,8 +256,7 @@ describe('Test user notifications API validators', function () {
         reconnection: false
       })
 
-      socket.on('error', function () {
-        socket.removeListener('error', this)
+      socket.once('connect_error', function () {
         socket.disconnect()
         next()
       })
@@ -278,10 +277,9 @@ describe('Test user notifications API validators', function () {
         next(new Error('Error in connection: ' + err))
       }
 
-      socket.on('error', errorListener)
+      socket.on('connect_error', errorListener)
 
-      socket.on('connect', async () => {
-        socket.removeListener('error', errorListener)
+      socket.once('connect', async () => {
         socket.disconnect()
 
         await wait(500)