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 890028b367c33cdaac8f498c61de7c68c1e2cb57..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,45 +84,17 @@ 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))
   })
 }
 
 function removeUser (req, res, next) {
   waterfall([
-    function getUser (callback) {
+    function loadUser (callback) {
       db.User.loadById(req.params.id, callback)
     },
 
-    // TODO: use foreignkey?
-    function getVideos (user, callback) {
-      db.Video.listOwnedByAuthor(user.username, function (err, videos) {
-        return callback(err, user, videos)
-      })
-    },
-
-    function removeVideosFromDB (user, videos, callback) {
-      each(videos, function (video, callbackEach) {
-        video.destroy().asCallback(callbackEach)
-      }, function (err) {
-        return callback(err, user, videos)
-      })
-    },
-
-    function sendInformationToFriends (user, videos, callback) {
-      videos.forEach(function (video) {
-        const params = {
-          name: video.name,
-          remoteId: video.id
-        }
-
-        friends.removeVideoToFriends(params)
-      })
-
-      return callback(null, user)
-    },
-
-    function removeUserFromDB (user, callback) {
+    function deleteUser (user, callback) {
       user.destroy().asCallback(callback)
     }
   ], function andFinally (err) {
@@ -151,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
-  }
-}