3 files changed, 66 insertions, 65 deletions

diff --git a/server/lib/peertube-socket.ts b/server/lib/peertube-socket.ts
index e27963e60..c91407a59 100644
--- a/server/lib/peertube-socket.ts
+++ b/server/lib/peertube-socket.ts
@@ -22,7 +22,7 @@ class PeerTubeSocket {
     io.of('/user-notifications')
       .use(authenticateSocket)
       .on('connection', socket => {
-        const userId = socket.handshake.query.user.id
+        const userId = socket.handshake.auth.user.id
 
         logger.debug('User %d connected on the notification system.', userId)
 
diff --git a/server/middlewares/oauth.ts b/server/middlewares/oauth.ts
index 47799153a..280595acc 100644
--- a/server/middlewares/oauth.ts
+++ b/server/middlewares/oauth.ts
@@ -32,6 +32,7 @@ function authenticateSocket (socket: Socket, next: (err?: any) => void) {
   logger.debug('Checking socket access token %s.', accessToken)
 
   if (!accessToken) return next(new Error('No access token provided'))
+  if (typeof accessToken !== 'string') return next(new Error('Access token is invalid'))
 
   getAccessToken(accessToken)
     .then(tokenDB => {
@@ -41,7 +42,7 @@ function authenticateSocket (socket: Socket, next: (err?: any) => void) {
         return next(new Error('Invalid access token.'))
       }
 
-      socket.handshake.query['user'] = tokenDB.User
+      socket.handshake.auth.user = tokenDB.User
 
       return next()
     })
diff --git a/server/typings/express/index.d.ts b/server/typings/express/index.d.ts
index a83619a0e..66acfb3f5 100644
--- a/server/typings/express/index.d.ts
+++ b/server/typings/express/index.d.ts
@@ -8,9 +8,9 @@ import {
   MVideoChangeOwnershipFull,
   MVideoFile,
   MVideoImmutable,
+  MVideoLive,
   MVideoPlaylistFull,
-  MVideoPlaylistFullSummary,
-  MVideoLive
+  MVideoPlaylistFullSummary
 } from '@server/types/models'
 import { MOAuthTokenUser } from '@server/types/models/oauth/oauth-token'
 import { MPlugin, MServer, MServerBlocklist } from '@server/types/models/server'
@@ -43,97 +43,97 @@ declare module 'express' {
   export interface Request {
     query: any
   }
-
   interface Response {
+    locals: PeerTubeLocals
+  }
+}
 
-    locals: {
-      bypassLogin?: {
-        bypass: boolean
-        pluginName: string
-        authName?: string
-        user: {
-          username: string
-          email: string
-          displayName: string
-          role: UserRole
-        }
-      }
+interface PeerTubeLocals {
+  bypassLogin?: {
+    bypass: boolean
+    pluginName: string
+    authName?: string
+    user: {
+      username: string
+      email: string
+      displayName: string
+      role: UserRole
+    }
+  }
 
-      refreshTokenAuthName?: string
+  refreshTokenAuthName?: string
 
-      explicitLogout: boolean
+  explicitLogout?: boolean
 
-      videoAll?: MVideoFullLight
-      onlyImmutableVideo?: MVideoImmutable
-      onlyVideo?: MVideoThumbnail
-      onlyVideoWithRights?: MVideoWithRights
-      videoId?: MVideoIdThumbnail
+  videoAll?: MVideoFullLight
+  onlyImmutableVideo?: MVideoImmutable
+  onlyVideo?: MVideoThumbnail
+  onlyVideoWithRights?: MVideoWithRights
+  videoId?: MVideoIdThumbnail
 
-      videoLive?: MVideoLive
+  videoLive?: MVideoLive
 
-      videoShare?: MVideoShareActor
+  videoShare?: MVideoShareActor
 
-      videoFile?: MVideoFile
+  videoFile?: MVideoFile
 
-      videoImport?: MVideoImportDefault
+  videoImport?: MVideoImportDefault
 
-      videoBlacklist?: MVideoBlacklist
+  videoBlacklist?: MVideoBlacklist
 
-      videoCaption?: MVideoCaptionVideo
+  videoCaption?: MVideoCaptionVideo
 
-      abuse?: MAbuseReporter
-      abuseMessage?: MAbuseMessage
+  abuse?: MAbuseReporter
+  abuseMessage?: MAbuseMessage
 
-      videoStreamingPlaylist?: MStreamingPlaylist
+  videoStreamingPlaylist?: MStreamingPlaylist
 
-      videoChannel?: MChannelAccountDefault
+  videoChannel?: MChannelAccountDefault
 
-      videoPlaylistFull?: MVideoPlaylistFull
-      videoPlaylistSummary?: MVideoPlaylistFullSummary
+  videoPlaylistFull?: MVideoPlaylistFull
+  videoPlaylistSummary?: MVideoPlaylistFullSummary
 
-      videoPlaylistElement?: MVideoPlaylistElement
-      videoPlaylistElementAP?: MVideoPlaylistElementVideoUrlPlaylistPrivacy
+  videoPlaylistElement?: MVideoPlaylistElement
+  videoPlaylistElementAP?: MVideoPlaylistElementVideoUrlPlaylistPrivacy
 
-      accountVideoRate?: MAccountVideoRateAccountVideo
+  accountVideoRate?: MAccountVideoRateAccountVideo
 
-      videoCommentFull?: MCommentOwnerVideoReply
-      videoCommentThread?: MComment
+  videoCommentFull?: MCommentOwnerVideoReply
+  videoCommentThread?: MComment
 
-      follow?: MActorFollowActorsDefault
-      subscription?: MActorFollowActorsDefaultSubscription
+  follow?: MActorFollowActorsDefault
+  subscription?: MActorFollowActorsDefaultSubscription
 
-      nextOwner?: MAccountDefault
-      videoChangeOwnership?: MVideoChangeOwnershipFull
+  nextOwner?: MAccountDefault
+  videoChangeOwnership?: MVideoChangeOwnershipFull
 
-      account?: MAccountDefault
+  account?: MAccountDefault
 
-      actorUrl?: MActorUrl
-      actorFull?: MActorFull
+  actorUrl?: MActorUrl
+  actorFull?: MActorFull
 
-      user?: MUserDefault
+  user?: MUserDefault
 
-      server?: MServer
+  server?: MServer
 
-      videoRedundancy?: MVideoRedundancyVideo
+  videoRedundancy?: MVideoRedundancyVideo
 
-      accountBlock?: MAccountBlocklist
-      serverBlock?: MServerBlocklist
+  accountBlock?: MAccountBlocklist
+  serverBlock?: MServerBlocklist
 
-      oauth?: {
-        token: MOAuthTokenUser
-      }
+  oauth?: {
+    token: MOAuthTokenUser
+  }
 
-      signature?: {
-        actor: MActorAccountChannelId
-      }
+  signature?: {
+    actor: MActorAccountChannelId
+  }
 
-      authenticated?: boolean
+  authenticated?: boolean
 
-      registeredPlugin?: RegisteredPlugin
+  registeredPlugin?: RegisteredPlugin
 
-      externalAuth?: RegisterServerAuthExternalOptions
+  externalAuth?: RegisterServerAuthExternalOptions
 
-      plugin?: MPlugin
-    }
-  }
+  plugin?: MPlugin
 }