Merge branch 'master' into webseed-merged

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

diff --git a/server/middlewares/oauth.js b/server/middlewares/oauth.js
index 3d7429f1d44cea7cc36d315afa3b6214db399b7d..3a02b9b4863c1e16b06502ae781368f13a48b7cb 100644 (file)
--- a/server/middlewares/oauth.js
+++ b/server/middlewares/oauth.js
@@ -2,15 +2,18 @@
 
 const OAuthServer = require('express-oauth-server')
 
+const constants = require('../initializers/constants')
 const logger = require('../helpers/logger')
 
 const oAuthServer = new OAuthServer({
+  accessTokenLifetime: constants.OAUTH_LIFETIME.ACCESS_TOKEN,
+  refreshTokenLifetime: constants.OAUTH_LIFETIME.REFRESH_TOKEN,
   model: require('../lib/oauth-model')
 })
 
 const oAuth = {
-  authenticate: authenticate,
-  token: token
+  authenticate,
+  token
 }
 
 function authenticate (req, res, next) {
@@ -20,7 +23,7 @@ function authenticate (req, res, next) {
       return res.sendStatus(500)
     }
 
-    if (res.statusCode === 401 || res.statusCode === 400) return res.end()
+    if (res.statusCode === 401 || res.statusCode === 400 || res.statusCode === 503) return res.end()
 
     return next()
   })