aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/helpers
diff options
context:
space:
mode:
authorChocobozzz <florian.bigard@gmail.com>2016-08-21 10:08:40 +0200
committerChocobozzz <florian.bigard@gmail.com>2016-08-21 10:41:04 +0200
commitd57d6f2605f4ac4a81f9a8594433bb7b65f108b9 (patch)
tree4fd2c1a4930df841c16fad5858f4a93330add715 /server/helpers
parent6c1a098b4107cc923631d8cd94ed54c184fcec7d (diff)
downloadPeerTube-d57d6f2605f4ac4a81f9a8594433bb7b65f108b9.tar.gz
PeerTube-d57d6f2605f4ac4a81f9a8594433bb7b65f108b9.tar.zst
PeerTube-d57d6f2605f4ac4a81f9a8594433bb7b65f108b9.zip
Server: fix makefriends validation and tests
Diffstat (limited to 'server/helpers')
-rw-r--r--server/helpers/custom-validators/index.js2
-rw-r--r--server/helpers/custom-validators/misc.js11
-rw-r--r--server/helpers/custom-validators/pods.js21
3 files changed, 24 insertions, 10 deletions
diff --git a/server/helpers/custom-validators/index.js b/server/helpers/custom-validators/index.js
index ab3066822..96b5b20b9 100644
--- a/server/helpers/custom-validators/index.js
+++ b/server/helpers/custom-validators/index.js
@@ -1,11 +1,13 @@
1'use strict' 1'use strict'
2 2
3const miscValidators = require('./misc') 3const miscValidators = require('./misc')
4const podsValidators = require('./pods')
4const usersValidators = require('./users') 5const usersValidators = require('./users')
5const videosValidators = require('./videos') 6const videosValidators = require('./videos')
6 7
7const validators = { 8const validators = {
8 misc: miscValidators, 9 misc: miscValidators,
10 pods: podsValidators,
9 users: usersValidators, 11 users: usersValidators,
10 videos: videosValidators 12 videos: videosValidators
11} 13}
diff --git a/server/helpers/custom-validators/misc.js b/server/helpers/custom-validators/misc.js
index 13904ea1b..782ae3dee 100644
--- a/server/helpers/custom-validators/misc.js
+++ b/server/helpers/custom-validators/misc.js
@@ -1,11 +1,8 @@
1'use strict' 1'use strict'
2 2
3const validator = require('express-validator').validator
4
5const miscValidators = { 3const miscValidators = {
6 exists: exists, 4 exists: exists,
7 isArray: isArray, 5 isArray: isArray
8 isEachUrl: isEachUrl
9} 6}
10 7
11function exists (value) { 8function exists (value) {
@@ -16,12 +13,6 @@ function isArray (value) {
16 return Array.isArray(value) 13 return Array.isArray(value)
17} 14}
18 15
19function isEachUrl (urls) {
20 return urls.every(function (url) {
21 return validator.isURL(url)
22 })
23}
24
25// --------------------------------------------------------------------------- 16// ---------------------------------------------------------------------------
26 17
27module.exports = miscValidators 18module.exports = miscValidators
diff --git a/server/helpers/custom-validators/pods.js b/server/helpers/custom-validators/pods.js
new file mode 100644
index 000000000..28d04a05d
--- /dev/null
+++ b/server/helpers/custom-validators/pods.js
@@ -0,0 +1,21 @@
1'use strict'
2
3const validator = require('express-validator').validator
4
5const miscValidators = require('./misc')
6
7const podsValidators = {
8 isEachUniqueUrlValid: isEachUniqueUrlValid
9}
10
11function isEachUniqueUrlValid (urls) {
12 return miscValidators.isArray(urls) &&
13 urls.length !== 0 &&
14 urls.every(function (url) {
15 return validator.isURL(url) && urls.indexOf(url) === urls.lastIndexOf(url)
16 })
17}
18
19// ---------------------------------------------------------------------------
20
21module.exports = podsValidators