Refactor middleware helpers

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

diff --git a/server/middlewares/user-right.ts b/server/middlewares/user-right.ts
index 5bb5bdfbda5aaee10dcb6902be3bfaf730be9a8c..498e3d677738aa9b9d9df2774d259ad867830637 100644 (file)
--- a/server/middlewares/user-right.ts
+++ b/server/middlewares/user-right.ts
@@ -2,14 +2,19 @@ import * as express from 'express'
 import 'express-validator'
 import { UserRight } from '../../shared'
 import { logger } from '../helpers/logger'
-import { UserModel } from '../models/account/user'
 
 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) {
-      logger.info('User %s does not have right %s to access to %s.', user.username, UserRight[userRight], req.path)
-      return res.sendStatus(403)
+      const message = `User ${user.username} does not have right ${UserRight[userRight]} to access to ${req.path}.`
+      logger.info(message)
+
+      return res.status(403)
+        .json({
+          error: message
+        })
+        .end()
     }
 
     return next()