From 13bb819e07d51e7d1aafc989f89139dc8df91258 Mon Sep 17 00:00:00 2001
From: Kevin Fronczak <kfronczak@gmail.com>
Date: Tue, 16 Oct 2018 13:28:44 -0400
Subject: [PATCH] Added network checking

---
 blinkpy/blinkpy.py    | 17 +++++++++--------
 tests/test_blinkpy.py | 12 ++++++++----
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/blinkpy/blinkpy.py b/blinkpy/blinkpy.py
index 3f1ca62..e5fe32c 100644
--- a/blinkpy/blinkpy.py
+++ b/blinkpy/blinkpy.py
@@ -55,6 +55,7 @@ class Blink():
         self.last_refresh = None
         self.refresh_rate = refresh_rate
         self.session = None
+        self.networks = []
         self._login_url = LOGIN_URL
 
     @property
@@ -123,7 +124,7 @@ class Blink():
         self._token = response['authtoken']['authtoken']
         self._auth_header = {'Host': self._host,
                              'TOKEN_AUTH': self._token}
-
+        self.networks = response['networks']
         self.urls = BlinkURLHandler(self.region_id)
         self._login_url = login_url
 
@@ -135,14 +136,14 @@ class Blink():
         # Look for only onboarded network, flag warning if multiple
         # since it's unexpected
         all_networks = []
-        network_data = {}
-        for network in response['networks']:
-            if network['onboarded']:
-                all_networks.append(network['id'])
-                network_data[str(network['id'])] = network
+        for network, status in self.networks.items():
+            if status['onboarded']:
+                all_networks.append(network)
         self.network_id = all_networks.pop(0)
-        self.account_id = network_data[str(self.network_id)]
-        if not all_networks:
+        for resp in response['networks']:
+            if str(resp['id']) == self.network_id:
+                self.account_id = resp['account_id']
+        if all_networks:
             _LOGGER.error(("More than one unboarded network. "
                            "Platform may not work as intended. "
                            "Please open an issue on "
diff --git a/tests/test_blinkpy.py b/tests/test_blinkpy.py
index 5aec138..0f5dadd 100644
--- a/tests/test_blinkpy.py
+++ b/tests/test_blinkpy.py
@@ -104,11 +104,15 @@ class TestBlinkSetup(unittest.TestCase):
     def test_multiple_networks(self, mock_net, mock_sess):
         """Check that we handle multiple networks appropriately."""
         mock_net.return_value = {
-            'networks': [{'account_id': 1111, 'id': 1234},
-                         {'account_id': 1111, 'id': 5678}]
-            }
+            'networks': [{'id': 1234, 'account_id': 1111},
+                         {'id': 5678, 'account_id': 2222}]
+        }
+        self.blink.networks = {'0000': {'onboarded': False},
+                               '5678': {'onboarded': True},
+                               '1234': {'onboarded': False}}
         self.blink.get_ids()
-        self.assertEqual(self.blink.network_id, [1234, 5678])
+        self.assertEqual(self.blink.network_id, '5678')
+        self.assertEqual(self.blink.account_id, 2222)
 
     @mock.patch('blinkpy.blinkpy.time.time')
     def test_throttle(self, mock_time, mock_sess):