Move middleware utils in middlewares

[github/Chocobozzz/PeerTube.git] / server / middlewares / validators / themes.ts

diff --git a/server/middlewares/validators/themes.ts b/server/middlewares/validators/themes.ts
index 24a9673f788d5c08194a3cecf81e518b5d77626a..d4716257f9a093791eaba1e5ccba60037e5fc885 100644 (file)
--- a/server/middlewares/validators/themes.ts
+++ b/server/middlewares/validators/themes.ts
@@ -1,10 +1,11 @@
 import * as express from 'express'
 import { param } from 'express-validator'
-import { logger } from '../../helpers/logger'
-import { areValidationErrors } from './utils'
+import { HttpStatusCode } from '../../../shared/core-utils/miscs/http-error-codes'
+import { isSafePath } from '../../helpers/custom-validators/misc'
 import { isPluginNameValid, isPluginVersionValid } from '../../helpers/custom-validators/plugins'
+import { logger } from '../../helpers/logger'
 import { PluginManager } from '../../lib/plugins/plugin-manager'
-import { isSafePath } from '../../helpers/custom-validators/misc'
+import { areValidationErrors } from './shared'
 
 const serveThemeCSSValidator = [
   param('themeName').custom(isPluginNameValid).withMessage('Should have a valid theme name'),
@@ -16,14 +17,20 @@ const serveThemeCSSValidator = [
 
     if (areValidationErrors(req, res)) return
 
-    const theme = PluginManager.Instance.getRegisteredTheme(req.params.themeName)
+    const theme = PluginManager.Instance.getRegisteredThemeByShortName(req.params.themeName)
 
     if (!theme || theme.version !== req.params.themeVersion) {
-      return res.sendStatus(404)
+      return res.fail({
+        status: HttpStatusCode.NOT_FOUND_404,
+        message: 'No theme named ' + req.params.themeName + ' was found with version ' + req.params.themeVersion
+      })
     }
 
     if (theme.css.includes(req.params.staticEndpoint) === false) {
-      return res.sendStatus(404)
+      return res.fail({
+        status: HttpStatusCode.NOT_FOUND_404,
+        message: 'No static endpoint was found for this theme'
+      })
     }
 
     res.locals.registeredPlugin = theme