Merge pull request #70 from NabuCasa/dev

0.15

hass_nabucasa/__init__.py

@@ -34,6 +34,7 @@ def __init__(
         subscription_info_url=None,
         cloudhook_create_url=None,
         remote_api_url=None,
+        alexa_access_token_url=None,
         acme_directory_server=None,
     ):
         """Create an instance of Cloud."""
@@ -56,6 +57,7 @@ def __init__(
             self.subscription_info_url = subscription_info_url
             self.cloudhook_create_url = cloudhook_create_url
             self.remote_api_url = remote_api_url
+            self.alexa_access_token_url = alexa_access_token_url
             self.acme_directory_server = acme_directory_server
 
         else:
@@ -69,6 +71,7 @@ def __init__(
             self.subscription_info_url = info["subscription_info_url"]
             self.cloudhook_create_url = info["cloudhook_create_url"]
             self.remote_api_url = info["remote_api_url"]
+            self.alexa_access_token_url = info["alexa_access_token_url"]
             self.acme_directory_server = info["acme_directory_server"]
 
     @property
@@ -184,6 +187,8 @@ def load_config():
 
         info = await self.run_executor(load_config)
 
+        await self.client.async_initialize(self)
+
         if info is None:
             return
 

hass_nabucasa/client.py

@@ -1,10 +1,13 @@
 """Client interface for Home Assistant to cloud."""
 import asyncio
 from pathlib import Path
-from typing import Dict, Any
+from typing import Dict, Any, TYPE_CHECKING
 
 import aiohttp
 
+if TYPE_CHECKING:
+    from . import Cloud
+
 
 class CloudClient:
     """Interface class for Home Assistant."""
@@ -39,6 +42,10 @@ def remote_autostart(self) -> bool:
         """Return true if we want start a remote connection."""
         raise NotImplementedError()
 
+    async def async_initialize(self, cloud: "Cloud") -> None:
+        """Initialize the client."""
+        raise NotImplementedError()
+
     async def cleanups(self) -> None:
         """Called on logout."""
         raise NotImplementedError()

hass_nabucasa/cloud_api.py

@@ -80,3 +80,11 @@ async def async_remote_challenge_cleanup(cloud, txt: str):
     return await cloud.websession.post(
         url, headers={AUTHORIZATION: cloud.id_token}, json={"txt": txt}
     )
+
+
+@_check_token
+async def async_alexa_access_token(cloud):
+    """Create a cloudhook."""
+    return await cloud.websession.post(
+        cloud.alexa_access_token_url, headers={AUTHORIZATION: cloud.id_token}
+    )

hass_nabucasa/const.py

@@ -30,6 +30,7 @@
         ),
         "cloudhook_create_url": "https://webhooks-api.nabucasa.com/generate",
         "remote_api_url": "https://remote-sni-api.nabucasa.com",
+        "alexa_access_token_url": "https://alexa-api.nabucasa.com/access_token",
         "acme_directory_server": "https://acme-v02.api.letsencrypt.org/directory",
     }
 }

setup.py

@@ -1,6 +1,6 @@
 from setuptools import setup
 
-VERSION = "0.14"
+VERSION = "0.15"
 
 setup(
     name="hass-nabucasa",

tests/common.py

@@ -5,6 +5,7 @@
 import tempfile
 from typing import Optional, Any
 
+from hass_nabucasa import Cloud
 from hass_nabucasa.client import CloudClient
 
 
@@ -73,6 +74,10 @@ def remote_autostart(self) -> bool:
         """Return true if we want start a remote connection."""
         return self.prop_remote_autostart
 
+    async def async_initialize(self, cloud: "Cloud") -> None:
+        """Initialize the client."""
+        self.cloud = cloud
+
     async def cleanups(self):
         """Need nothing to do."""
 

tests/test_cloud_api.py

@@ -97,3 +97,13 @@ async def test_remote_challenge_cleanup(cloud_mock, aioclient_mock):
     resp = await cloud_api.async_remote_challenge_cleanup(cloud_mock, "123456")
     assert len(aioclient_mock.mock_calls) == 1
     assert aioclient_mock.mock_calls[0][2] == {"txt": "123456"}
+
+
+async def test_get_access_token(cloud_mock, aioclient_mock):
+    """Test creating a cloudhook."""
+    aioclient_mock.post("https://example.com/bla")
+    cloud_mock.id_token = "mock-id-token"
+    cloud_mock.alexa_access_token_url = "https://example.com/bla"
+
+    resp = await cloud_api.async_alexa_access_token(cloud_mock)
+    assert len(aioclient_mock.mock_calls) == 1

tests/test_init.py

@@ -25,6 +25,7 @@ def test_constructor_loads_info_from_constant(cloud_client):
                 "subscription_info_url": "test-subscription-info-url",
                 "cloudhook_create_url": "test-cloudhook_create_url",
                 "remote_api_url": "test-remote_api_url",
+                "alexa_access_token_url": "test-alexa-token-url",
                 "acme_directory_server": "test-acme-directory-server",
             }
         },