Backend fixed and features

packages/sshecret-admin/src/sshecret_admin/services/admin_backend.py

@@ -16,7 +16,7 @@ from sshecret.backend import (
     Operation,
     SubSystem,
 )
-from sshecret.backend.models import ClientQueryResult, DetailedSecrets
+from sshecret.backend.models import ClientQueryResult, ClientReference, DetailedSecrets
 from sshecret.backend.api import AuditAPI, KeySpec
 from sshecret.crypto import encrypt_string, load_public_key
 
@@ -121,6 +121,10 @@ class AdminBackend:
         except Exception as e:
             raise BackendUnavailableError() from e
 
+    async def get_clients_terse(self) -> list[ClientReference]:
+        """Get a list of client ids and names."""
+        return await self.backend.get_client_terse()
+
     async def query_clients(
         self, filter: ClientFilter | None = None
     ) -> ClientQueryResult:
@@ -496,7 +500,7 @@ class AdminBackend:
 
         secret_mapping = await self.backend.get_secret(idname)
         if secret_mapping:
-            secret_view.clients = [ref.name for ref in secret_mapping.clients]
+            secret_view.clients = [ClientReference(id=ref.id, name=ref.name) for ref in secret_mapping.clients]
 
         return secret_view
 

packages/sshecret-admin/src/sshecret_admin/services/models.py

@@ -1,7 +1,8 @@
 """Models for the API."""
 
 import secrets
-from typing import Annotated, Literal
+from typing import Annotated, Literal, Self
+import uuid
 from pydantic import (
     AfterValidator,
     BaseModel,
@@ -9,6 +10,7 @@ from pydantic import (
     Field,
     IPvAnyAddress,
     IPvAnyNetwork,
+    model_validator,
 )
 from sshecret.crypto import validate_public_key
 from sshecret.backend.models import ClientReference
@@ -35,7 +37,9 @@ class SecretView(BaseModel):
     name: str
     secret: str | None
     group: str | None = None
-    clients: list[str] = Field(default_factory=list)  # Clients that have access to it.
+    clients: list[ClientReference] = Field(
+        default_factory=list
+    )  # Clients that have access to it.
 
 
 class UpdateKeyModel(BaseModel):
@@ -62,6 +66,7 @@ class ClientCreate(BaseModel):
     """Model to create a client."""
 
     name: str
+    description: str | None = None
     public_key: Annotated[str, AfterValidator(public_key_validator)]
     sources: list[IPvAnyAddress | IPvAnyNetwork] = Field(default_factory=list)
 
@@ -163,3 +168,31 @@ class ClientSecretGroupList(BaseModel):
 
     ungrouped: list[SecretClientMapping] = Field(default_factory=list)
     groups: list[ClientSecretGroup] = Field(default_factory=list)
+
+
+class ClientListParams(BaseModel):
+    """Client list parameters."""
+
+    limit: int = Field(100, gt=0, le=100)
+    offset: int = Field(0, ge=0)
+    id: uuid.UUID | None = None
+    name: str | None = None
+    name__like: str | None = None
+    name__contains: str | None = None
+    order_by: str = "created_at"
+    order_reverse: bool = True
+
+    @model_validator(mode="after")
+    def validate_expressions(self) -> Self:
+        """Validate mutually exclusive expression."""
+        name_filter = False
+        if self.name__like or self.name__contains:
+            name_filter = True
+        if self.name__like and self.name__contains:
+            raise ValueError("You may only specify one name expression")
+        if self.name and name_filter:
+            raise ValueError(
+                "You must either specify name or one of name__like or name__contains"
+            )
+
+        return self