web/admin: display webauthn device type (#11481)

* web/user,admin: display webauthn device type Co-authored-by: Simonyi Gergő <28359278+gergosimonyi@users.noreply.github.com> Signed-off-by: Marc 'risson' Schmitt <marc.schmitt@risson.space> * fix Signed-off-by: Marc 'risson' Schmitt <marc.schmitt@risson.space> * fix 2 Signed-off-by: Jens Langhammer <jens@goauthentik.io> --------- Signed-off-by: Marc 'risson' Schmitt <marc.schmitt@risson.space> Signed-off-by: Jens Langhammer <jens@goauthentik.io> Co-authored-by: Simonyi Gergő <28359278+gergosimonyi@users.noreply.github.com> Co-authored-by: Jens Langhammer <jens@goauthentik.io>
goauthentik · Oct 14, 2024 · 10580d8 · 10580d8
1 parent 0a1d283
commit 10580d8
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 2 deletions.
diff --git a/authentik/core/api/devices.py b/authentik/core/api/devices.py
@@ -17,6 +17,7 @@
 from authentik.core.api.utils import MetaNameSerializer
 from authentik.stages.authenticator import device_classes, devices_for_user
 from authentik.stages.authenticator.models import Device
+from authentik.stages.authenticator_webauthn.models import WebAuthnDevice
 
 
 class DeviceSerializer(MetaNameSerializer):
@@ -29,11 +30,18 @@ class DeviceSerializer(MetaNameSerializer):
     created = DateTimeField(read_only=True)
     last_updated = DateTimeField(read_only=True)
     last_used = DateTimeField(read_only=True, allow_null=True)
+    extra_description = SerializerMethodField()
 
     def get_type(self, instance: Device) -> str:
         """Get type of device"""
         return instance._meta.label
 
+    def get_extra_description(self, instance: Device) -> str:
+        """Get extra description"""
+        if isinstance(instance, WebAuthnDevice):
+            return instance.device_type.description
+        return ""
+
 
 class DeviceViewSet(ViewSet):
     """Viewset for authenticator devices"""

diff --git a/schema.yml b/schema.yml
@@ -38254,9 +38254,14 @@ components:
           format: date-time
           readOnly: true
           nullable: true
+        extra_description:
+          type: string
+          description: Get extra description
+          readOnly: true
       required:
       - confirmed
       - created
+      - extra_description
       - last_updated
       - last_used
       - meta_model_name

diff --git a/web/src/admin/users/UserDevicesTable.ts b/web/src/admin/users/UserDevicesTable.ts
@@ -100,7 +100,8 @@ export class UserDeviceTable extends Table<Device> {
     row(item: Device): TemplateResult[] {
         return [
             html`${item.name}`,
-            html`${deviceTypeName(item)}`,
+            html`${deviceTypeName(item)}
+            ${item.extraDescription ? ` - ${item.extraDescription}` : ""}`,
             html`${item.confirmed ? msg("Yes") : msg("No")}`,
             html`<div>${getRelativeTime(item.created)}</div>
                 <small>${item.created.toLocaleString()}</small>`,

diff --git a/web/src/user/user-settings/mfa/MFADevicesPage.ts b/web/src/user/user-settings/mfa/MFADevicesPage.ts
@@ -124,7 +124,8 @@ export class MFADevicesPage extends Table<Device> {
     row(item: Device): TemplateResult[] {
         return [
             html`${item.name}`,
-            html`${deviceTypeName(item)}`,
+            html`${deviceTypeName(item)}
+            ${item.extraDescription ? ` - ${item.extraDescription}` : ""}`,
             html`${item.created.getTime() > 0
                 ? html`<div>${getRelativeTime(item.created)}</div>
                       <small>${item.created.toLocaleString()}</small>`