api: update users of api_client

Update users of `api_client` with the new URL and client structure.

Signed-off-by: Jordan Yates <jordan@embeint.com>

Author: JordanYates

src/infuse_iot/database.py

@@ -4,7 +4,7 @@
 import binascii
 
 from infuse_iot.api_client import Client
-from infuse_iot.api_client.api.default import get_shared_secret
+from infuse_iot.api_client.api.key import get_shared_secret
 from infuse_iot.api_client.models import Key
 from infuse_iot.credentials import get_api_key, load_network
 from infuse_iot.epacket.interface import Address as InterfaceAddress
@@ -98,9 +98,7 @@ def observe_security_state(self, address: int, cloud_key: bytes, device_key: byt
         self.devices[address].network_id = network_id
         self.devices[address].public_key = device_key
 
-        client = Client(base_url="https://api.dev.infuse-iot.com").with_headers(
-            {"x-api-key": f"Bearer {get_api_key()}"}
-        )
+        client = Client(base_url="https://api.infuse-iot.com").with_headers({"x-api-key": f"Bearer {get_api_key()}"})
 
         with client as client:
             body = Key(base64.b64encode(device_key).decode("utf-8"))

src/infuse_iot/tools/cloud.py

@@ -12,11 +12,13 @@
 from tabulate import tabulate
 
 from infuse_iot.api_client import Client
-from infuse_iot.api_client.api.default import (
+from infuse_iot.api_client.api.board import (
     create_board,
+    get_boards,
+)
+from infuse_iot.api_client.api.organisation import (
     create_organisation,
     get_all_organisations,
-    get_boards,
 )
 from infuse_iot.api_client.models import Error, NewBoard, NewOrganisation
 from infuse_iot.commands import InfuseCommand
@@ -32,7 +34,7 @@ def run(self):
 
     def client(self):
         """Get API client object ready to use"""
-        return Client(base_url="https://api.dev.infuse-iot.com").with_headers({"x-api-key": f"Bearer {get_api_key()}"})
+        return Client(base_url="https://api.infuse-iot.com").with_headers({"x-api-key": f"Bearer {get_api_key()}"})
 
 
 class Organisations(CloudSubCommand):

src/infuse_iot/tools/provision.py

@@ -17,13 +17,12 @@
 from pynrfjprog import LowLevel, Parameters
 
 from infuse_iot.api_client import Client
-from infuse_iot.api_client.api.default import (
+from infuse_iot.api_client.api.board import get_board_by_id, get_boards
+from infuse_iot.api_client.api.device import (
     create_device,
-    get_all_organisations,
-    get_board_by_id,
-    get_boards,
     get_device_by_soc_and_mcu_id,
 )
+from infuse_iot.api_client.api.organisation import get_all_organisations
 from infuse_iot.api_client.models import Board, Error, NewDevice, NewDeviceMetadata
 from infuse_iot.commands import InfuseCommand
 from infuse_iot.credentials import get_api_key
@@ -180,7 +179,7 @@ def run(self):
             soc, uicr_addr, hardware_id = self.nrf_device_info(api)
             hardware_id_str = f"{hardware_id:016x}"
 
-            client = Client(base_url="https://api.dev.infuse-iot.com").with_headers(
+            client = Client(base_url="https://api.infuse-iot.com").with_headers(
                 {"x-api-key": f"Bearer {get_api_key()}"}
             )