Merge pull request #146 from DewGew/beta

Fix 2FA issue with Pin code

const.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 """Constants for Google Assistant."""
-VERSION = '1.7.2'
+VERSION = '1.7.3'
 PUBLIC_URL = 'https://[your public url]'
 CONFIGFILE = 'config/config.yaml'
 LOGFILE = 'dzga.log'

trait.py

@@ -181,7 +181,7 @@ def execute(self, command, params):
                     'On' if params['on'] else 'Off')
 
             if protected:
-                url = url + '&passcode=' + configuration['switchProtectionPass']
+                url = url + '&passcode=' + configuration['Domoticz']['switchProtectionPass']
 
             r = requests.get(url, auth=CREDITS)
             if protected:
@@ -225,7 +225,7 @@ def execute(self, command, params):
         url = DOMOTICZ_URL + '/json.htm?type=command&param=switchscene&idx=' + self.state.id + '&switchcmd=On'
 
         if protected:
-            url = url + '&passcode=' + configuration['switchProtectionPass']
+            url = url + '&passcode=' + configuration['Domoticz']['switchProtectionPass']
 
         r = requests.get(url, auth=CREDITS)
         if protected:
@@ -290,7 +290,7 @@ def execute(self, command, params):
             int(params['brightness'] * self.state.maxdimlevel / 100))
 
         if protected:
-            url = url + '&passcode=' + configuration['switchProtectionPass']
+            url = url + '&passcode=' + configuration['Domoticz']['switchProtectionPass']
 
         r = requests.get(url, auth=CREDITS)
         if protected:
@@ -368,7 +368,7 @@ def execute(self, command, params):
                 url += 'On'
 
         if protected:
-            url = url + '&passcode=' + configuration['switchProtectionPass']
+            url = url + '&passcode=' + configuration['Domoticz']['switchProtectionPass']
 
         r = requests.get(url, auth=CREDITS)
         if protected:
@@ -431,7 +431,7 @@ def execute(self, command, params):
                     'On' if params['start'] else 'Off')
 
             if protected:
-                url = url + '&passcode=' + configuration['switchProtectionPass']
+                url = url + '&passcode=' + configuration['Domoticz']['switchProtectionPass']
 
             r = requests.get(url, auth=CREDITS)
             if protected:
@@ -513,7 +513,7 @@ def execute(self, command, params):
         # url = DOMOTICZ_URL + '/json.htm?type=command&param=switchlight&idx=' + self.state.id + '&switchcmd=Set%20Level&level=' + level
 
         # if protected:
-            # url = url + '&passcode=' + configuration['switchProtectionPass']
+            # url = url + '&passcode=' + configuration['Domoticz']['switchProtectionPass']
 
         # r = requests.get(url, auth=CREDITS)
 
@@ -760,7 +760,7 @@ def execute(self, command, params):
                                                                                              self.state.entity_id))
 
         if protected:
-            url = url + '&passcode=' + configuration['switchProtectionPass']
+            url = url + '&passcode=' + configuration['Domoticz']['switchProtectionPass']
 
         r = requests.get(url, auth=CREDITS)
         if protected:
@@ -1101,7 +1101,7 @@ def execute(self, command, params):
         url = DOMOTICZ_URL + '/json.htm?type=command&param=switchlight&idx=' + self.state.id + '&switchcmd=Set%20Level&level=' + level
 
         if protected:
-            url = url + '&passcode=' + configuration['switchProtectionPass']
+            url = url + '&passcode=' + configuration['Domoticz']['switchProtectionPass']
 
         r = requests.get(url, auth=CREDITS)
 
@@ -1228,7 +1228,7 @@ def execute(self, command, params):
                 # 'On' if params['charge'] else 'Off')
 
             # if protected:
-                # url = url + '&passcode=' + configuration['switchProtectionPass']
+                # url = url + '&passcode=' + configuration['Domoticz']['switchProtectionPass']
 
             # r = requests.get(url, auth=CREDITS)
             # if protected: