Merge branch 'release/3.2.0' into develop

[github/Chocobozzz/PeerTube.git] / server / middlewares / user-right.ts

diff --git a/server/middlewares/user-right.ts b/server/middlewares/user-right.ts
index 7cea7aa1e6c0e34eb2e812df4024956da44d7cc8..45dda4781211f9a5a85221bd47df989647fcda90 100644 (file)
--- a/server/middlewares/user-right.ts
+++ b/server/middlewares/user-right.ts
@@ -1,21 +1,17 @@
 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.status(HttpStatusCode.FORBIDDEN_403)
+                .json({ error: message })
     }
 
     return next()