keys: Add name getter/setter to accessories and keypairs

malmeloo · Sep 18, 2024 · 8a09623 · 8a09623
1 parent 4e75e73
commit 8a09623
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/findmy/accessory.py b/findmy/accessory.py
@@ -106,6 +106,10 @@ def name(self) -> str | None:
         """Name of this accessory."""
         return self._name
 
+    @name.setter
+    def name(self, name: str | None) -> None:
+        self._name = name
+
     @property
     def model(self) -> str | None:
         """Model string of this accessory, as provided by the manufacturer."""

diff --git a/findmy/keys.py b/findmy/keys.py
@@ -81,7 +81,12 @@ def hashed_adv_key_bytes(self) -> bytes:
 class KeyPair(HasPublicKey):
     """A private-public keypair for a trackable FindMy accessory."""
 
-    def __init__(self, private_key: bytes, key_type: KeyType = KeyType.UNKNOWN) -> None:
+    def __init__(
+        self,
+        private_key: bytes,
+        key_type: KeyType = KeyType.UNKNOWN,
+        name: str | None = None,
+    ) -> None:
         """Initialize the `KeyPair` with the private key bytes."""
         priv_int = crypto.bytes_to_int(private_key)
         self._priv_key = ec.derive_private_key(
@@ -90,12 +95,22 @@ def __init__(self, private_key: bytes, key_type: KeyType = KeyType.UNKNOWN) -> N
         )
 
         self._key_type = key_type
+        self._name = name
 
     @property
     def key_type(self) -> KeyType:
         """Type of this key."""
         return self._key_type
 
+    @property
+    def name(self) -> str | None:
+        """Name of this KeyPair."""
+        return self._name
+
+    @name.setter
+    def name(self, name: str | None) -> None:
+        self._name = name
+
     @classmethod
     def new(cls) -> KeyPair:
         """Generate a new random `KeyPair`."""
@@ -138,7 +153,7 @@ def dh_exchange(self, other_pub_key: ec.EllipticCurvePublicKey) -> bytes:
 
     @override
     def __repr__(self) -> str:
-        return f'KeyPair(public_key="{self.adv_key_b64}", type={self.key_type})'
+        return f'KeyPair(name="{self.name}", public_key="{self.adv_key_b64}", type={self.key_type})'
 
 
 K = TypeVar("K")