Use the Credentials of RED

This commit is contained in:
Antoine Aflalo 2014-04-20 14:20:44 +03:00
parent e85d1705a8
commit 4c6da0bf46
2 changed files with 61 additions and 43 deletions

View File

@ -37,6 +37,7 @@
</script> </script>
<script type="text/x-red" data-help-name="pushbullet"> <script type="text/x-red" data-help-name="pushbullet">
@ -47,6 +48,7 @@
</script> </script>
@ -67,6 +69,7 @@
</script> </script>
<script type="text/javascript"> <script type="text/javascript">
@ -123,7 +126,9 @@
RED.nodes.registerType('pushbullet', { RED.nodes.registerType('pushbullet', {
category: 'output', category: 'output',
defaults: { defaults: {
device: {type: "bullet-device", required: true}, device: {type: "bullet-device", validate: function (v) {
return hasGlobal || (v && v != "_ADD_")
}},
title: {value: ""}, title: {value: ""},
name: {value: ""} name: {value: ""}
}, },
@ -149,7 +154,7 @@
} }
}); });
$("#node-input-credentials-row").show(); $("#node-input-credentials-row").show();
if (!this.twilio) { if (!this.device) {
$("#node-input-creds").val("global"); $("#node-input-creds").val("global");
} else { } else {
$("#node-input-creds").val("local"); $("#node-input-creds").val("local");

View File

@ -52,10 +52,10 @@ RED.httpAdmin.post('/pushbullet-api/:id',function(req,res) {
req.on('end', function () { req.on('end', function () {
var newCreds = querystring.parse(body); var newCreds = querystring.parse(body);
var credentials = RED.nodes.getCredentials(req.params.id) || {}; var credentials = RED.nodes.getCredentials(req.params.id) || {};
if (newCreds.token == "") { if (newCreds.apikey == "") {
delete credentials.apikey; delete credentials.apikey;
} else { } else {
credentials.apikey = newCreds.token; credentials.apikey = newCreds.apikey;
} }
RED.nodes.addCredentials(req.params.id, credentials); RED.nodes.addCredentials(req.params.id, credentials);
res.send(200); res.send(200);
@ -65,8 +65,11 @@ RED.httpAdmin.post('/pushbullet-api/:id',function(req,res) {
function PushBulletDevice(n) { function PushBulletDevice(n) {
RED.nodes.createNode(this, n); RED.nodes.createNode(this, n);
this.name = n.name; this.name = n.name;
this.apikey = n.apikey;
this.deviceid = n.deviceid; this.deviceid = n.deviceid;
var credentials = RED.nodes.getCredentials(n.id);
if (credentials) {
this.apikey = credentials.apikey;
}
} }
RED.nodes.registerType("bullet-device", PushBulletDevice); RED.nodes.registerType("bullet-device", PushBulletDevice);
@ -74,20 +77,33 @@ function PushbulletNode(n) {
RED.nodes.createNode(this, n); RED.nodes.createNode(this, n);
this.title = n.title; this.title = n.title;
var node = this; var node = this;
this.device = n.device; this.api = RED.nodes.getNode(n.device);
this.deviceInfo = RED.nodes.getNode(this.device);
var pusher = new PushBullet(this.deviceInfo.apikey); if (this.api) {
var deviceId = this.deviceInfo.deviceid; this.pusher = new PushBullet(this.api.apikey);
this.deviceId = this.api.deviceid;
} else if (pushkey) {
this.pusher = new PushBullet(pushkey.pushbullet);
this.deviceId = pushkey.deviceid;
} else {
this.error("missing pushbullet credentials");
return;
}
this.on("input", function (msg) { this.on("input", function (msg) {
var titl = this.title || msg.topic || "Node-RED"; var titl = this.title || msg.topic || "Node-RED";
if (typeof(msg.payload) === 'object') { if (typeof(msg.payload) === 'object') {
msg.payload = JSON.stringify(msg.payload); msg.payload = JSON.stringify(msg.payload);
} }
else { msg.payload = msg.payload.toString(); } else {
if (this.deviceInfo.apikey && this.deviceInfo.deviceid) { msg.payload = msg.payload.toString();
}
try { try {
if (!isNaN(deviceId)) { deviceId = Number(deviceId); } if (!isNaN(this.deviceId)) {
pusher.note(deviceId, titl, msg.payload, function(err, response) { this.deviceId = Number(this.deviceId);
}
this.pusher.note(this.deviceId, titl, msg.payload, function (err, response) {
if (err) node.error("Pushbullet error: " + err); if (err) node.error("Pushbullet error: " + err);
//console.log(response); //console.log(response);
}); });
@ -95,10 +111,7 @@ function PushbulletNode(n) {
catch (err) { catch (err) {
node.error(err); node.error(err);
} }
}
else {
node.warn("Pushbullet credentials not set/found. See node info.");
}
}); });
} }