refactored audit event vault unlock to vault key retrieve

cryptomator · Jul 26, 2023 · 72d2aae · 72d2aae
1 parent 06fb1bf
commit 72d2aae
Show file tree

Hide file tree

Showing 10 changed files with 68 additions and 82 deletions.
diff --git a/backend/src/main/java/org/cryptomator/hub/api/AuditLogResource.java b/backend/src/main/java/org/cryptomator/hub/api/AuditLogResource.java
@@ -16,9 +16,9 @@
 import org.cryptomator.hub.entities.AuditEventDeviceRemove;
 import org.cryptomator.hub.entities.AuditEventVaultAccessGrant;
 import org.cryptomator.hub.entities.AuditEventVaultCreate;
+import org.cryptomator.hub.entities.AuditEventVaultKeyRetrieve;
 import org.cryptomator.hub.entities.AuditEventVaultMemberAdd;
 import org.cryptomator.hub.entities.AuditEventVaultMemberRemove;
-import org.cryptomator.hub.entities.AuditEventVaultUnlock;
 import org.cryptomator.hub.entities.AuditEventVaultUpdate;
 import org.cryptomator.hub.entities.Device;
 import org.eclipse.microprofile.openapi.annotations.Operation;
@@ -66,9 +66,9 @@ public List<AuditEventDto> getAllEvents(@QueryParam("startDate") Instant startDa
 			@JsonSubTypes.Type(value = AuditEventDeviceRegisterDto.class, name = AuditEventDeviceRegister.TYPE), //
 			@JsonSubTypes.Type(value = AuditEventDeviceRemoveDto.class, name = AuditEventDeviceRemove.TYPE), //
 			@JsonSubTypes.Type(value = AuditEventVaultCreateDto.class, name = AuditEventVaultCreate.TYPE), //
-			@JsonSubTypes.Type(value = AuditEventVaultUnlockDto.class, name = AuditEventVaultUnlock.TYPE), //
 			@JsonSubTypes.Type(value = AuditEventVaultUpdateDto.class, name = AuditEventVaultUpdate.TYPE), //
 			@JsonSubTypes.Type(value = AuditEventVaultAccessGrantDto.class, name = AuditEventVaultAccessGrant.TYPE), //
+			@JsonSubTypes.Type(value = AuditEventVaultKeyRetrieveDto.class, name = AuditEventVaultKeyRetrieve.TYPE), //
 			@JsonSubTypes.Type(value = AuditEventVaultMemberAddDto.class, name = AuditEventVaultMemberAdd.TYPE), //
 			@JsonSubTypes.Type(value = AuditEventVaultMemberRemoveDto.class, name = AuditEventVaultMemberRemove.TYPE) //
 	})
@@ -88,12 +88,12 @@ static AuditEventDto fromEntity(AuditEvent entity) {
 				return new AuditEventDeviceRemoveDto(aedr.id, aedr.timestamp, AuditEventDeviceRemove.TYPE, aedr.removedBy, aedr.deviceId);
 			} else if (entity instanceof AuditEventVaultCreate aevc) {
 				return new AuditEventVaultCreateDto(aevc.id, aevc.timestamp, AuditEventVaultCreate.TYPE, aevc.createdBy, aevc.vaultId, aevc.vaultName, aevc.vaultDescription);
-			} else if (entity instanceof AuditEventVaultUnlock aevu) {
-				return new AuditEventVaultUnlockDto(aevu.id, aevu.timestamp, AuditEventVaultUnlock.TYPE, aevu.unlockedBy, aevu.vaultId, aevu.deviceId, aevu.result);
 			} else if (entity instanceof AuditEventVaultUpdate aevu) {
 				return new AuditEventVaultUpdateDto(aevu.id, aevu.timestamp, AuditEventVaultUpdate.TYPE, aevu.updatedBy, aevu.vaultId, aevu.vaultName, aevu.vaultDescription, aevu.vaultArchived);
 			} else if (entity instanceof AuditEventVaultAccessGrant aevag) {
 				return new AuditEventVaultAccessGrantDto(aevag.id, aevag.timestamp, AuditEventVaultAccessGrant.TYPE, aevag.grantedBy, aevag.vaultId, aevag.authorityId);
+			} else if (entity instanceof AuditEventVaultKeyRetrieve aevkr) {
+				return new AuditEventVaultKeyRetrieveDto(aevkr.id, aevkr.timestamp, AuditEventVaultKeyRetrieve.TYPE, aevkr.retrievedBy, aevkr.vaultId, aevkr.result);
 			} else if (entity instanceof AuditEventVaultMemberAdd aevma) {
 				return new AuditEventVaultMemberAddDto(aevma.id, aevma.timestamp, AuditEventVaultMemberAdd.TYPE, aevma.addedBy, aevma.vaultId, aevma.authorityId);
 			} else if (entity instanceof AuditEventVaultMemberRemove aevmr) {
@@ -115,10 +115,6 @@ record AuditEventVaultCreateDto(long id, Instant timestamp, String type, @JsonPr
 									@JsonProperty("vaultDescription") String vaultDescription) implements AuditEventDto {
 	}
 
-	record AuditEventVaultUnlockDto(long id, Instant timestamp, String type, @JsonProperty("unlockedBy") String unlockedBy, @JsonProperty("vaultId") UUID vaultId, @JsonProperty("deviceId") String deviceId,
-									@JsonProperty("result") AuditEventVaultUnlock.Result result) implements AuditEventDto {
-	}
-
 	record AuditEventVaultUpdateDto(long id, Instant timestamp, String type, @JsonProperty("updatedBy") String updatedBy, @JsonProperty("vaultId") UUID vaultId, @JsonProperty("vaultName") String vaultName,
 									@JsonProperty("vaultDescription") String vaultDescription, @JsonProperty("vaultArchived") boolean vaultArchived) implements AuditEventDto {
 	}
@@ -127,6 +123,10 @@ record AuditEventVaultAccessGrantDto(long id, Instant timestamp, String type, @J
 										 @JsonProperty("authorityId") String authorityId) implements AuditEventDto {
 	}
 
+	record AuditEventVaultKeyRetrieveDto(long id, Instant timestamp, String type, @JsonProperty("retrievedBy") String retrievedBy, @JsonProperty("vaultId") UUID vaultId,
+										 @JsonProperty("result") AuditEventVaultKeyRetrieve.Result result) implements AuditEventDto {
+	}
+
 	record AuditEventVaultMemberAddDto(long id, Instant timestamp, String type, @JsonProperty("addedBy") String addedBy, @JsonProperty("vaultId") UUID vaultId,
 									   @JsonProperty("authorityId") String authorityId) implements AuditEventDto {
 	}

diff --git a/backend/src/main/java/org/cryptomator/hub/api/VaultResource.java b/backend/src/main/java/org/cryptomator/hub/api/VaultResource.java
@@ -24,16 +24,16 @@
 import jakarta.ws.rs.core.MediaType;
 import jakarta.ws.rs.core.Response;
 import org.cryptomator.hub.entities.AccessToken;
-import org.cryptomator.hub.entities.AuditEventVaultMemberAdd;
+import org.cryptomator.hub.entities.AuditEventVaultAccessGrant;
 import org.cryptomator.hub.entities.AuditEventVaultCreate;
+import org.cryptomator.hub.entities.AuditEventVaultKeyRetrieve;
+import org.cryptomator.hub.entities.AuditEventVaultMemberAdd;
+import org.cryptomator.hub.entities.AuditEventVaultMemberRemove;
+import org.cryptomator.hub.entities.AuditEventVaultUpdate;
 import org.cryptomator.hub.entities.Device;
 import org.cryptomator.hub.entities.EffectiveGroupMembership;
 import org.cryptomator.hub.entities.EffectiveVaultAccess;
-import org.cryptomator.hub.entities.AuditEventVaultAccessGrant;
 import org.cryptomator.hub.entities.Group;
-import org.cryptomator.hub.entities.AuditEventVaultMemberRemove;
-import org.cryptomator.hub.entities.AuditEventVaultUnlock;
-import org.cryptomator.hub.entities.AuditEventVaultUpdate;
 import org.cryptomator.hub.entities.User;
 import org.cryptomator.hub.entities.Vault;
 import org.cryptomator.hub.filters.ActiveLicense;
@@ -268,14 +268,14 @@ public Response unlock(@PathParam("vaultId") UUID vaultId, @PathParam("deviceId"
 
 		var access = AccessToken.unlock(vaultId, deviceId, jwt.getSubject());
 		if (access != null) {
-			AuditEventVaultUnlock.log(jwt.getSubject(), vaultId, deviceId, AuditEventVaultUnlock.Result.SUCCESS);
+			AuditEventVaultKeyRetrieve.log(jwt.getSubject(), vaultId, AuditEventVaultKeyRetrieve.Result.SUCCESS);
 			var subscriptionStateHeaderName = "Hub-Subscription-State";
 			var subscriptionStateHeaderValue = license.isSet() ? "ACTIVE" : "INACTIVE"; // license expiration is not checked here, because it is checked in the ActiveLicense filter
 			return Response.ok(access.jwe).header(subscriptionStateHeaderName, subscriptionStateHeaderValue).build();
 		} else if (Device.findById(deviceId) == null) {
 			throw new NotFoundException("No such device.");
 		} else {
-			AuditEventVaultUnlock.log(jwt.getSubject(), vaultId, deviceId, AuditEventVaultUnlock.Result.UNAUTHORIZED);
+			AuditEventVaultKeyRetrieve.log(jwt.getSubject(), vaultId, AuditEventVaultKeyRetrieve.Result.UNAUTHORIZED);
 			throw new ForbiddenException("Access to this device not granted.");
 		}
 	}

diff --git a/...r/hub/entities/AuditEventVaultUnlock.java → .../entities/AuditEventVaultKeyRetrieve.java b/...r/hub/entities/AuditEventVaultUnlock.java → .../entities/AuditEventVaultKeyRetrieve.java
@@ -12,21 +12,18 @@
 import java.util.UUID;
 
 @Entity
-@Table(name = "audit_event_vault_unlock")
-@DiscriminatorValue(AuditEventVaultUnlock.TYPE)
-public class AuditEventVaultUnlock extends AuditEvent {
+@Table(name = "audit_event_vault_key_retrieve")
+@DiscriminatorValue(AuditEventVaultKeyRetrieve.TYPE)
+public class AuditEventVaultKeyRetrieve extends AuditEvent {
 
-	public static final String TYPE = "VAULT_UNLOCK";
+	public static final String TYPE = "VAULT_KEY_RETRIEVE";
 
-	@Column(name = "unlocked_by")
-	public String unlockedBy;
+	@Column(name = "retrieved_by")
+	public String retrievedBy;
 
 	@Column(name = "vault_id")
 	public UUID vaultId;
 
-	@Column(name = "device_id")
-	public String deviceId;
-
 	@Column(name = "result")
 	@Enumerated(EnumType.STRING)
 	public Result result;
@@ -35,25 +32,23 @@ public class AuditEventVaultUnlock extends AuditEvent {
 	public boolean equals(Object o) {
 		if (this == o) return true;
 		if (o == null || getClass() != o.getClass()) return false;
-		AuditEventVaultUnlock that = (AuditEventVaultUnlock) o;
+		AuditEventVaultKeyRetrieve that = (AuditEventVaultKeyRetrieve) o;
 		return super.equals(that) //
-				&& Objects.equals(unlockedBy, that.unlockedBy) //
+				&& Objects.equals(retrievedBy, that.retrievedBy) //
 				&& Objects.equals(vaultId, that.vaultId) //
-				&& Objects.equals(deviceId, that.deviceId) //
 				&& Objects.equals(result, that.result);
 	}
 
 	@Override
 	public int hashCode() {
-		return Objects.hash(id, unlockedBy, vaultId, deviceId, result);
+		return Objects.hash(id, retrievedBy, vaultId, result);
 	}
 
-	public static void log(String unlockedBy, UUID vaultId, String deviceId, Result result) {
-		var event = new AuditEventVaultUnlock();
+	public static void log(String retrievedBy, UUID vaultId, Result result) {
+		var event = new AuditEventVaultKeyRetrieve();
 		event.timestamp = Instant.now();
-		event.unlockedBy = unlockedBy;
+		event.retrievedBy = retrievedBy;
 		event.vaultId = vaultId;
-		event.deviceId = deviceId;
 		event.result = result;
 		event.persist();
 	}

diff --git a/...nd/src/main/resources/org/cryptomator/hub/flyway/V12__Update_Audit_Event_Vault_Unlock.sql b/...nd/src/main/resources/org/cryptomator/hub/flyway/V12__Update_Audit_Event_Vault_Unlock.sql
@@ -0,0 +1,3 @@
+ALTER TABLE "audit_event_vault_unlock" RENAME TO "audit_event_vault_key_retrieve";
+ALTER TABLE "audit_event_vault_key_retrieve" RENAME COLUMN "unlocked_by" TO "retrieved_by";
+ALTER TABLE "audit_event_vault_key_retrieve" DROP COLUMN "device_id";
diff --git a/backend/src/test/resources/org/cryptomator/hub/flyway/V9999__Test_Data.sql b/backend/src/test/resources/org/cryptomator/hub/flyway/V9999__Test_Data.sql
@@ -79,13 +79,13 @@ VALUES
     (102, '2020-02-20T20:20:20.102Z', 'DEVICE_REGISTER'),
     (200, '2020-02-20T20:20:20.200Z', 'DEVICE_REGISTER'),
     (201, '2020-02-20T20:20:20.201Z', 'DEVICE_REMOVE'),
-    (1111, '2020-02-20T20:20:21.111Z', 'VAULT_UNLOCK'),
+    (1111, '2020-02-20T20:20:21.111Z', 'VAULT_KEY_RETRIEVE'),
     (2000, '2020-02-20T20:20:22.000Z', 'VAULT_ACCESS_GRANT'),
     (2001, '2020-02-20T20:20:22.001Z', 'VAULT_ACCESS_GRANT'),
     (2002, '2020-02-20T20:20:22.002Z', 'VAULT_ACCESS_GRANT'),
     (2003, '2020-02-20T20:20:22.003Z', 'VAULT_ACCESS_GRANT'),
     (3000, '2020-02-20T20:20:23.000Z', 'VAULT_UPDATE'),
-    (4242, '2020-02-20T20:20:24.242Z', 'VAULT_UNLOCK');
+    (4242, '2020-02-20T20:20:24.242Z', 'VAULT_KEY_RETRIEVE');
 
 SELECT SETVAL('audit_event_id_seq', (SELECT MAX(id) FROM audit_event), true);
 
@@ -118,10 +118,10 @@ INSERT INTO "audit_event_device_remove" ("id", "removed_by", "device_id")
 VALUES
     (201, 'user2', 'device4');
 
-INSERT INTO "audit_event_vault_unlock" ("id", "unlocked_by", "vault_id", "device_id", "result")
+INSERT INTO "audit_event_vault_key_retrieve" ("id", "retrieved_by", "vault_id", "result")
 VALUES
-    (1111, 'user2', '7E57C0DE-0000-4000-8000-000100001111', 'device3', 'UNAUTHORIZED'),
-    (4242, 'user1', '7E57C0DE-0000-4000-8000-000100001111', 'device1', 'SUCCESS');
+    (1111, 'user2', '7E57C0DE-0000-4000-8000-000100001111', 'UNAUTHORIZED'),
+    (4242, 'user1', '7E57C0DE-0000-4000-8000-000100001111', 'SUCCESS');
 
 INSERT INTO "audit_event_vault_access_grant" ("id", "granted_by", "vault_id", "authority_id")
 VALUES

diff --git a/frontend/src/common/auditlog.ts b/frontend/src/common/auditlog.ts
@@ -6,7 +6,7 @@ import { Deferred, debounce } from './util';
 export type AuditEventDto = {
   id: number;
   timestamp: Date;
-  type: 'DEVICE_REGISTER' | 'DEVICE_REMOVE' | 'VAULT_ACCESS_GRANT' | 'VAULT_CREATE' | 'VAULT_MEMBER_ADD' | 'VAULT_MEMBER_REMOVE' | 'VAULT_UNLOCK' | 'VAULT_UPDATE';
+  type: 'DEVICE_REGISTER' | 'DEVICE_REMOVE' | 'VAULT_CREATE' | 'VAULT_UPDATE' | 'VAULT_ACCESS_GRANT' | 'VAULT_KEY_RETRIEVE' | 'VAULT_MEMBER_ADD' | 'VAULT_MEMBER_REMOVE';
 }
 
 export type AuditEventDeviceRegisterDto = AuditEventDto & {
@@ -21,44 +21,43 @@ export type AuditEventDeviceRemoveDto = AuditEventDto & {
   deviceId: string;
 }
 
-export type AuditEventVaultAccessGrantDto = AuditEventDto & {
-  grantedBy: string;
-  vaultId: string;
-  authorityId: string;
-}
-
 export type AuditEventVaultCreateDto = AuditEventDto & {
   createdBy: string;
   vaultId: string;
   vaultName: string;
   vaultDescription: string;
 }
 
-export type AuditEventVaultMemberAddDto = AuditEventDto & {
-  addedBy: string;
+export type AuditEventVaultUpdateDto = AuditEventDto & {
+  updatedBy: string;
   vaultId: string;
-  authorityId: string;
+  vaultName: string;
+  vaultDescription: string;
+  vaultArchived: boolean;
 }
 
-export type AuditEventVaultMemberRemoveDto = AuditEventDto & {
-  removedBy: string;
+export type AuditEventVaultAccessGrantDto = AuditEventDto & {
+  grantedBy: string;
   vaultId: string;
   authorityId: string;
 }
 
-export type AuditEventVaultUnlockDto = AuditEventDto & {
-  unlockedBy: string;
+export type AuditEventVaultKeyRetrieveDto = AuditEventDto & {
+  retrievedBy: string;
   vaultId: string;
-  deviceId: string;
   result: 'SUCCESS' | 'UNAUTHORIZED';
 }
 
-export type AuditEventVaultUpdateDto = AuditEventDto & {
-  updatedBy: string;
+export type AuditEventVaultMemberAddDto = AuditEventDto & {
+  addedBy: string;
   vaultId: string;
-  vaultName: string;
-  vaultDescription: string;
-  vaultArchived: boolean;
+  authorityId: string;
+}
+
+export type AuditEventVaultMemberRemoveDto = AuditEventDto & {
+  removedBy: string;
+  vaultId: string;
+  authorityId: string;
 }
 
 /* Entity Cache */

diff --git a/frontend/src/components/AuditLog.vue b/frontend/src/components/AuditLog.vue
@@ -94,9 +94,9 @@
                 <AuditLogDetailsDeviceRegister v-if="auditEvent.type == 'DEVICE_REGISTER'" :event="(auditEvent as AuditEventDeviceRegisterDto)" />
                 <AuditLogDetailsDeviceRemove v-else-if="auditEvent.type == 'DEVICE_REMOVE'" :event="(auditEvent as AuditEventDeviceRemoveDto)" />
                 <AuditLogDetailsVaultCreate v-else-if="auditEvent.type == 'VAULT_CREATE'" :event="(auditEvent as AuditEventVaultCreateDto)" />
-                <AuditLogDetailsVaultUnlock v-else-if="auditEvent.type == 'VAULT_UNLOCK'" :event="(auditEvent as AuditEventVaultUnlockDto)" />
                 <AuditLogDetailsVaultUpdate v-else-if="auditEvent.type == 'VAULT_UPDATE'" :event="(auditEvent as AuditEventVaultUpdateDto)" />
                 <AuditLogDetailsVaultAccessGrant v-else-if="auditEvent.type == 'VAULT_ACCESS_GRANT'" :event="(auditEvent as AuditEventVaultAccessGrantDto)" />
+                <AuditLogDetailsVaultKeyRetrieve v-else-if="auditEvent.type == 'VAULT_KEY_RETRIEVE'" :event="(auditEvent as AuditEventVaultKeyRetrieveDto)" />
                 <AuditLogDetailsVaultMemberAdd v-else-if="auditEvent.type == 'VAULT_MEMBER_ADD'" :event="(auditEvent as AuditEventVaultMemberAddDto)" />
                 <AuditLogDetailsVaultMemberRemove v-else-if="auditEvent.type == 'VAULT_MEMBER_REMOVE'" :event="(auditEvent as AuditEventVaultMemberRemoveDto)" />
               </tr>
@@ -137,14 +137,14 @@ import { ChevronDownIcon } from '@heroicons/vue/20/solid';
 import { CheckIcon, ChevronUpDownIcon } from '@heroicons/vue/24/solid';
 import { computed, onMounted, ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
-import auditlog, { AuditEventDeviceRegisterDto, AuditEventDeviceRemoveDto, AuditEventDto, AuditEventVaultAccessGrantDto, AuditEventVaultCreateDto, AuditEventVaultMemberAddDto, AuditEventVaultMemberRemoveDto, AuditEventVaultUnlockDto, AuditEventVaultUpdateDto } from '../common/auditlog';
+import auditlog, { AuditEventDeviceRegisterDto, AuditEventDeviceRemoveDto, AuditEventDto, AuditEventVaultAccessGrantDto, AuditEventVaultCreateDto, AuditEventVaultKeyRetrieveDto, AuditEventVaultMemberAddDto, AuditEventVaultMemberRemoveDto, AuditEventVaultUpdateDto } from '../common/auditlog';
 import AuditLogDetailsDeviceRegister from './AuditLogDetailsDeviceRegister.vue';
 import AuditLogDetailsDeviceRemove from './AuditLogDetailsDeviceRemove.vue';
 import AuditLogDetailsVaultAccessGrant from './AuditLogDetailsVaultAccessGrant.vue';
 import AuditLogDetailsVaultCreate from './AuditLogDetailsVaultCreate.vue';
+import AuditLogDetailsVaultKeyRetrieve from './AuditLogDetailsVaultKeyRetrieve.vue';
 import AuditLogDetailsVaultMemberAdd from './AuditLogDetailsVaultMemberAdd.vue';
 import AuditLogDetailsVaultMemberRemove from './AuditLogDetailsVaultMemberRemove.vue';
-import AuditLogDetailsVaultUnlock from './AuditLogDetailsVaultUnlock.vue';
 import AuditLogDetailsVaultUpdate from './AuditLogDetailsVaultUpdate.vue';
 
 const { t } = useI18n({ useScope: 'global' });

diff --git a/...components/AuditLogDetailsVaultUnlock.vue → ...nents/AuditLogDetailsVaultKeyRetrieve.vue b/...components/AuditLogDetailsVaultUnlock.vue → ...nents/AuditLogDetailsVaultKeyRetrieve.vue
@@ -1,16 +1,16 @@
 <template>
   <td class="whitespace-nowrap px-3 py-4 text-sm font-medium text-gray-900">
-    {{ t('auditLog.details.vault.unlock') }}
+    {{ t('auditLog.details.vaultKey.retrieve') }}
   </td>
   <td class="whitespace-nowrap py-4 pl-3 pr-4 sm:pr-6">
     <dl class="flex flex-col gap-2">
       <div class="flex items-baseline gap-2">
         <dt class="text-xs text-gray-500">
-          <code>unlocked by</code>
+          <code>retrieved by</code>
         </dt>
         <dd class="flex items-baseline gap-2 text-sm text-gray-900">
-          <span v-if="resolvedUnlockedBy != null">{{ resolvedUnlockedBy.name }}</span>
-          <code class="text-xs" :class="{'text-gray-600': resolvedUnlockedBy != null}">{{ event.unlockedBy }}</code>
+          <span v-if="resolvedRetrievedBy != null">{{ resolvedRetrievedBy.name }}</span>
+          <code class="text-xs" :class="{'text-gray-600': resolvedRetrievedBy != null}">{{ event.retrievedBy }}</code>
         </dd>
       </div>
       <div class="flex items-baseline gap-2">
@@ -22,15 +22,6 @@
           <code class="text-xs" :class="{'text-gray-600': resolvedVault != null}">{{ event.vaultId }}</code>
         </dd>
       </div>
-      <div class="flex items-baseline gap-2">
-        <dt class="text-xs text-gray-500">
-          <code>device</code>
-        </dt>
-        <dd class="flex items-baseline gap-2 text-sm text-gray-900">
-          <span v-if="resolvedDevice != null">{{ resolvedDevice.name }}</span>
-          <code class="text-xs" :class="{'text-gray-600': resolvedDevice != null}">{{ event.deviceId }}</code>
-        </dd>
-      </div>
       <div class="flex items-baseline gap-2">
         <dt class="text-xs text-gray-500">
           <code>result</code>
@@ -48,22 +39,20 @@
 <script setup lang="ts">
 import { onMounted, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-import auditlog, { AuditEventVaultUnlockDto } from '../common/auditlog';
-import { AuthorityDto, DeviceDto, VaultDto } from '../common/backend';
+import auditlog, { AuditEventVaultKeyRetrieveDto } from '../common/auditlog';
+import { AuthorityDto, VaultDto } from '../common/backend';
 
 const { t } = useI18n({ useScope: 'global' });
 
 const props = defineProps<{
-  event: AuditEventVaultUnlockDto
+  event: AuditEventVaultKeyRetrieveDto
 }>();
 
-const resolvedUnlockedBy = ref<AuthorityDto>();
+const resolvedRetrievedBy = ref<AuthorityDto>();
 const resolvedVault = ref<VaultDto>();
-const resolvedDevice = ref<DeviceDto>();
 
 onMounted(async () => {
-  resolvedUnlockedBy.value = await auditlog.entityCache.getAuthority(props.event.unlockedBy);
+  resolvedRetrievedBy.value = await auditlog.entityCache.getAuthority(props.event.retrievedBy);
   resolvedVault.value = await auditlog.entityCache.getVault(props.event.vaultId);
-  resolvedDevice.value = await auditlog.entityCache.getDevice(props.event.deviceId);
 });
 </script>
diff --git a/frontend/src/i18n/de-DE.json b/frontend/src/i18n/de-DE.json
@@ -68,9 +68,9 @@
   "auditLog.details.device.register": "Gerät registrieren",
   "auditLog.details.device.remove": "Gerät entfernen",
   "auditLog.details.vault.create": "Tresor erstellen",
-  "auditLog.details.vault.unlock": "Tresor entsperren",
   "auditLog.details.vault.update": "Tresor aktualisieren",
   "auditLog.details.vaultAccess.grant": "Tresor-Zugriff gewähren",
+  "auditLog.details.vaultKey.retrieve": "Tresor-Schlüssel abrufen",
   "auditLog.details.vaultMember.add": "Tresor-Mitglied hinzufügen",
   "auditLog.details.vaultMember.remove": "Tresor-Mitglied entfernen",
 

diff --git a/frontend/src/i18n/en-US.json b/frontend/src/i18n/en-US.json
@@ -68,9 +68,9 @@
   "auditLog.details.device.register": "Register Device",
   "auditLog.details.device.remove": "Remove Device",
   "auditLog.details.vault.create": "Create Vault",
-  "auditLog.details.vault.unlock": "Unlock Vault",
   "auditLog.details.vault.update": "Update Vault",
   "auditLog.details.vaultAccess.grant": "Grant Vault Access",
+  "auditLog.details.vaultKey.retrieve": "Retrieve Vault Key",
   "auditLog.details.vaultMember.add": "Add Vault Member",
   "auditLog.details.vaultMember.remove": "Remove Vault Member",
   "auditLog.pagination.showing": "Showing entries {0} to {1}",