Merge branch 'release/2.1.0' into develop

[github/Chocobozzz/PeerTube.git] / server / middlewares / oauth.ts

diff --git a/server/middlewares/oauth.ts b/server/middlewares/oauth.ts
index bb90dac470db51df2e5b7f7fc4a7bb6b9a527bcb..9eef03bb43fc8bba3384dd350ebe977dcc25214a 100644 (file)
--- a/server/middlewares/oauth.ts
+++ b/server/middlewares/oauth.ts
@@ -9,6 +9,7 @@ const oAuthServer = new OAuthServer({
   useErrorHandler: true,
   accessTokenLifetime: OAUTH_LIFETIME.ACCESS_TOKEN,
   refreshTokenLifetime: OAUTH_LIFETIME.REFRESH_TOKEN,
+  continueMiddleware: true,
   model: require('../lib/oauth-model')
 })
 
@@ -50,6 +51,7 @@ function authenticateSocket (socket: Socket, next: (err?: any) => void) {
 
       return next()
     })
+    .catch(err => logger.error('Cannot get access token.', { err }))
 }
 
 function authenticatePromiseIfNeeded (req: express.Request, res: express.Response, authenticateInQuery = false) {