X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Fauth.ts;h=dbd421a7b3d6e0b33c1ecbf5dc2286475cc36452;hb=095e2258043fcff8a79ab082d11edfbd8f13a8e2;hp=acf0da18a6740e20a0567a1394d32a78e95095cd;hpb=74fd2643b43057c25558b3da79398efe104e2660;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/lib/auth.ts b/server/lib/auth.ts index acf0da18a..dbd421a7b 100644 --- a/server/lib/auth.ts +++ b/server/lib/auth.ts @@ -13,11 +13,13 @@ import { } from '@server/types/plugins/register-server-auth.model' import * as express from 'express' import * as OAuthServer from 'express-oauth-server' +import { HttpStatusCode } from '@shared/core-utils/miscs/http-error-codes' const oAuthServer = new OAuthServer({ useErrorHandler: true, accessTokenLifetime: OAUTH_LIFETIME.ACCESS_TOKEN, refreshTokenLifetime: OAUTH_LIFETIME.REFRESH_TOKEN, + allowExtendedTokenAttributes: true, continueMiddleware: true, model: require('./oauth-model') }) @@ -215,7 +217,7 @@ function proxifyExternalAuthBypass (req: express.Request, res: express.Response) const obj = authBypassTokens.get(req.body.externalAuthToken) if (!obj) { logger.error('Cannot authenticate user with unknown bypass token') - return res.sendStatus(400) + return res.sendStatus(HttpStatusCode.BAD_REQUEST_400) } const { expires, user, authName, npmName } = obj @@ -223,12 +225,12 @@ function proxifyExternalAuthBypass (req: express.Request, res: express.Response) const now = new Date() if (now.getTime() > expires.getTime()) { logger.error('Cannot authenticate user with an expired external auth token') - return res.sendStatus(400) + return res.sendStatus(HttpStatusCode.BAD_REQUEST_400) } if (user.username !== req.body.username) { logger.error('Cannot authenticate user %s with invalid username %s.', req.body.username) - return res.sendStatus(400) + return res.sendStatus(HttpStatusCode.BAD_REQUEST_400) } // Bypass oauth library validation