node-red-contrib-remote 1.5.1 → 1.5.3

package/README.md

@@ -36,9 +36,15 @@ You will find more information on [www.remote-red-com](https://www.remote-red.co
 
 ## Version History
 
+Version 1.5.3
+- Improved error logging while the instance registration process.
+
+Version 1.5.2
+- Compatibility to 'node-red-contrib-remote-cli'.
+
 Version 1.5.1
 - Added support for running Node-RED with a self signed https certificate.
-- Notifications and Questions will automatically convert values to string if a string is needed (e.g. title and body). 
+- Notifications and Questions will automatically convert values to string if a string is needed (e.g. title and body).
 
 Version 1.5.0
 - Geofencing! You can add geofences in the apps. Entering and leaving them will trigger a message on the new output of the remote access node.

package/nodes/remote-config.js

@@ -34,16 +34,28 @@ module.exports = function(RED) {
     res.json(ipData);
   });
 
-  RED.httpAdmin.get("/contrib-remote/requestInstanceHash/:region", RED.auth.needsPermission('remote-config.read'), function(req,res) {
+  RED.httpAdmin.get("/contrib-remote/requestInstanceHash/:regionorserver", RED.auth.needsPermission('remote-config.read'), function(req,res) {
     // Call API for a instacehash and a instanceauth
     const axiosInstance = commons.createAxiosInstance();
-    console.log('https://contact-' + req.params.region + '.remote-red.com/instanceHashRequest')
-    axiosInstance.post('https://contact-' + req.params.region + '.remote-red.com/instanceHashRequest', {})
+
+    // Region or server?
+    let url = '';
+    if (req.params.regionorserver.includes('.')) {
+      // server
+      url = 'https://api-' + req.params.regionorserver + '/instanceHashRequest';
+    } else {
+      // region
+      url = 'https://contact-' + req.params.regionorserver + '.remote-red.com/instanceHashRequest';
+    }
+
+    // Call API
+    axiosInstance.post(url, {})
     .then(response => {
       res.json(response.data);
     })
     .catch((error) => {
       console.log("ERROR: requestInstanceHash: " + error);
+      console.error(error);
       let errorMessage = error.message;
       if ( error.response && error.response.data && error.response.data.message ) {
         errorMessage = errorMessage + " / " + error.response.data.message;
@@ -56,11 +68,12 @@ module.exports = function(RED) {
   });
 
   RED.httpAdmin.post("/contrib-remote/registerApp", RED.auth.needsPermission('remote-config.read'), function(req,res) {
-    // Call API for a instacehash and a instanceauth
+    // Call API for a appHash and password
     const axiosInstance = commons.createAxiosInstance();
     axiosInstance.post(`https://api-${req.body.server}/registerApp`, {
       'instancehash': req.body.instancehash,
-      'instanceauth': req.body.instanceauth
+      'instanceauth': req.body.instanceauth,
+      'customerhash': req.body.customerhash
     })
     .then(response => {
       var localip = req.body.host;
@@ -96,6 +109,7 @@ module.exports = function(RED) {
     })
     .catch((error) => {
       console.log("ERROR: registerApp: " + error);
+      console.error(error);
       let errorMessage = error.message;
       if ( error.response && error.response.data && error.response.data.message ) {
         errorMessage = errorMessage + " / " + error.response.data.message;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-remote",
-  "version": "1.5.1",
+  "version": "1.5.3",
   "description": "Remote-RED is an ecosystem to bring remote access, push notification and geofencing to Node-RED. There are also additional functions like directly answer on a notification and homescreen widgets.",
   "author": "Thorsten Heilmann",
   "license": "GPL-3.0",