X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmiddlewares%2Foauth.ts;h=41a3fb71894133d759f867a288bc930ea0e62362;hb=f076daa76a32074cba162459e38fa8c130ad42d0;hp=07bbded57d636d3a5999c46cc7b94621981c4c72;hpb=e02643f32e4c97ca307f8fc5b69be79c40d70a3b;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/middlewares/oauth.ts b/server/middlewares/oauth.ts
index 07bbded57..41a3fb718 100644
--- a/server/middlewares/oauth.ts
+++ b/server/middlewares/oauth.ts
@@ -1,29 +1,43 @@
-import OAuthServer = require('express-oauth-server')
-
+import * as express from 'express'
+import * as OAuthServer from 'express-oauth-server'
+import 'express-validator'
 import { OAUTH_LIFETIME } from '../initializers'
-import { logger } from '../helpers'
 
 const oAuthServer = new OAuthServer({
+  useErrorHandler: true,
   accessTokenLifetime: OAUTH_LIFETIME.ACCESS_TOKEN,
   refreshTokenLifetime: OAUTH_LIFETIME.REFRESH_TOKEN,
   model: require('../lib/oauth-model')
 })
 
-function authenticate (req, res, next) {
-  oAuthServer.authenticate()(req, res, function (err) {
+function authenticate (req: express.Request, res: express.Response, next: express.NextFunction) {
+  oAuthServer.authenticate()(req, res, err => {
     if (err) {
-      logger.error('Cannot authenticate.', { error: err })
-      return res.sendStatus(500)
+      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 token (req, res, next) {
-  return oAuthServer.token()(req, res, next)
+function token (req: express.Request, res: express.Response, next: express.NextFunction) {
+  return oAuthServer.token()(req, res, err => {
+    if (err) {
+      return res.status(err.status)
+        .json({
+          error: 'Authentication failed.',
+          code: err.name
+        })
+        .end()
+    }
+
+    return next()
+  })
 }
 
 // ---------------------------------------------------------------------------