Server: make a basic "quick and dirty update" for videos

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

diff --git a/server/controllers/api/users.js b/server/controllers/api/users.js
index e4423680cfddadff917ae3ea6783b2f6f4c67fc0..324c99b4cce8ab9d3730ed36d049e160149f50eb 100644 (file)
--- a/server/controllers/api/users.js
+++ b/server/controllers/api/users.js
@@ -1,13 +1,12 @@
 'use strict'
 
-const each = require('async/each')
 const express = require('express')
 const waterfall = require('async/waterfall')
 
 const constants = require('../../initializers/constants')
 const db = require('../../initializers/database')
-const friends = require('../../lib/friends')
 const logger = require('../../helpers/logger')
+const utils = require('../../helpers/utils')
 const middlewares = require('../../middlewares')
 const admin = middlewares.admin
 const oAuth = middlewares.oauth
@@ -62,6 +61,7 @@ function createUser (req, res, next) {
   const user = db.User.build({
     username: req.body.username,
     password: req.body.password,
+    email: req.body.email,
     role: constants.USER_ROLES.USER
   })
 
@@ -84,7 +84,7 @@ function listUsers (req, res, next) {
   db.User.listForApi(req.query.start, req.query.count, req.query.sort, function (err, usersList, usersTotal) {
     if (err) return next(err)
 
-    res.json(getFormatedUsers(usersList, usersTotal))
+    res.json(utils.getFormatedObjects(usersList, usersTotal))
   })
 }
 
@@ -123,18 +123,3 @@ function updateUser (req, res, next) {
 function success (req, res, next) {
   res.end()
 }
-
-// ---------------------------------------------------------------------------
-
-function getFormatedUsers (users, usersTotal) {
-  const formatedUsers = []
-
-  users.forEach(function (user) {
-    formatedUsers.push(user.toFormatedJSON())
-  })
-
-  return {
-    total: usersTotal,
-    data: formatedUsers
-  }
-}