X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmiddlewares%2Foauth.ts;h=5233b66bd10ed29cfa5957a1b00169240497ceea;hb=39ba2e8e3a71961cd0087c57d25905f6a97a6b69;hp=fe04904368ceb43943a704d4e17c5d94979d6157;hpb=ad0997adfb9e1e3b1ff54338d7558cf7b18440ea;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/middlewares/oauth.ts b/server/middlewares/oauth.ts
index fe0490436..5233b66bd 100644
--- a/server/middlewares/oauth.ts
+++ b/server/middlewares/oauth.ts
@@ -1,36 +1,58 @@
-import 'express-validator'
 import * as express from 'express'
 import * as OAuthServer from 'express-oauth-server'
-
+import 'express-validator'
 import { OAUTH_LIFETIME } from '../initializers'
-import { logger } from '../helpers'
+import { logger } from '../helpers/logger'
 
 const oAuthServer = new OAuthServer({
+  useErrorHandler: true,
   accessTokenLifetime: OAUTH_LIFETIME.ACCESS_TOKEN,
   refreshTokenLifetime: OAUTH_LIFETIME.REFRESH_TOKEN,
   model: require('../lib/oauth-model')
 })
 
 function authenticate (req: express.Request, res: express.Response, next: express.NextFunction) {
-  oAuthServer.authenticate()(req, res, function (err) {
+  oAuthServer.authenticate()(req, res, err => {
     if (err) {
-      logger.error('Cannot authenticate.', err)
-      return res.sendStatus(500)
+      logger.warn('Cannot authenticate.', { err })
+
+      return res.status(err.status)
+        .json({
+          error: 'Token is invalid.',
+          code: err.name
+        })
+        .end()
     }
 
-    if (res.statusCode === 401 || res.statusCode === 400 || res.statusCode === 503) return res.end()
-
     return next()
   })
 }
 
+function optionalAuthenticate (req: express.Request, res: express.Response, next: express.NextFunction) {
+  if (req.header('authorization')) return authenticate(req, res, next)
+
+  return next()
+}
+
 function token (req: express.Request, res: express.Response, next: express.NextFunction) {
-  return oAuthServer.token()(req, res, next)
+  return oAuthServer.token()(req, res, err => {
+    if (err) {
+      return res.status(err.status)
+        .json({
+          error: err.message,
+          code: err.name
+        })
+        .end()
+    }
+
+    return next()
+  })
 }
 
 // ---------------------------------------------------------------------------
 
 export {
   authenticate,
+  optionalAuthenticate,
   token
 }