-import * as express from 'express'
+import express from 'express'
import { Socket } from 'socket.io'
import { getAccessToken } from '@server/lib/auth/oauth-model'
-import { HttpStatusCode } from '../../shared/core-utils/miscs/http-error-codes'
+import { HttpStatusCode } from '../../shared/models/http/http-error-codes'
import { logger } from '../helpers/logger'
import { handleOAuthAuthenticate } from '../lib/auth/oauth'
return next()
})
.catch(err => {
- logger.warn('Cannot authenticate.', { err })
+ logger.info('Cannot authenticate.', { err })
return res.fail({
status: err.status,
.catch(err => logger.error('Cannot get access token.', { err }))
}
-function authenticatePromiseIfNeeded (req: express.Request, res: express.Response, authenticateInQuery = false) {
+function authenticatePromise (req: express.Request, res: express.Response, authenticateInQuery = false) {
return new Promise<void>(resolve => {
// Already authenticated? (or tried to)
if (res.locals.oauth?.token.User) return resolve()
export {
authenticate,
authenticateSocket,
- authenticatePromiseIfNeeded,
+ authenticatePromise,
optionalAuthenticate
}