Allow disabling polling and fix oauth (#105)

* Add support for disabling polling

* Fix Nissan oauth realm changes

* Disable polling by default

Author: dan-r

README.md

@@ -43,12 +43,12 @@ From the Home Assistant Integrations page, search for and add the Nissan Connect
 
 ## Update Time
 Terminology used for this integration:
-* Polling - the car is woken up and new status is reported
+* Polling - the car is woken up and new status is reported. This is disabled by default, but can be enabled by setting the polling interval to a non-zero value
 * Update - data is fetched from Nissan but the car is not woken up
 
-Following the model of leaf2mqtt, this integration can be set to use a different update time when plugged in. When HVAC is turned on the update time drops to once per minute.
+Following the model of leaf2mqtt, this integration can be set to use a different polling time when plugged in. When HVAC is turned on the polling time always drops to once per minute.
 
-To prevent excessive 12v battery drain when plugged in but not charging for extended periods of time, the interval reverts to the standard update interval after 4 consecutive updates show the car as plugged in but not charging.
+To prevent excessive 12v battery drain when plugged in but not charging for extended periods of time, the polling interval reverts to the standard interval after 4 consecutive updates show the car as plugged in but not charging.
 This logic was added to give the benefit of quicker response times on the charging status binary sensor, which can be especially useful when charging with load-balanced or 'smart' chargers.
 
 ## Translations

custom_components/nissan_connect/const.py

@@ -7,7 +7,7 @@
 DATA_COORDINATOR_POLL = "coordinator_poll"
 DATA_COORDINATOR_STATISTICS = "coordinator_statistics"
 
-DEFAULT_INTERVAL_POLL = 60
+DEFAULT_INTERVAL_POLL = 0
 DEFAULT_INTERVAL_CHARGING = 15
 DEFAULT_INTERVAL_STATISTICS = 60
 

custom_components/nissan_connect/coordinator.py

@@ -105,13 +105,13 @@ async def _async_update_data(self):
         try:
             for vehicle in self._vehicles:
                 time_since_updated = round((time() - self._last_updated[vehicle]) / 60)
-                if self._force_update[vehicle] or time_since_updated >= self._intervals[vehicle]:
+                if not self._intervals[vehicle] == 0 and (self._force_update[vehicle] or time_since_updated >= self._intervals[vehicle]):
                     _LOGGER.debug("Polling #%s as %d mins have elapsed (interval %d)", vehicle[-3:], time_since_updated, self._intervals[vehicle])
                     self._last_updated[vehicle] = int(time())
                     self._force_update[vehicle] = False
                     await self._hass.async_add_executor_job(self._vehicles[vehicle].refresh)
                 else:
-                    _LOGGER.debug("NOT polling #%s as %d mins have elapsed (interval %d)", vehicle[-3:], time_since_updated, self._intervals[vehicle])                   
+                    _LOGGER.debug("NOT polling #%s. %d mins have elapsed (interval %d)", vehicle[-3:], time_since_updated, self._intervals[vehicle])                   
         except BaseException:
             _LOGGER.warning("Error communicating with API")
             return False

custom_components/nissan_connect/kamereon/kamereon.py

@@ -151,9 +151,9 @@ def login(self, username=None, password=None):
             _LOGGER.error("Invalid credentials provided: %s", resp.text)
             raise RuntimeError("Invalid credentials")
 
-        oauth_authorize_url = '{}oauth2{}/authorize'.format(
+        oauth_authorize_url = '{}oauth2/{}/authorize'.format(
             self.settings['auth_base_url'],
-            oauth_data['realm']
+            self.settings['realm']
             )
         nonce = generate_nonce()
         resp = self.session.get(
@@ -168,9 +168,9 @@ def login(self, username=None, password=None):
             allow_redirects=False)
         oauth_authorize_url = resp.headers['location']
 
-        oauth_token_url = '{}oauth2{}/access_token'.format(
+        oauth_token_url = '{}oauth2/{}/access_token'.format(
             self.settings['auth_base_url'],
-            oauth_data['realm']
+            self.settings['realm']
             )
         self._oauth = OAuth2Session(
             client_id=self.settings['client_id'],

custom_components/nissan_connect/sensor.py

@@ -264,6 +264,7 @@ class ChargeTimeRequiredSensor(KamereonEntity, SensorEntity):
     _attr_translation_key = "charge_time"
     _attr_device_class = SensorDeviceClass.DURATION
     _attr_native_unit_of_measurement = UnitOfTime.MINUTES
+    _attr_suggested_unit_of_measurement = UnitOfTime.HOURS
 
     CHARGING_SPEED_NAME = {
         ChargingSpeed.FASTEST: '50kw',

custom_components/nissan_connect/translations/en.json

@@ -41,7 +41,7 @@
           },
           "data_description": {
             "password": "If you are not changing your credentials, leave the password field empty.",
-            "interval_charging": "The car will be woken up and new data requested at every polling interval.",
+            "interval_charging": "The car will be woken up and new data requested at every polling interval. 0 = Polling disabled",
             "interval_statistics": "On update intervals, the latest data will be fetched from Nissan but the car will not be woken up."
           }
         }