X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmiddlewares%2Fuser-right.ts;h=d1888c2d3808e27db3b61520d6d2f2531527044c;hb=d4a8e7a65f97bb3257facc13e1ae8ffdbad61ddb;hp=7cea7aa1e6c0e34eb2e812df4024956da44d7cc8;hpb=eec63bbc0f4fdb39e56f37127b35c449f90a135f;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/middlewares/user-right.ts b/server/middlewares/user-right.ts index 7cea7aa1e..d1888c2d3 100644 --- a/server/middlewares/user-right.ts +++ b/server/middlewares/user-right.ts @@ -1,21 +1,19 @@ import * as express from 'express' -import 'express-validator' import { UserRight } from '../../shared' import { logger } from '../helpers/logger' -import { UserModel } from '../models/account/user' +import { HttpStatusCode } from '../../shared/core-utils/miscs/http-error-codes' function ensureUserHasRight (userRight: UserRight) { return function (req: express.Request, res: express.Response, next: express.NextFunction) { - const user = res.locals.oauth.token.user as UserModel + const user = res.locals.oauth.token.user if (user.hasRight(userRight) === false) { - const message = `User ${user.username} does not have right ${UserRight[userRight]} to access to ${req.path}.` + const message = `User ${user.username} does not have right ${userRight} to access to ${req.path}.` logger.info(message) - return res.status(403) - .json({ - error: message - }) - .end() + return res.fail({ + status: HttpStatusCode.FORBIDDEN_403, + message + }) } return next()