From 32db1fd07a46c26e820fb4d93038830641473e85 Mon Sep 17 00:00:00 2001
From: Koen Kanters <koenkanters94@gmail.com>
Date: Mon, 1 Apr 2019 20:30:27 +0200
Subject: [PATCH] Fix acceptDevIncoming. #538

---
 lib/zigbee.js | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/lib/zigbee.js b/lib/zigbee.js
index e93279685..e45173475 100644
--- a/lib/zigbee.js
+++ b/lib/zigbee.js
@@ -103,23 +103,12 @@ class Zigbee {
             `Accept device incoming with ieeeAddr '${devInfo.ieeeAddr}' permit join is '${this.getPermitJoin()}'`
         );
 
-        if (this.getPermitJoin()) {
-            if (settings.get().ban.includes(devInfo.ieeeAddr)) {
-                logger.info(`Banned device tried to connect (${devInfo.ieeeAddr})`);
-                callback(null, false);
-            } else {
-                logger.debug(`Allowing device '${devInfo.ieeeAddr}' to join`);
-                callback(null, true);
-            }
+        if (settings.get().ban.includes(devInfo.ieeeAddr)) {
+            logger.info(`Banned device tried to connect (${devInfo.ieeeAddr})`);
+            callback(null, false);
         } else {
-            if (this.getAllClients().find((d) => d.ieeeAddr === devInfo.ieeeAddr)) {
-                // Allow already connected devices to rejoin.
-                logger.debug(`Allowing device '${devInfo.ieeeAddr}' to join (already connected device)`);
-                callback(null, true);
-            } else {
-                logger.debug(`Not allowing '${devInfo.ieeeAddr}' to join`);
-                callback(null, false);
-            }
+            logger.debug(`Allowing device '${devInfo.ieeeAddr}' to join`);
+            callback(null, true);
         }
     }