Merge branch 'v0.4.2'

Nekmo · Feb 26, 2018 · 095f504 · 095f504
2 parents 0ddeba9 + 5bfbd2c
commit 095f504
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 2 deletions.
diff --git a/amazon_dash/config.py b/amazon_dash/config.py
@@ -66,6 +66,9 @@
                                 {"pattern": "PATCH|patch"},
                             ]
                         },
+                        "headers": {
+                            "type": "object",
+                        },
                         "content-type": {
                             "type": "string"
                         },

diff --git a/amazon_dash/execute.py b/amazon_dash/execute.py
@@ -169,9 +169,9 @@ def execute(self, root_allowed=False):
         :param bool root_allowed: Only used for ExecuteCmd
         :return:
         """
-        kwargs = {}
+        kwargs = {'headers': self.data.get('headers', {})}
         if self.data.get('content-type'):
-            kwargs['headers'] = {'content-type': self.data['content-type']}
+            kwargs['headers']['content-type'] = self.data['content-type']
         if self.data.get('body'):
             kwargs['data'] = self.data['body']
         try:

diff --git a/amazon_dash/install/amazon-dash.yml b/amazon_dash/install/amazon-dash.yml
@@ -15,6 +15,7 @@ devices:
 #    name: Kit Kat
 #    url: 'http://domain.com/path/to/webhook'  # Url to execute
 #    method: post  # HTTP method. By default GET
+#    headers: {"authorization": "key"}
 #    content-type: json  # Only available if Body is defined
 #    body: '{"mac": "AC:63:BE:67:B2:F1", "action": "toggleLight"}'  # Request payload. Remember the quotes
 

diff --git a/amazon_dash/tests/test_execute.py b/amazon_dash/tests/test_execute.py
@@ -103,6 +103,18 @@ def test_execute(self):
         execute_url.execute()
         self.assertTrue(self.get_mock.called_once)
 
+    def test_execute_headers(self):
+        self.session_mock.post(self.url, request_headers={'authorization': 'foo'})
+        execute_url = ExecuteUrl('key', dict(self.get_default_data(), method='post',
+                                             **{'headers': {'authorization': 'foo'}}))
+        execute_url.validate()
+        execute_url.execute()
+        execute_url2 = ExecuteUrl('key', dict(self.get_default_data(), method='post',
+                                             **{'headers': {'authorization': 'bar'}}))
+        execute_url2.validate()
+        with self.assertRaises(NoMockAddress):
+            execute_url2.execute()
+
     def test_execute_content_type(self):
         self.session_mock.post(self.url, request_headers={'content-type': 'foo'})
         execute_url = ExecuteUrl('key', dict(self.get_default_data(), method='post',

diff --git a/docs/config_file.rst b/docs/config_file.rst
@@ -45,6 +45,7 @@ Call url
 When the **url execution method** is used, the following options are available.
 
 * **method**: HTTP method. By default GET.
+* **headers**: Headers to send to server. Content-Type will be overwritten if it is defined later.
 * **content-type** (*): HTTP Content-Type Header. Only available if Body is defined. If body is defined, default is form.
 * **body**: Request payload. Only if the method is POST/PUT/PATCH. In json or form mode, the content must be a valid json. It is recommended to use single quotes before and after content in json.