Fix users tests

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

diff --git a/server/middlewares/oauth.ts b/server/middlewares/oauth.ts
index 3cda41e5c46be23761e491408d5a56c4cefd76ff..b1149174bfbf633c0ba7314718b997fa8f9ab451 100644 (file)
--- a/server/middlewares/oauth.ts
+++ b/server/middlewares/oauth.ts
@@ -1,19 +1,16 @@
 import * as express from 'express'
-import * as OAuthServer from 'express-oauth-server'
-import 'express-validator'
 import { logger } from '../helpers/logger'
-import { OAUTH_LIFETIME } from '../initializers'
+import { Socket } from 'socket.io'
+import { getAccessToken } from '../lib/oauth-model'
+import { oAuthServer } from '@server/lib/auth'
 
-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, authenticateInQuery = false) {
+  const options = authenticateInQuery ? { allowBearerTokensInQueryString: true } : {}
 
-function authenticate (req: express.Request, res: express.Response, next: express.NextFunction) {
-  oAuthServer.authenticate()(req, res, err => {
+  oAuthServer.authenticate(options)(req, res, err => {
     if (err) {
+      logger.warn('Cannot authenticate.', { err })
+
       return res.status(err.status)
         .json({
           error: 'Token is invalid.',
@@ -26,24 +23,52 @@ function authenticate (req: express.Request, res: express.Response, next: expres
   })
 }
 
-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()
-    }
+function authenticateSocket (socket: Socket, next: (err?: any) => void) {
+  const accessToken = socket.handshake.query.accessToken
 
-    return next()
+  logger.debug('Checking socket access token %s.', accessToken)
+
+  if (!accessToken) return next(new Error('No access token provided'))
+
+  getAccessToken(accessToken)
+    .then(tokenDB => {
+      const now = new Date()
+
+      if (!tokenDB || tokenDB.accessTokenExpiresAt < now || tokenDB.refreshTokenExpiresAt < now) {
+        return next(new Error('Invalid access token.'))
+      }
+
+      socket.handshake.query.user = tokenDB.User
+
+      return next()
+    })
+    .catch(err => logger.error('Cannot get access token.', { err }))
+}
+
+function authenticatePromiseIfNeeded (req: express.Request, res: express.Response, authenticateInQuery = false) {
+  return new Promise(resolve => {
+    // Already authenticated? (or tried to)
+    if (res.locals.oauth?.token.User) return resolve()
+
+    if (res.locals.authenticated === false) return res.sendStatus(401)
+
+    authenticate(req, res, () => resolve(), authenticateInQuery)
   })
 }
 
+function optionalAuthenticate (req: express.Request, res: express.Response, next: express.NextFunction) {
+  if (req.header('authorization')) return authenticate(req, res, next)
+
+  res.locals.authenticated = false
+
+  return next()
+}
+
 // ---------------------------------------------------------------------------
 
 export {
   authenticate,
-  token
+  authenticateSocket,
+  authenticatePromiseIfNeeded,
+  optionalAuthenticate
 }