From c85e131bc1410dbeb8215bb90438b5eab1e9f000 Mon Sep 17 00:00:00 2001
From: Pierre CLEMENT <pierre.clement@giroptic.com>
Date: Mon, 8 Jan 2018 21:02:40 +0100
Subject: [PATCH] fix(all): check onlyModels server side

---
 node-red-contrib-xiaomi-all/xiaomi-all.html | 11 +----------
 node-red-contrib-xiaomi-all/xiaomi-all.js   | 11 +++++++++--
 package.json                                |  2 +-
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/node-red-contrib-xiaomi-all/xiaomi-all.html b/node-red-contrib-xiaomi-all/xiaomi-all.html
index 93046db..e63c67a 100644
--- a/node-red-contrib-xiaomi-all/xiaomi-all.html
+++ b/node-red-contrib-xiaomi-all/xiaomi-all.html
@@ -1,12 +1,4 @@
 <script type="text/javascript">
-    function getOnlyModelsValue(input) {
-        var cleanOnlyModels = [];
-        input.forEach(function(value) {
-            cleanOnlyModels = cleanOnlyModels.concat(value.split(','));
-        });
-        return cleanOnlyModels;
-    }
-
     RED.nodes.registerType('xiaomi-all', {
         category: 'xiaomi',
         color: '#3FADB5',
@@ -32,7 +24,7 @@
                 if (configNodeID) {
                     var configNode = RED.nodes.node(configNodeID);
                     if(configNode) {
-                        onlyModels = getOnlyModelsValue(onlyModels || $('#node-input-onlyModels').val() || []);
+                        onlyModels = onlyModels || $('#node-input-onlyModels').val() || [];
                         excludedSids = excludedSids || $('#node-input-excludedSids').val() || [];
                         $('#node-input-excludedSids').empty();
                         for (key in configNode.deviceList) {
@@ -61,7 +53,6 @@
             if(!$('#node-input-excludedSids').val()) {
                 this.excludedSids = [];
             }
-            this.onlyModels = getOnlyModelsValue(this.onlyModels);
         }
     });
 </script>
diff --git a/node-red-contrib-xiaomi-all/xiaomi-all.js b/node-red-contrib-xiaomi-all/xiaomi-all.js
index b6317da..d4262a9 100644
--- a/node-red-contrib-xiaomi-all/xiaomi-all.js
+++ b/node-red-contrib-xiaomi-all/xiaomi-all.js
@@ -1,15 +1,22 @@
 module.exports = (RED) => {
-
+    function getOnlyModelsValue(input) {
+        var cleanOnlyModels = [];
+        input.forEach((value) => {
+            cleanOnlyModels = cleanOnlyModels.concat(value.split(','));
+        });
+        return cleanOnlyModels;
+    }
 
     function XiaomiAllNode(config) {
         RED.nodes.createNode(this, config);
         this.gateway = RED.nodes.getNode(config.gateway);
-        this.onlyModels = config.onlyModels;
+        this.onlyModels = getOnlyModelsValue(config.onlyModels || []);
         this.excludedSids = config.excludedSids;
         console.log(this.onlyModels);
 
 
         this.isDeviceValid = (device) => {
+            console.log(device.sid, device.model, this.onlyModels, this.excludeSids);
             if((!this.onlyModels || this.onlyModels.length == 0) && (!this.excludedSids || this.excludedSids.length == 0)) {
                 return true;
             }
diff --git a/package.json b/package.json
index 9097296..14c6322 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-mi-devices",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "description": "A set of nodes to control some of the popular Xiaomi sensors which are connected to the Xiaomi Gateway, and the Gateway itself.",
   "repository": {
     "type": "git",