Format video blacklist

[github/Chocobozzz/PeerTube.git] / server / controllers / api / users.js

diff --git a/server/controllers/api/users.js b/server/controllers/api/users.js
index f854b30826697269d12520bb7b4d1da73dbfcb0a..c7fe7bf85fa12f2639fb79a5f369e33e70634f24 100644 (file)
--- a/server/controllers/api/users.js
+++ b/server/controllers/api/users.js
@@ -44,6 +44,12 @@ router.post('/',
   createUser
 )
 
+router.post('/register',
+  ensureRegistrationEnabled,
+  validatorsUsers.usersAdd,
+  createUser
+)
+
 router.put('/:id',
   oAuth.authenticate,
   validatorsUsers.usersUpdate,
@@ -66,11 +72,22 @@ module.exports = router
 
 // ---------------------------------------------------------------------------
 
+function ensureRegistrationEnabled (req, res, next) {
+  const registrationEnabled = constants.CONFIG.SIGNUP.ENABLED
+
+  if (registrationEnabled === true) {
+    return next()
+  }
+
+  return res.status(400).send('User registration is not enabled.')
+}
+
 function createUser (req, res, next) {
   const user = db.User.build({
     username: req.body.username,
     password: req.body.password,
     email: req.body.email,
+    displayNSFW: false,
     role: constants.USER_ROLES.USER
   })
 
@@ -136,7 +153,9 @@ function updateUser (req, res, next) {
   db.User.loadByUsername(res.locals.oauth.token.user.username, function (err, user) {
     if (err) return next(err)
 
-    user.password = req.body.password
+    if (req.body.password) user.password = req.body.password
+    if (req.body.displayNSFW !== undefined) user.displayNSFW = req.body.displayNSFW
+
     user.save().asCallback(function (err) {
       if (err) return next(err)