reqValidators --> validators

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

diff --git a/server/controllers/api/v1/pods.js b/server/controllers/api/v1/pods.js
index 9dd9197b3be46e76306770b33875026a598bb3dd..4413fbc1e49aaa732a8720b2e816c388584a3660 100644 (file)
--- a/server/controllers/api/v1/pods.js
+++ b/server/controllers/api/v1/pods.js
@@ -7,18 +7,18 @@ const mongoose = require('mongoose')
 const logger = require('../../../helpers/logger')
 const friends = require('../../../lib/friends')
 const middlewares = require('../../../middlewares')
-const Pods = require('../../../models/pods')
-const oAuth2 = middlewares.oauth2
-const reqValidator = middlewares.reqValidators.pods
-const signatureValidator = middlewares.reqValidators.remote.signature
+const oAuth = middlewares.oauth
+const validators = middlewares.validators.pods
+const signatureValidator = middlewares.validators.remote.signature
 
 const router = express.Router()
+const Pod = mongoose.model('Pod')
 const Video = mongoose.model('Video')
 
 router.get('/', listPodsUrl)
-router.post('/', reqValidator.podsAdd, addPods)
-router.get('/makefriends', oAuth2.authenticate, reqValidator.makeFriends, makeFriends)
-router.get('/quitfriends', oAuth2.authenticate, quitFriends)
+router.post('/', validators.podsAdd, addPods)
+router.get('/makefriends', oAuth.authenticate, validators.makeFriends, makeFriends)
+router.get('/quitfriends', oAuth.authenticate, quitFriends)
 // Post because this is a secured request
 router.post('/remove', signatureValidator, removePods)
 
@@ -33,7 +33,11 @@ function addPods (req, res, next) {
 
   async.waterfall([
     function addPod (callback) {
-      Pods.add(informations, callback)
+      const pod = new Pod(informations)
+      pod.save(function (err, podCreated) {
+        // Be sure about the number of parameters for the callback
+        return callback(err, podCreated)
+      })
     },
 
     function sendMyVideos (podCreated, callback) {
@@ -60,7 +64,7 @@ function addPods (req, res, next) {
 }
 
 function listPodsUrl (req, res, next) {
-  Pods.listAllUrls(function (err, podsUrlList) {
+  Pod.listOnlyUrls(function (err, podsUrlList) {
     if (err) return next(err)
 
     res.json(podsUrlList)
@@ -79,8 +83,13 @@ function removePods (req, res, next) {
   const url = req.body.signature.url
 
   async.waterfall([
-    function (callback) {
-      Pods.remove(url, function (err) {
+    function loadPod (callback) {
+      Pod.loadByUrl(url, callback)
+    },
+
+    function removePod (pod, callback) {
+      pod.remove(function (err) {
+        // Be sure we only return one argument in the callback
         return callback(err)
       })
     },