moroen · Oct 28, 2019 · Oct 28, 2019 · Oct 28, 2019
Showing with 28 additions and 2 deletions.

+11 −0 ikeatradfri/http_server.py

+16 −2 ikeatradfri/routes.py

+1 −0 requirements.txt
diff --git a/ikeatradfri/http_server.py b/ikeatradfri/http_server.py
@@ -1,4 +1,5 @@
 from aiohttp import web
+import aiohttp_cors
 import asyncio
 import signal
 import logging
@@ -20,10 +21,20 @@ async def start(hostConfig):
     loop = asyncio.get_event_loop()
 
     app = web.Application()
+    # Configure default CORS settings.
+    cors = aiohttp_cors.setup(app, defaults={
+        "*": aiohttp_cors.ResourceOptions(
+            allow_credentials=True,
+            expose_headers="*",
+            allow_headers="*",
+        )
+    })
     try:
         app["api"], app["gateway"], APP_FACTORY = await connect_to_gateway(hostConfig)
 
         app.add_routes(routes)
+        for route in list(app.router.routes()):
+            cors.add(route)
 
         runner = web.AppRunner(app)
         await runner.setup()

diff --git a/ikeatradfri/routes.py b/ikeatradfri/routes.py
@@ -1,5 +1,8 @@
 from aiohttp import web
 
+from aiohttp_cors import CorsConfig, APP_CONFIG_KEY
+from aiohttp_cors import ResourceOptions, CorsViewMixin, custom_cors
+
 try:
     from . import devices as Devices
     from . import server_commands as Server_Commands
@@ -40,7 +43,15 @@ async def listdevices(request):
 
 
 @routes.view("/devices/{id}")
-class DeviceView(web.View):
+class DeviceView(web.View, CorsViewMixin):
+    cors_config = {
+        "*": ResourceOptions(
+            allow_credentials=True,
+            expose_headers="*",
+            allow_headers="*",
+        )
+    }
+
     async def get(self):
         device = await Devices.get_device(
             self.request.app["api"],
@@ -53,7 +64,10 @@ async def get(self):
 
     async def put(self):
         if self.request.body_exists:
-            return web.json_response(await Server_Commands.serverCommand(self.request))
+            try:
+                return web.json_response(await Server_Commands.serverCommand(self.request))
+            except TypeError:  # Can't serialize, bypass for now
+                return web.json_response(None)
         else:
             return web.json_response(
                 Server_Commands.return_object(

diff --git a/requirements.txt b/requirements.txt
@@ -1,5 +1,6 @@
 aiocoap==0.4a1
 aiohttp==4.0.0a0
+aiohttp_cors==0.7.0
 appdirs==1.4.3
 async-timeout==3.0.1
 attrs==19.1.0