Fix open commissioning window (#222)

home-assistant-libs · May 22, 2023 · 2f3341f · 2f3341f
1 parent 6adac32
commit 2f3341f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/matter_server/client/client.py b/matter_server/client/client.py
@@ -137,16 +137,16 @@ async def open_commissioning_window(
         node_id: int,
         timeout: int = 300,
         iteration: int = 1000,
-        option: int = 0,
+        option: int = 1,
         discriminator: Optional[int] = None,
-    ) -> int:
+    ) -> tuple[int, str]:
         """
         Open a commissioning window to commission a device present on this controller to another.
 
         Returns code to use as discriminator.
         """
         return cast(
-            int,
+            tuple[int, str],
             await self.send_command(
                 APICommand.OPEN_COMMISSIONING_WINDOW,
                 node_id=node_id,

diff --git a/matter_server/server/device_controller.py b/matter_server/server/device_controller.py
@@ -240,9 +240,9 @@ async def open_commissioning_window(
         node_id: int,
         timeout: int = 300,
         iteration: int = 1000,
-        option: int = 0,
+        option: int = 1,
         discriminator: int | None = None,
-    ) -> int:
+    ) -> tuple[int, str]:
         """
         Open a commissioning window to commission a device present on this controller to another.
 
@@ -254,15 +254,15 @@ async def open_commissioning_window(
         if discriminator is None:
             discriminator = 3840  # TODO generate random one
 
-        await self._call_sdk(
+        pin, code = await self._call_sdk(
             self.chip_controller.OpenCommissioningWindow,
             nodeid=node_id,
             timeout=timeout,
             iteration=iteration,
             discriminator=discriminator,
             option=option,
         )
-        return discriminator
+        return pin, code
 
     @api_command(APICommand.DISCOVER)
     async def discover_commissionable_nodes(

diff --git a/tests/server/test_server.py b/tests/server/test_server.py
@@ -220,7 +220,7 @@ async def test_server_start(
         "node_id": 1,
         "timeout": 300,
         "iteration": 1000,
-        "option": 0,
+        "option": 1,
         "discriminator": None,
     }
     assert not (