import * as express from 'express'
import * as OAuthServer from 'express-oauth-server'
-import 'express-validator'
-import { OAUTH_LIFETIME } from '../initializers'
+import { OAUTH_LIFETIME } from '../initializers/constants'
import { logger } from '../helpers/logger'
import { Socket } from 'socket.io'
import { getAccessToken } from '../lib/oauth-model'
useErrorHandler: true,
accessTokenLifetime: OAUTH_LIFETIME.ACCESS_TOKEN,
refreshTokenLifetime: OAUTH_LIFETIME.REFRESH_TOKEN,
+ continueMiddleware: true,
model: require('../lib/oauth-model')
})
-function authenticate (req: express.Request, res: express.Response, next: express.NextFunction) {
- oAuthServer.authenticate()(req, res, err => {
+function authenticate (req: express.Request, res: express.Response, next: express.NextFunction, authenticateInQuery = false) {
+ const options = authenticateInQuery ? { allowBearerTokensInQueryString: true } : {}
+
+ oAuthServer.authenticate(options)(req, res, err => {
if (err) {
logger.warn('Cannot authenticate.', { err })
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()
return next()
})
+ .catch(err => logger.error('Cannot get access token.', { err }))
}
-function authenticatePromiseIfNeeded (req: express.Request, res: express.Response) {
+function authenticatePromiseIfNeeded (req: express.Request, res: express.Response, authenticateInQuery = false) {
return new Promise(resolve => {
// Already authenticated? (or tried to)
if (res.locals.oauth && res.locals.oauth.token.User) return resolve()
if (res.locals.authenticated === false) return res.sendStatus(401)
- authenticate(req, res, () => {
- return resolve()
- })
+ authenticate(req, res, () => resolve(), authenticateInQuery)
})
}