Commit 203665ed by Mine ArithmeticOp

check group not null before pubsub

parent f9fd9373
...@@ -39,7 +39,7 @@ module.exports = function (options = {}) { ...@@ -39,7 +39,7 @@ module.exports = function (options = {}) {
var output = {}; var output = {};
GGID.getGroupID(req.body.username, req.body.client_id, function (group) { GGID.getGroupID(req.body.username, req.body.client_id, function (group) {
console.log('group: ' + group) if (group) {
var _ftopic = require('./utils/router').rewriteTopic(topic, 'pub', group, req.body.client_id, output); // get topic where concat with groupID var _ftopic = require('./utils/router').rewriteTopic(topic, 'pub', group, req.body.client_id, output); // get topic where concat with groupID
response = { response = {
'result': 'ok', 'result': 'ok',
...@@ -59,7 +59,11 @@ module.exports = function (options = {}) { ...@@ -59,7 +59,11 @@ module.exports = function (options = {}) {
} }
res.send(response); res.send(response);
next(); next();
}
else {
res.send({ "result": "no" });
next();
}
}); });
} }
} }
......
...@@ -32,13 +32,13 @@ function authCheck(client_id, token, password, callback) { ...@@ -32,13 +32,13 @@ function authCheck(client_id, token, password, callback) {
// console.log('result : ' + util.inspect(res.result, false, null, true)) // console.log('result : ' + util.inspect(res.result, false, null, true))
if (res.result) { if (res.result) {
var token_profile = (res && res.result && res.result[0]) ? res.result[0] : {}; var token_profile = (res && res.result && res.result[0]) ? res.result[0] : {};
console.log('token_profile: ' + token_profile) console.log('token_profile: ' + util.inspect(token_profile, false, null, true))
var mqttauth = { var mqttauth = {
clientid: client_id, clientid: client_id,
token: token, token: token,
password: password password: password
}; };
console.log('mqttauth: ' + mqttauth) console.log('mqttauth: ' + util.inspect(mqttauth, false, null, true))
callback(validator.auth_connect(mqttauth, token_profile)); callback(validator.auth_connect(mqttauth, token_profile));
} }
else { else {
......
...@@ -37,7 +37,7 @@ module.exports = function (options = {}) { ...@@ -37,7 +37,7 @@ module.exports = function (options = {}) {
var GGID = require('./utils/getGroupID'); var GGID = require('./utils/getGroupID');
GGID.getGroupID(req.body.username, req.body.client_id, function (group) { GGID.getGroupID(req.body.username, req.body.client_id, function (group) {
console.log('group: ' + group) if (group) {
var _ftopic = require('./utils/router').rewriteTopic(topic, 'sub', group, req.body.client_id) // get topic where concat with groupID var _ftopic = require('./utils/router').rewriteTopic(topic, 'sub', group, req.body.client_id) // get topic where concat with groupID
var _topic = [{ // setTopic for response var _topic = [{ // setTopic for response
'topic': _ftopic, 'topic': _ftopic,
...@@ -54,6 +54,11 @@ module.exports = function (options = {}) { ...@@ -54,6 +54,11 @@ module.exports = function (options = {}) {
res.send(response); res.send(response);
next(); next();
}
else {
res.send({ "result": "no" });
next();
}
}); });
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment