diff --git a/apps/web/src/app/dirt/event-logs/components/organization-events/events.component.spec.ts b/apps/web/src/app/dirt/event-logs/components/organization-events/events.component.spec.ts index 7893bb37ae2..4027b74e5bb 100644 --- a/apps/web/src/app/dirt/event-logs/components/organization-events/events.component.spec.ts +++ b/apps/web/src/app/dirt/event-logs/components/organization-events/events.component.spec.ts @@ -191,6 +191,46 @@ describe("EventsComponent Send access linking", () => { }); }); + describe("getUserName (invite reminder and resend events)", () => { + it("names System for a reminder sent by the scheduled job", () => { + const user = component.getUserName( + { + type: EventType.OrganizationUser_InviteReminderSent, + actingUserId: null, + userId: null, + systemUser: EventSystemUser.ScheduledJob, + }, + null, + ); + expect(user.name).toBe("system"); + }); + + it("names Public API for a resend through the Public API", () => { + const user = component.getUserName( + { + type: EventType.OrganizationUser_Reinvited, + actingUserId: null, + userId: null, + systemUser: EventSystemUser.PublicApi, + }, + null, + ); + expect(user.name).toBe("publicApi"); + }); + + it("names the admin for a resend by an admin", () => { + const user = component.getUserName( + { + type: EventType.OrganizationUser_Reinvited, + actingUserId: "creator-user-id", + systemUser: null, + }, + "creator-user-id", + ); + expect(user.name).toBe("Pat Owner"); + }); + }); + describe("interactive id clicks open a dialog in place", () => { it("opens a Send-scoped events dialog when a Send id is clicked (and does NOT navigate)", () => { component.onEventMessageClick(clickOnHref(SEND_EVENTS_HREF_PREFIX + "send-123")); diff --git a/apps/web/src/app/dirt/event-logs/components/organization-events/events.component.ts b/apps/web/src/app/dirt/event-logs/components/organization-events/events.component.ts index 75413d7068a..e18c3eef5c6 100644 --- a/apps/web/src/app/dirt/event-logs/components/organization-events/events.component.ts +++ b/apps/web/src/app/dirt/event-logs/components/organization-events/events.component.ts @@ -57,6 +57,7 @@ const EVENT_SYSTEM_USER_TO_TRANSLATION: Record = { [EventSystemUser.PublicApi]: "publicApi", [EventSystemUser.BitwardenPortal]: "system", [EventSystemUser.Pam]: "privilegedControls", + [EventSystemUser.ScheduledJob]: "system", }; @Component({ diff --git a/apps/web/src/app/dirt/event-logs/services/event.service.spec.ts b/apps/web/src/app/dirt/event-logs/services/event.service.spec.ts index 90c5ed1ea40..940195ec6be 100644 --- a/apps/web/src/app/dirt/event-logs/services/event.service.spec.ts +++ b/apps/web/src/app/dirt/event-logs/services/event.service.spec.ts @@ -552,3 +552,38 @@ describe("EventService PAM events", () => { expect(info.humanReadableMessage).toContain(accessRequestId.substring(0, 8)); }); }); + +describe("EventService invite reminder and resend events", () => { + let sut: EventService; + + const i18n = mock(); + i18n.t.mockImplementation((id: string, p1?: string) => `${id}${p1 ?? ""}`); + + beforeEach(() => { + const policyService = mock(); + policyService.policies$.mockReturnValue(of([])); + const accountService = mock(); + (accountService as any).activeAccount$ = of({ id: "user-id" }); + const configService = mock(); + configService.getFeatureFlag.mockResolvedValue(false); + + sut = new EventService(i18n, policyService, accountService, configService); + }); + + const organizationUserId = "7c1d2e3f-1111-2222-3333-444455556666"; + + it.each([ + [EventType.OrganizationUser_InviteReminderSent, "sentInviteReminderToUserId"], + [EventType.OrganizationUser_Reinvited, "resentInviteToUserId"], + ])("renders %s with the member's short id", async (type, key) => { + const info = await sut.getEventInfo({ + type, + organizationUserId, + organizationId: "org-1111-2222", + } as EventResponse); + + expect(info.message).toContain(key); + expect(info.message).toContain(organizationUserId.substring(0, 8)); + expect(info.humanReadableMessage).toBe(`${key}${organizationUserId.substring(0, 8)}`); + }); +}); diff --git a/apps/web/src/app/dirt/event-logs/services/event.service.ts b/apps/web/src/app/dirt/event-logs/services/event.service.ts index 78c79b11153..4900dcd0ab5 100644 --- a/apps/web/src/app/dirt/event-logs/services/event.service.ts +++ b/apps/web/src/app/dirt/event-logs/services/event.service.ts @@ -553,6 +553,20 @@ export class EventService { this.getShortId(ev.organizationUserId), ); break; + case EventType.OrganizationUser_InviteReminderSent: + msg = this.i18nService.t("sentInviteReminderToUserId", this.formatOrgUserId(ev)); + humanReadableMsg = this.i18nService.t( + "sentInviteReminderToUserId", + this.getShortId(ev.organizationUserId), + ); + break; + case EventType.OrganizationUser_Reinvited: + msg = this.i18nService.t("resentInviteToUserId", this.formatOrgUserId(ev)); + humanReadableMsg = this.i18nService.t( + "resentInviteToUserId", + this.getShortId(ev.organizationUserId), + ); + break; // Org case EventType.Organization_Updated: msg = humanReadableMsg = this.i18nService.t("editedOrgSettings"); diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json index bbc3c74f0d0..98a1f9e443a 100644 --- a/apps/web/src/locales/en/messages.json +++ b/apps/web/src/locales/en/messages.json @@ -9484,6 +9484,24 @@ } } }, + "sentInviteReminderToUserId": { + "message": "Sent invite reminder to user $ID$.", + "placeholders": { + "id": { + "content": "$1", + "example": "First 8 characters of a GUID" + } + } + }, + "resentInviteToUserId": { + "message": "Resent invite to user $ID$.", + "placeholders": { + "id": { + "content": "$1", + "example": "First 8 characters of a GUID" + } + } + }, "system": { "message": "System" }, diff --git a/libs/common/src/dirt/event-logs/enums/event-system-user.enum.ts b/libs/common/src/dirt/event-logs/enums/event-system-user.enum.ts index 0b088d414d0..181265215b7 100644 --- a/libs/common/src/dirt/event-logs/enums/event-system-user.enum.ts +++ b/libs/common/src/dirt/event-logs/enums/event-system-user.enum.ts @@ -7,4 +7,5 @@ export enum EventSystemUser { PublicApi = 3, BitwardenPortal = 5, Pam = 6, + ScheduledJob = 7, } diff --git a/libs/common/src/dirt/event-logs/enums/event-type.enum.ts b/libs/common/src/dirt/event-logs/enums/event-type.enum.ts index fed9ec35461..1bc661b2199 100644 --- a/libs/common/src/dirt/event-logs/enums/event-type.enum.ts +++ b/libs/common/src/dirt/event-logs/enums/event-type.enum.ts @@ -85,6 +85,8 @@ export enum EventType { OrganizationUser_InviteLinkAccepted = 1524, OrganizationUser_AdminChangedEmail = 1525, OrganizationUser_InviteLinkConfirmed = 1526, + OrganizationUser_InviteReminderSent = 1527, + OrganizationUser_Reinvited = 1528, Organization_Updated = 1600, Organization_PurgedVault = 1601,