diff options
author | John Livingston <38844060+JohnXLivingston@users.noreply.github.com> | 2021-12-03 10:14:01 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-12-03 10:14:01 +0100 |
commit | 3a1157a68a70e90df21f743ea15154805649b8e5 (patch) | |
tree | 16cf8151e6717f9025f53aec28c3a85c003377fb /server/middlewares | |
parent | 37cb07eae26b1b73b118e256df71243ae298fa72 (diff) | |
download | PeerTube-3a1157a68a70e90df21f743ea15154805649b8e5.tar.gz PeerTube-3a1157a68a70e90df21f743ea15154805649b8e5.tar.zst PeerTube-3a1157a68a70e90df21f743ea15154805649b8e5.zip |
CLI: plugins install command accept a --plugin-version parameter. (#4599)
* CLI: plugins install command accept a --plugin-version parameter.
* Unit tests for plugins install --plugin-version.
* Fix linting.
* Styling
Co-authored-by: Chocobozzz <me@florianbigard.com>
Diffstat (limited to 'server/middlewares')
-rw-r--r-- | server/middlewares/validators/plugins.ts | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/server/middlewares/validators/plugins.ts b/server/middlewares/validators/plugins.ts index 21171af23..c1e9ebefb 100644 --- a/server/middlewares/validators/plugins.ts +++ b/server/middlewares/validators/plugins.ts | |||
@@ -116,6 +116,9 @@ const installOrUpdatePluginValidator = [ | |||
116 | body('npmName') | 116 | body('npmName') |
117 | .optional() | 117 | .optional() |
118 | .custom(isNpmPluginNameValid).withMessage('Should have a valid npm name'), | 118 | .custom(isNpmPluginNameValid).withMessage('Should have a valid npm name'), |
119 | body('pluginVersion') | ||
120 | .optional() | ||
121 | .custom(isPluginVersionValid).withMessage('Should have a valid plugin version'), | ||
119 | body('path') | 122 | body('path') |
120 | .optional() | 123 | .optional() |
121 | .custom(isSafePath).withMessage('Should have a valid safe path'), | 124 | .custom(isSafePath).withMessage('Should have a valid safe path'), |
@@ -129,6 +132,9 @@ const installOrUpdatePluginValidator = [ | |||
129 | if (!body.path && !body.npmName) { | 132 | if (!body.path && !body.npmName) { |
130 | return res.fail({ message: 'Should have either a npmName or a path' }) | 133 | return res.fail({ message: 'Should have either a npmName or a path' }) |
131 | } | 134 | } |
135 | if (body.pluginVersion && !body.npmName) { | ||
136 | return res.fail({ message: 'Should have a npmName when specifying a pluginVersion' }) | ||
137 | } | ||
132 | 138 | ||
133 | return next() | 139 | return next() |
134 | } | 140 | } |