X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmiddlewares%2Fauth.ts;h=904d47efd1fd019dfe805f456556f1b73bb9ad8e;hb=b0f4204266057316c11fc034da0ce86a212dc0b3;hp=9e6327b2379ed2c018803fc7567e91380dca8694;hpb=ac27887774e63d99f4e227fbe18846f143cc4b3c;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/middlewares/auth.ts b/server/middlewares/auth.ts index 9e6327b23..904d47efd 100644 --- a/server/middlewares/auth.ts +++ b/server/middlewares/auth.ts @@ -1,4 +1,4 @@ -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/models/http/http-error-codes' @@ -14,7 +14,7 @@ function authenticate (req: express.Request, res: express.Response, next: expres return next() }) .catch(err => { - logger.warn('Cannot authenticate.', { err }) + logger.info('Cannot authenticate.', { err }) return res.fail({ status: err.status, @@ -47,7 +47,7 @@ function authenticateSocket (socket: Socket, next: (err?: any) => void) { .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(resolve => { // Already authenticated? (or tried to) if (res.locals.oauth?.token.User) return resolve() @@ -76,6 +76,6 @@ function optionalAuthenticate (req: express.Request, res: express.Response, next export { authenticate, authenticateSocket, - authenticatePromiseIfNeeded, + authenticatePromise, optionalAuthenticate }