Add missing images

Also commented out the MQTT auth routes
This commit is contained in:
Ben Hardill
2016-11-16 23:57:18 +00:00
parent 1b89685574
commit 2268afc8dc
4 changed files with 41 additions and 41 deletions

View File

@@ -4,9 +4,9 @@ var mqtt = require('mqtt');
var http = require('http'); var http = require('http');
var https = require('https'); var https = require('https');
var flash = require('connect-flash'); var flash = require('connect-flash');
var morgan = require('morgan');
var express = require('express'); var express = require('express');
var session = require('express-session'); var session = require('express-session');
var morgan = require('morgan');
var passport = require('passport'); var passport = require('passport');
var mongoose = require('mongoose'); var mongoose = require('mongoose');
var bodyParser = require('body-parser'); var bodyParser = require('body-parser');
@@ -204,13 +204,6 @@ var accessTokenStrategy = new PassportOAuthBearer(function(token, done) {
passport.use(accessTokenStrategy); passport.use(accessTokenStrategy);
app.get('/cleanDB', function(req,res){
Account.remove({});
Devices.remove({});
Topics.remove({});
res.send();
});
app.get('/', function(req,res){ app.get('/', function(req,res){
res.render('pages/index', {user: req.user, home: true}); res.render('pages/index', {user: req.user, home: true});
}); });
@@ -624,44 +617,51 @@ app.delete('/service/:id',
}); });
// Work around for not being able to access Mongo from container // Work around for not being able to access Mongo from container
app.post('/mqtt/auth',function(req,res){ // app.post('/mqtt/auth',function(req,res){
var username = req.body.username; // var username = req.body.username;
var password = req.body.password; // var password = req.body.password;
var topic = req.body.topic; // var topic = req.body.topic;
var acc = req.body.acc; // var acc = req.body.acc;
passport.authenticate('local',function(err,user,info){ // passport.authenticate('local',function(err,user,info){
if (!err && user) { // if (!err && user) {
return res.status(200).send(); // return res.status(200).send();
} else { // } else {
return res.status(401).send(); // return res.status(401).send();
} // }
})(req, res, function () { // })(req, res, function () {
}); // });
}); // });
app.post('/mqtt/acl',function(req,res){ // app.post('/mqtt/acl',function(req,res){
var username = req.body.username; // var username = req.body.username;
var clientid = req.body.clientid; // var clientid = req.body.clientid;
var topic = req.body.topic; // var topic = req.body.topic;
var acc = req.body.acc; // var acc = req.body.acc;
if (topic.indexOf(username+'/') === 0) { // if (topic.indexOf(username+'/') === 0) {
res.status(200).send(); // res.status(200).send();
} else { // } else {
res.status(401).send(); // res.status(401).send();
} // }
}); // });
app.post('/mqtt/superuser',function(req,res){ // app.post('/mqtt/superuser',function(req,res){
var username = req.body.username; // var username = req.body.username;
if (username === mqtt_user) { // if (username === mqtt_user) {
res.status(200).send(); // res.status(200).send();
} else { // } else {
res.status(401).send(); // res.status(401).send();
} // }
}); // });
// app.get('/cleanDB', function(req,res){
// Account.remove({});
// Devices.remove({});
// Topics.remove({});
// res.send();
// });
var server = http.Server(app); var server = http.Server(app);
if (app_id.match(/^https:\/\/localhost:/)) { if (app_id.match(/^https:\/\/localhost:/)) {

Binary file not shown.

After

Width:  |  Height:  |  Size: 618 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 641 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 603 B