diff --git a/web/packages/teleport/src/Audit/__snapshots__/Audit.story.test.tsx.snap b/web/packages/teleport/src/Audit/__snapshots__/Audit.story.test.tsx.snap index 3538dde2f2758..366a83848a30b 100644 --- a/web/packages/teleport/src/Audit/__snapshots__/Audit.story.test.tsx.snap +++ b/web/packages/teleport/src/Audit/__snapshots__/Audit.story.test.tsx.snap @@ -385,12 +385,12 @@ exports[`list of all events 1`] = ` - - 181 + 188 of - 181 + 188 + + + + +
+ + Device Authenticate +
+ + + User [[object Object]] has failed to authenticate their device + + + 2023-01-12T19:28:36.842Z + + + + + + + +
+ + Device Enrollment +
+ + + User [[object Object]] has failed to enroll their device + + + 2023-01-12T19:28:36.842Z + + + + + + + +
+ + Device Enroll Token Spent +
+ + + User [[object Object]] has spent a device enroll token + + + 2023-01-12T19:28:36.842Z + + + + + + + +
+ + Device Enroll Token Create +
+ + + User [[object Object]] created a device enroll token + + + 2023-01-12T19:28:36.842Z + + + + + + + +
+ + Device Delete +
+ + + User [[object Object]] has deleted a device + + + 2023-01-12T19:28:36.842Z + + + + + + + +
+ + Device Register +
+ + + User [[object Object]] has registered a device + + + 2023-01-12T19:28:36.842Z + + + + + - status.success - ? `User [${user.user}] has registered a device` - : `User [${user.user}] has failed to register a device`, + format: ({ user, status, success }) => + success || (status && status.success) + ? `User [${user}] has registered a device` + : `User [${user}] has failed to register a device`, }, [eventCodes.DEVICE_DELETE]: { - type: 'device', + type: 'device.delete', desc: 'Device Delete', - format: ({ user, status }) => - status.success - ? `User [${user.user}] has deleted a device` - : `User [${user.user}] has failed to delete a device`, + format: ({ user, status, success }) => + success || (status && status.success) + ? `User [${user}] has deleted a device` + : `User [${user}] has failed to delete a device`, }, [eventCodes.DEVICE_AUTHENTICATE]: { - type: 'device', + type: 'device.authenticate', desc: 'Device Authenticate', - format: ({ user, status }) => - status.success - ? `User [${user.user}] has successfully authenticated their device` - : `User [${user.user}] has failed to authenticate their device`, + format: ({ user, status, success }) => + success || (status && status.success) + ? `User [${user}] has successfully authenticated their device` + : `User [${user}] has failed to authenticate their device`, }, [eventCodes.DEVICE_ENROLL]: { - type: 'device', + type: 'device.enroll', desc: 'Device Enrollment', - format: ({ user, status }) => - status.success - ? `User [${user.user}] has successfully enrolled their device` - : `User [${user.user}] has failed to enroll their device`, + format: ({ user, status, success }) => + success || (status && status.success) + ? `User [${user}] has successfully enrolled their device` + : `User [${user}] has failed to enroll their device`, }, [eventCodes.DEVICE_ENROLL_TOKEN_CREATE]: { - type: 'device', + type: 'device.token.create', desc: 'Device Enroll Token Create', - format: ({ user, status }) => - status.success - ? `User [${user.user}] created a device enroll token` - : `User [${user.user}] has failed to create a device enroll token`, + format: ({ user, status, success }) => + success || (status && status.success) + ? `User [${user}] created a device enroll token` + : `User [${user}] has failed to create a device enroll token`, }, [eventCodes.DEVICE_ENROLL_TOKEN_SPENT]: { - type: 'device', + type: 'device.token.spent', desc: 'Device Enroll Token Spent', - format: ({ user, status }) => - status.success - ? `User [${user.user}] has spent a device enroll token` - : `User [${user.user}] has failed to spend a device enroll token`, + format: ({ user, status, success }) => + success || (status && status.success) + ? `User [${user}] has spent a device enroll token` + : `User [${user}] has failed to spend a device enroll token`, }, [eventCodes.DEVICE_UPDATE]: { - type: 'device', + type: 'device.update', desc: 'Device Update', - format: ({ user, status }) => - status.success - ? `User [${user.user}] has updated a device` - : `User [${user.user}] has failed to update a device`, + format: ({ user, status, success }) => + success || (status && status.success) + ? `User [${user}] has updated a device` + : `User [${user}] has failed to update a device`, }, [eventCodes.X11_FORWARD]: { type: 'x11-forward', diff --git a/web/packages/teleport/src/services/audit/types.ts b/web/packages/teleport/src/services/audit/types.ts index 6e5e37812be8c..a6d43c6a950ab 100644 --- a/web/packages/teleport/src/services/audit/types.ts +++ b/web/packages/teleport/src/services/audit/types.ts @@ -1291,8 +1291,10 @@ type RawDeviceEvent = RawEvent< T, { device: { asset_tag: string; device_id: string; os_type: number }; - status: { success: boolean }; - user: { user: string }; + success?: boolean; + user?: string; + // status from "legacy" event format. + status?: { success: boolean }; } >;