import * as express from 'express'
-import * as OAuthServer from 'express-oauth-server'
-import { OAUTH_LIFETIME } from '../initializers/constants'
-import { logger } from '../helpers/logger'
import { Socket } from 'socket.io'
+import { oAuthServer } from '@server/lib/auth'
+import { logger } from '../helpers/logger'
import { getAccessToken } from '../lib/oauth-model'
-
-const oAuthServer = new OAuthServer({
- useErrorHandler: true,
- accessTokenLifetime: OAUTH_LIFETIME.ACCESS_TOKEN,
- refreshTokenLifetime: OAUTH_LIFETIME.REFRESH_TOKEN,
- continueMiddleware: true,
- model: require('../lib/oauth-model')
-})
+import { HttpStatusCode } from '../../shared/core-utils/miscs/http-error-codes'
function authenticate (req: express.Request, res: express.Response, next: express.NextFunction, authenticateInQuery = false) {
const options = authenticateInQuery ? { allowBearerTokensInQueryString: true } : {}
.end()
}
+ res.locals.authenticated = true
+
return next()
})
}
function authenticateSocket (socket: Socket, next: (err?: any) => void) {
- const accessToken = socket.handshake.query.accessToken
+ const accessToken = socket.handshake.query['accessToken']
logger.debug('Checking socket access token %s.', accessToken)
return next(new Error('Invalid access token.'))
}
- socket.handshake.query.user = tokenDB.User
+ 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 && res.locals.oauth.token.User) return resolve()
+ if (res.locals.oauth?.token.User) return resolve()
- if (res.locals.authenticated === false) return res.sendStatus(401)
+ if (res.locals.authenticated === false) return res.sendStatus(HttpStatusCode.UNAUTHORIZED_401)
authenticate(req, res, () => resolve(), authenticateInQuery)
})
return 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: err.message,
- code: err.name
- })
- .end()
- }
-
- return next()
- })
-}
-
// ---------------------------------------------------------------------------
export {
authenticate,
authenticateSocket,
authenticatePromiseIfNeeded,
- optionalAuthenticate,
- token
+ optionalAuthenticate
}