From c32af79e02d40e88f8f144aeab7bd14fe402a509 Mon Sep 17 00:00:00 2001
From: Markus Grigull <web@grigull.me>
Date: Thu, 16 Mar 2017 21:23:43 +0100
Subject: [PATCH] Remove users content for react
Only temporary. Will be added again later on.
---
config.js | 4 +--
docker-compose.yml | 2 +-
models/file.js | 2 +-
models/project.js | 2 +-
models/simulation.js | 5 ++--
models/simulator.js | 1 -
models/visualization.js | 13 +++++-----
models/widget.js | 1 +
routes/files.js | 32 ++++++++++++++++++++---
routes/projects.js | 37 +++++++++++++-------------
routes/simulationModels.js | 14 +++++-----
routes/simulations.js | 53 ++++++++++++++++++--------------------
routes/simulators.js | 14 +++++-----
routes/upload.js | 20 +++++++-------
routes/visualizations.js | 14 +++++-----
routes/widgets.js | 14 +++++-----
16 files changed, 128 insertions(+), 100 deletions(-)
diff --git a/config.js b/config.js
index af5d65a..566dcbb 100644
--- a/config.js
+++ b/config.js
@@ -9,8 +9,8 @@
module.exports = {
databaseName: 'VILLAS',
- databaseURL: 'mongodb://mongo:27017/',
- port: 3000,
+ databaseURL: 'mongodb://localhost:27017/',
+ port: 4000,
secret: 'longsecretislong',
admin: {
username: 'admin',
diff --git a/docker-compose.yml b/docker-compose.yml
index b7a6f8d..c7d32b8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,5 +1,5 @@
node:
- image: acs/villasweb-backend
+ image: villasweb-backend
ports:
- "3000:3000"
links:
diff --git a/models/file.js b/models/file.js
index aaeaf6f..37fc362 100644
--- a/models/file.js
+++ b/models/file.js
@@ -17,7 +17,7 @@ var fileSchema = new Schema({
name: { type: String },
path: { type: String, required: true },
type: { type: String },
- user: { type: Schema.Types.ObjectId, ref: 'User', required: true },
+ /*user: { type: Schema.Types.ObjectId, ref: 'User', required: true },*/
date: { type: Date, default: Date.now }
});
diff --git a/models/project.js b/models/project.js
index 6b4facc..2bef916 100644
--- a/models/project.js
+++ b/models/project.js
@@ -17,7 +17,7 @@ var Schema = mongoose.Schema;
// project model
var projectSchema = new Schema({
name: { type: String, required: true },
- owner: { type: Schema.Types.ObjectId, ref: 'User', required: true },
+ /*owner: { type: Schema.Types.ObjectId, ref: 'User', required: true },*/
visualizations: [{ type: Schema.Types.ObjectId, ref: 'Visualization', default: [] }],
simulation: { type: Schema.Types.ObjectId, ref: 'Simulation', required: true }
});
diff --git a/models/simulation.js b/models/simulation.js
index 0f3a68c..81e27ec 100644
--- a/models/simulation.js
+++ b/models/simulation.js
@@ -19,8 +19,9 @@
var simulationSchema = new Schema({
name: { type: String, required: true },
running: { type: Boolean, default: false },
- owner: { type: Schema.Types.ObjectId, ref: 'User', required: true },
- models: [{ type: Schema.Types.ObjectId, ref: 'SimulationModel', default: [] }],
+ /*owner: { type: Schema.Types.ObjectId, ref: 'User', required: true },*/
+ /*models: [{ type: Schema.Types.ObjectId, ref: 'SimulationModel', default: [] }],*/
+ models: { type: Array, default: [] },
projects: [{ type: Schema.Types.ObjectId, ref: 'Project', default: [] }]
});
diff --git a/models/simulator.js b/models/simulator.js
index c1cb517..809b9da 100644
--- a/models/simulator.js
+++ b/models/simulator.js
@@ -16,7 +16,6 @@
var simulatorSchema = new Schema({
name: { type: String, required: true },
running: { type: Boolean, default: false },
- simulatorid: { type: Number, required: true },
endpoint: { type: String, required: true }
});
diff --git a/models/visualization.js b/models/visualization.js
index 5d3a021..bfc974a 100644
--- a/models/visualization.js
+++ b/models/visualization.js
@@ -10,22 +10,23 @@
// include
var mongoose = require('mongoose');
-var Widget = require('./widget');
+//var Widget = require('./widget');
var Schema = mongoose.Schema;
// visualization model
var visualizationSchema = new Schema({
name: { type: String, required: true },
- project: { type: Schema.Types.ObjectId, ref: 'Project', required: true },
- widgets: [{ type: Schema.Types.ObjectId, ref: 'Widget' }],
- rows: { type: Number, default: 1 }
+ project: { type: Schema.Types.ObjectId, ref: 'Project'/*, required: true*/ },
+ widgets: { type: Array, default: [] }
+ /*widgets: [{ type: Schema.Types.ObjectId, ref: 'Widget' }],
+ rows: { type: Number, default: 1 }*/
});
// execute before the visualization is deleted
visualizationSchema.pre('remove', function(callback) {
// delete all widgets belonging to this visualization
- this.widgets.forEach(function(id) {
+ /*this.widgets.forEach(function(id) {
Widget.findOne({ _id: id }, function(err, widget) {
if (err) {
return console.log(err);
@@ -37,7 +38,7 @@ visualizationSchema.pre('remove', function(callback) {
}
});
});
- });
+ });*/
callback();
});
diff --git a/models/widget.js b/models/widget.js
index a6857f8..481cf87 100644
--- a/models/widget.js
+++ b/models/widget.js
@@ -21,6 +21,7 @@ var widgetSchema = new Schema({
type: { type: String, required: true },
x: { type: Number, default: 0 },
y: { type: Number, default: 0 },
+ z: { type: Number, default: 0 },
visualization: { type: Schema.Types.ObjectId, ref: 'Visualization' }
});
diff --git a/routes/files.js b/routes/files.js
index c4aea8c..2d168c3 100644
--- a/routes/files.js
+++ b/routes/files.js
@@ -10,19 +10,29 @@
// include
var express = require('express');
-var auth = require('../auth');
+//var auth = require('../auth');
// models
var File = require('../models/file');
-var User = require('../models/user');
+//var User = require('../models/user');
// create router
var router = express.Router();
// all file routes need authentication
-router.use('/files', auth.validateToken);
+//router.use('/files', auth.validateToken);
// routes
+router.get('/files', function(req, res) {
+ File.find(function(err, files) {
+ if (err) {
+ return res.status(400).send(err);
+ }
+
+ res.send({ files: files });
+ });
+});
+
router.get('/files/:id', function(req, res) {
File.findOne({ _id: req.params.id }, function(err, file) {
if (err) {
@@ -33,4 +43,20 @@ router.get('/files/:id', function(req, res) {
});
});
+router.delete('/files/:id', function(req, res) {
+ File.findOne({ _id: req.params.id }, function(err, file) {
+ if (err) {
+ return res.status(400).send(err);
+ }
+
+ file.remove(function(err) {
+ if (err) {
+ return res.status(500).send(err);
+ }
+
+ res.send({});
+ });
+ });
+});
+
module.exports = router;
diff --git a/routes/projects.js b/routes/projects.js
index ebceaa0..200886f 100644
--- a/routes/projects.js
+++ b/routes/projects.js
@@ -10,7 +10,7 @@
// include
var express = require('express');
-var auth = require('../auth');
+//var auth = require('../auth');
// models
var Project = require('../models/project');
@@ -21,10 +21,10 @@ var Simulation = require('../models/simulation');
var router = express.Router();
// all project routes need authentication
-router.use('/projects', auth.validateToken);
+//router.use('/projects', auth.validateToken);
// routes
-router.get('/projects', auth.validateRole('project', 'read'), function(req, res) {
+router.get('/projects', /*auth.validateRole('project', 'read'),*/ function(req, res) {
// get all projects
Project.find(function(err, projects) {
if (err) {
@@ -35,7 +35,7 @@ router.get('/projects', auth.validateRole('project', 'read'), function(req, res)
});
});
-router.post('/projects', auth.validateRole('project', 'create'), function(req, res) {
+router.post('/projects', /*auth.validateRole('project', 'create'),*/ function(req, res) {
// create new project
var project = new Project(req.body.project);
@@ -46,7 +46,7 @@ router.post('/projects', auth.validateRole('project', 'create'), function(req, r
}
// add project to user
- User.findOne({ _id: project.owner }, function(err, user) {
+ /*User.findOne({ _id: project.owner }, function(err, user) {
if (err) {
return res.status(400).send(err);
}
@@ -56,7 +56,7 @@ router.post('/projects', auth.validateRole('project', 'create'), function(req, r
user.save(function(err) {
if (err) {
return res.status(500).send(err);
- }
+ }*/
// add project to simulation
Simulation.findOne({ _id: project.simulation }, function(err, simulation) {
@@ -74,12 +74,12 @@ router.post('/projects', auth.validateRole('project', 'create'), function(req, r
res.send({ project: project });
});
});
- });
- });
+ /*});
+ });*/
});
});
-router.put('/projects/:id', auth.validateRole('project', 'update'), function(req, res) {
+router.put('/projects/:id', /*auth.validateRole('project', 'update'),*/ function(req, res) {
// get project
Project.findOne({ _id: req.params.id }, function(err, project) {
if (err) {
@@ -87,7 +87,7 @@ router.put('/projects/:id', auth.validateRole('project', 'update'), function(req
}
// update relationships
- if (req.body.project.owner && req.body.project.owner !== project.owner) {
+ /*if (req.body.project.owner && req.body.project.owner !== project.owner) {
// remove from old user
User.findOne({ _id: project.owner }, function(err, user) {
if (err) {
@@ -121,7 +121,8 @@ router.put('/projects/:id', auth.validateRole('project', 'update'), function(req
}
});
});
- }
+ }*/
+
if (req.body.project.simulation && req.body.project.simulation !== project.simulation) {
// remove from old simulation
@@ -143,7 +144,7 @@ router.put('/projects/:id', auth.validateRole('project', 'update'), function(req
});
});
- // add to new user
+ // add to new simulation
Simulation.findOne({ _id: req.body.project.simulation }, function(err, simulation) {
if (err) {
return console.log(err);
@@ -175,7 +176,7 @@ router.put('/projects/:id', auth.validateRole('project', 'update'), function(req
});
});
-router.get('/projects/:id', auth.validateRole('project', 'read'), function(req, res) {
+router.get('/projects/:id', /*auth.validateRole('project', 'read'),*/ function(req, res) {
Project.findOne({ _id: req.params.id }, function(err, project) {
if (err) {
return res.status(400).send(err);
@@ -185,14 +186,14 @@ router.get('/projects/:id', auth.validateRole('project', 'read'), function(req,
});
});
-router.delete('/projects/:id', auth.validateRole('project', 'delete'), function(req, res) {
+router.delete('/projects/:id', /*auth.validateRole('project', 'delete'),*/ function(req, res) {
Project.findOne({ _id: req.params.id }, function(err, project) {
if (err) {
return res.status(400).send(err);
}
// remove from owner's list
- User.findOne({ _id: project.owner }, function(err, user) {
+ /*User.findOne({ _id: project.owner }, function(err, user) {
if (err) {
return res.status(400).send(err);
}
@@ -207,7 +208,7 @@ router.delete('/projects/:id', auth.validateRole('project', 'delete'), function(
user.save(function(err) {
if (err) {
return res.status(500).send(err);
- }
+ }*/
// remove the project
project.remove(function(err) {
@@ -217,8 +218,8 @@ router.delete('/projects/:id', auth.validateRole('project', 'delete'), function(
res.send({});
});
- });
- });
+ /*});
+ });*/
});
});
diff --git a/routes/simulationModels.js b/routes/simulationModels.js
index 9e843e1..ef76bc8 100644
--- a/routes/simulationModels.js
+++ b/routes/simulationModels.js
@@ -10,7 +10,7 @@
// include
var express = require('express');
-var auth = require('../auth');
+//var auth = require('../auth');
// models
var SimulationModel = require('../models/simulationModel');
@@ -20,10 +20,10 @@ var Simulation = require('../models/simulation');
var router = express.Router();
// all model routes need authentication
-router.use('/simulationModels', auth.validateToken);
+//router.use('/simulationModels', auth.validateToken);
// routes
-router.get('/simulationModels', auth.validateRole('simulationModel', 'read'), function(req, res) {
+router.get('/simulationModels', /*auth.validateRole('simulationModel', 'read'),*/ function(req, res) {
// get all user simulations
SimulationModel.find(function(err, models) {
if (err) {
@@ -34,7 +34,7 @@ router.get('/simulationModels', auth.validateRole('simulationModel', 'read'), fu
});
});
-router.post('/simulationModels', auth.validateRole('simulationModel', 'create'), function(req, res) {
+router.post('/simulationModels', /*auth.validateRole('simulationModel', 'create'),*/ function(req, res) {
// create new model
var model = new SimulationModel(req.body.simulationModel);
@@ -62,7 +62,7 @@ router.post('/simulationModels', auth.validateRole('simulationModel', 'create'),
});
});
-router.put('/simulationModels/:id', auth.validateRole('simulationModel', 'update'), function(req, res) {
+router.put('/simulationModels/:id', /*auth.validateRole('simulationModel', 'update'),*/ function(req, res) {
// get model
SimulationModel.findOne({ _id: req.params.id }, function(err, model) {
if (err) {
@@ -85,7 +85,7 @@ router.put('/simulationModels/:id', auth.validateRole('simulationModel', 'update
});
});
-router.get('/simulationModels/:id', auth.validateRole('simulationModel', 'read'), function(req, res) {
+router.get('/simulationModels/:id', /*auth.validateRole('simulationModel', 'read'),*/ function(req, res) {
SimulationModel.findOne({ _id: req.params.id }, function(err, model) {
if (err) {
return res.status(400).send(err);
@@ -95,7 +95,7 @@ router.get('/simulationModels/:id', auth.validateRole('simulationModel', 'read')
});
});
-router.delete('/simulationModels/:id', auth.validateRole('simulationModel', 'delete'), function(req, res) {
+router.delete('/simulationModels/:id', /*auth.validateRole('simulationModel', 'delete'),*/ function(req, res) {
SimulationModel.findOne({ _id: req.params.id }, function(err, model) {
if (err) {
return res.status(400).send(err);
diff --git a/routes/simulations.js b/routes/simulations.js
index 9fc2b57..3520420 100644
--- a/routes/simulations.js
+++ b/routes/simulations.js
@@ -10,7 +10,7 @@
// include
var express = require('express');
-var auth = require('../auth');
+//var auth = require('../auth');
// models
var Simulation = require('../models/simulation');
@@ -20,14 +20,11 @@ var User = require('../models/user');
var router = express.Router();
// all model routes need authentication
-router.use('/simulations', auth.validateToken);
+//router.use('/simulations', auth.validateToken);
// routes
-router.get('/simulations', auth.validateRole('simulation', 'read'), function(req, res) {
- // get all user simulations
- var userId = req.decoded._doc._id;
-
- Simulation.find({ owner: userId }, function(err, simulations) {
+router.get('/simulations', /*auth.validateRole('simulation', 'read'),*/ function(req, res) {
+ Simulation.find(function(err, simulations) {
if (err) {
return res.send(err);
}
@@ -36,7 +33,7 @@ router.get('/simulations', auth.validateRole('simulation', 'read'), function(req
});
});
-router.post('/simulations', auth.validateRole('simulation', 'create'), auth.validateOwner('simulation'), function(req, res) {
+router.post('/simulations', /*auth.validateRole('simulation', 'create'), auth.validateOwner('simulation'),*/ function(req, res) {
// create new simulation
var simulation = new Simulation(req.body.simulation);
@@ -46,7 +43,7 @@ router.post('/simulations', auth.validateRole('simulation', 'create'), auth.vali
}
// add simulation to user
- User.findOne({ _id: simulation.owner }, function(err, user) {
+ /*User.findOne({ _id: simulation.owner }, function(err, user) {
if (err) {
return res.status(400).send(err);
}
@@ -58,27 +55,27 @@ router.post('/simulations', auth.validateRole('simulation', 'create'), auth.vali
res.status(500).send(err);
}
- // send response
+ // send response*/
res.send({ simulation: simulation });
- });
- });
+ /*});
+ });*/
});
});
-router.put('/simulations/:id', auth.validateRole('simulation', 'update'), function(req, res) {
+router.put('/simulations/:id', /*auth.validateRole('simulation', 'update'),*/ function(req, res) {
// get simulation
Simulation.findOne({ _id: req.params.id }, function(err, simulation) {
if (err) {
return res.status(400).send(err);
}
- // validate owner
+ /*// validate owner
if (simulation.owner != req.decoded._doc._id) {
return res.status(403).send({ success: false, message: 'User is not owner' });
- }
+ }*/
// update relationships
- if (req.body.simulation.owner && req.body.simulation.owner !== simulation.owner) {
+ /*if (req.body.simulation.owner && req.body.simulation.owner !== simulation.owner) {
// remove from old user
User.findOne({ _id: simulation.owner }, function(err, user) {
if (err) {
@@ -112,7 +109,7 @@ router.put('/simulations/:id', auth.validateRole('simulation', 'update'), functi
}
});
});
- }
+ }*/
// update all properties
for (property in req.body.simulation) {
@@ -130,34 +127,34 @@ router.put('/simulations/:id', auth.validateRole('simulation', 'update'), functi
});
});
-router.get('/simulations/:id', auth.validateRole('simulation', 'read'), function(req, res) {
+router.get('/simulations/:id', /*auth.validateRole('simulation', 'read'),*/ function(req, res) {
Simulation.findOne({ _id: req.params.id }, function(err, simulation) {
if (err) {
return res.send(err);
}
// validate owner
- if (simulation.owner == req.decoded._doc._id) {
- res.send({ simulation: simulation });
+ /*if (simulation.owner == req.decoded._doc._id) {
+ */res.send({ simulation: simulation });/*
} else {
res.status(403).send({ success: false, message: 'User is not owner' });
- }
+ }*/
});
});
-router.delete('/simulations/:id', auth.validateRole('simulation', 'delete'), function(req, res) {
+router.delete('/simulations/:id', /*auth.validateRole('simulation', 'delete'),*/ function(req, res) {
Simulation.findOne({ _id: req.params.id }, function(err, simulation) {
if (err) {
return res.status(400).send(err);
}
// validate owner
- if (simulation.owner != req.decoded._doc._id) {
+ /*if (simulation.owner != req.decoded._doc._id) {
return res.status(403).send({ success: false, message: 'User is not owner' });
- }
+ }*/
// remove from owner's list
- User.findOne({ _id: simulation.owner }, function(err, user) {
+ /*User.findOne({ _id: simulation.owner }, function(err, user) {
if (err) {
return res.status(500).send(err);
}
@@ -172,7 +169,7 @@ router.delete('/simulations/:id', auth.validateRole('simulation', 'delete'), fun
user.save(function(err) {
if (err) {
return res.status(500).send(err);
- }
+ }*/
// remove simulation itself
simulation.remove(function(err) {
@@ -182,8 +179,8 @@ router.delete('/simulations/:id', auth.validateRole('simulation', 'delete'), fun
res.send({});
});
- });
- });
+ /*});
+ });*/
});
});
diff --git a/routes/simulators.js b/routes/simulators.js
index 3f5f36e..c7c1e70 100644
--- a/routes/simulators.js
+++ b/routes/simulators.js
@@ -10,7 +10,7 @@
// include
var express = require('express');
-var auth = require('../auth');
+//var auth = require('../auth');
// models
var Simulator = require('../models/simulator');
@@ -19,10 +19,10 @@ var Simulator = require('../models/simulator');
var router = express.Router();
// all model routes need authentication
-router.use('/simulators', auth.validateToken);
+//router.use('/simulators', auth.validateToken);
// routes
-router.get('/simulators', auth.validateRole('simulator', 'read'), function(req, res) {
+router.get('/simulators', /*auth.validateRole('simulator', 'read'),*/ function(req, res) {
// get all simulators
Simulator.find(function(err, simulators) {
if (err) {
@@ -33,7 +33,7 @@ router.get('/simulators', auth.validateRole('simulator', 'read'), function(req,
});
});
-router.post('/simulators', auth.validateRole('simulator', 'create'), function(req, res) {
+router.post('/simulators', /*auth.validateRole('simulator', 'create'),*/ function(req, res) {
// create new simulator
var simulator = new Simulator(req.body.simulator);
@@ -46,7 +46,7 @@ router.post('/simulators', auth.validateRole('simulator', 'create'), function(re
});
});
-router.put('/simulators/:id', auth.validateRole('simulator', 'update'), function(req, res) {
+router.put('/simulators/:id', /*auth.validateRole('simulator', 'update'),*/ function(req, res) {
// get simulator
Simulator.findOne({ _id: req.params.id }, function(err, simulator) {
if (err) {
@@ -69,7 +69,7 @@ router.put('/simulators/:id', auth.validateRole('simulator', 'update'), function
});
});
-router.get('/simulators/:id', auth.validateRole('simulator', 'read'), function(req, res) {
+router.get('/simulators/:id', /*auth.validateRole('simulator', 'read'),*/ function(req, res) {
Simulator.findOne({ _id: req.params.id }, function(err, simulator) {
if (err) {
return res.status(400).send(err);
@@ -79,7 +79,7 @@ router.get('/simulators/:id', auth.validateRole('simulator', 'read'), function(r
});
});
-router.delete('/simulators/:id', auth.validateRole('simulator', 'delete'), function(req, res) {
+router.delete('/simulators/:id', /*auth.validateRole('simulator', 'delete'),*/ function(req, res) {
Simulator.findOne({ _id: req.params.id }, function(err, simulator) {
if (err) {
return res.status(400).send(err);
diff --git a/routes/upload.js b/routes/upload.js
index 8492212..113ced9 100644
--- a/routes/upload.js
+++ b/routes/upload.js
@@ -13,9 +13,9 @@ var path = require('path');
var formidable = require('formidable');
var fs = require('fs');
-var auth = require('../auth');
+//var auth = require('../auth');
-var User = require('../models/user');
+//var User = require('../models/user');
var File = require('../models/file');
// create router
@@ -25,36 +25,38 @@ var router = express.Router();
router.use(express.static(path.join(__dirname, '../public')));
// routes
-router.post('/upload', auth.validateToken, function(req, res) {
+router.post('/upload', /*auth.validateToken,*/ function(req, res) {
// create form object
var form = new formidable.IncomingForm();
form.uploadDir = path.join(__dirname, '../public');
// register events
form.on('file', function(field, file) {
- fs.rename(file.path, path.join(form.uploadDir, req.decoded._doc._id + '_' + file.name));
+ console.log(file);
+
+ //fs.rename(file.path, path.join(form.uploadDir, /*req.decoded._doc._id + '_' +*/ file.name));
// find user
- User.findOne({ _id: req.decoded._doc._id }, function(err, user) {
+ /*User.findOne({ _id: req.decoded._doc._id }, function(err, user) {
if (err) {
console.log(err);
- }
+ }*/
// create file object
- var fileObj = new File({ name: file.name, path: 'public/' + user._id + '_' + file.name, user: user._id });
+ var fileObj = new File({ name: file.name, path: 'public/' + /*user._id + '_' +*/ file.name/*, user: user._id*/ });
fileObj.save(function(err) {
if (err) {
console.log(err);
}
- user.files.push(fileObj._id);
+ /*user.files.push(fileObj._id);
user.save(function(err) {
if (err) {
console.log(err);
}
});
- });
+ });*/
});
});
diff --git a/routes/visualizations.js b/routes/visualizations.js
index 4f5f1e0..69180c3 100644
--- a/routes/visualizations.js
+++ b/routes/visualizations.js
@@ -10,7 +10,7 @@
// include
var express = require('express');
-var auth = require('../auth');
+//var auth = require('../auth');
// models
var Visualization = require('../models/visualization');
@@ -20,10 +20,10 @@ var Project = require('../models/project');
var router = express.Router();
// all visualization routes need authentication
-router.use('/visualizations', auth.validateToken);
+//router.use('/visualizations', auth.validateToken);
// routes
-router.get('/visualizations', auth.validateRole('visualization', 'read'), function(req, res) {
+router.get('/visualizations', /*auth.validateRole('visualization', 'read'),*/ function(req, res) {
// get all visualizations
Visualization.find(function(err, visualizations) {
if (err) {
@@ -34,7 +34,7 @@ router.get('/visualizations', auth.validateRole('visualization', 'read'), functi
});
});
-router.post('/visualizations', auth.validateRole('visualization', 'create'), function(req, res) {
+router.post('/visualizations', /*auth.validateRole('visualization', 'create'),*/ function(req, res) {
// create new visualization
var visualization = new Visualization(req.body.visualization);
@@ -62,7 +62,7 @@ router.post('/visualizations', auth.validateRole('visualization', 'create'), fun
});
});
-router.put('/visualizations/:id', auth.validateRole('visualization', 'update'), function(req, res) {
+router.put('/visualizations/:id', /*auth.validateRole('visualization', 'update'),*/ function(req, res) {
// get visualization
Visualization.findOne({ _id: req.params.id }, function(err, visualization) {
if (err) {
@@ -85,7 +85,7 @@ router.put('/visualizations/:id', auth.validateRole('visualization', 'update'),
});
});
-router.get('/visualizations/:id', auth.validateRole('visualization', 'read'), function(req, res) {
+router.get('/visualizations/:id', /*auth.validateRole('visualization', 'read'),*/ function(req, res) {
Visualization.findOne({ _id: req.params.id }, function(err, visualization) {
if (err) {
return res.send(err);
@@ -95,7 +95,7 @@ router.get('/visualizations/:id', auth.validateRole('visualization', 'read'), fu
});
});
-router.delete('/visualizations/:id', auth.validateRole('visualization', 'delete'), function(req, res) {
+router.delete('/visualizations/:id', /*auth.validateRole('visualization', 'delete'),*/ function(req, res) {
Visualization.findOne({ _id: req.params.id }, function(err, visualization) {
if (err) {
return res.send(err);
diff --git a/routes/widgets.js b/routes/widgets.js
index 8a3bdd5..67aa283 100644
--- a/routes/widgets.js
+++ b/routes/widgets.js
@@ -10,7 +10,7 @@
// include
var express = require('express');
-var auth = require('../auth');
+//var auth = require('../auth');
// models
var Widget = require('../models/widget');
@@ -20,10 +20,10 @@ var Visualization = require('../models/visualization');
var router = express.Router();
// all widget routes need authentication
-router.use('/widgets', auth.validateToken);
+//router.use('/widgets', auth.validateToken);
// routes
-router.get('/widgets', auth.validateRole('visualization', 'read'), function(req, res) {
+router.get('/widgets', /*auth.validateRole('visualization', 'read'),*/ function(req, res) {
// get all widgets
Widget.find(function(err, widgets) {
if (err) {
@@ -34,7 +34,7 @@ router.get('/widgets', auth.validateRole('visualization', 'read'), function(req,
});
});
-router.post('/widgets', auth.validateRole('visualization', 'create'), function(req, res) {
+router.post('/widgets', /*auth.validateRole('visualization', 'create'),*/ function(req, res) {
// create new widget
var widget = new Widget(req.body.widget);
@@ -62,7 +62,7 @@ router.post('/widgets', auth.validateRole('visualization', 'create'), function(r
});
});
-router.put('/widgets/:id', auth.validateRole('visualization', 'update'), function(req, res) {
+router.put('/widgets/:id', /*auth.validateRole('visualization', 'update'),*/ function(req, res) {
// get widget
Widget.findOne({ _id: req.params.id }, function(err, widget) {
if (err) {
@@ -85,7 +85,7 @@ router.put('/widgets/:id', auth.validateRole('visualization', 'update'), functio
});
});
-router.get('/widgets/:id', auth.validateRole('visualization', 'read'), function(req, res) {
+router.get('/widgets/:id', /*auth.validateRole('visualization', 'read'),*/ function(req, res) {
Widget.findOne({ _id: req.params.id }, function(err, widget) {
if (err) {
return res.send(err);
@@ -95,7 +95,7 @@ router.get('/widgets/:id', auth.validateRole('visualization', 'read'), function(
});
});
-router.delete('/widgets/:id', auth.validateRole('visualization', 'delete'), function(req, res) {
+router.delete('/widgets/:id', /*auth.validateRole('visualization', 'delete'),*/ function(req, res) {
Widget.findOne({ _id: req.params.id }, function(err, widget) {
if (err) {
return res.send(err);
--
GitLab