diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json index 7a7785469b..53ab34478a 100644 --- a/apps/web/src/locales/en/messages.json +++ b/apps/web/src/locales/en/messages.json @@ -8756,6 +8756,27 @@ "memberAccessReportPageDesc": { "message": "Audit organization member access across groups, collections, and collection items. The CSV export provides a detailed breakdown per member, including information on collection permissions and account configurations." }, + "memberAccessReportNoCollection": { + "message": "(No Collection)" + }, + "memberAccessReportNoCollectionPermission": { + "message": "(No Collection Permission)" + }, + "memberAccessReportNoGroup": { + "message": "(No Group)" + }, + "memberAccessReportTwoFactorEnabledTrue": { + "message": "On" + }, + "memberAccessReportTwoFactorEnabledFalse": { + "message": "Off" + }, + "memberAccessReportAuthenticationEnabledTrue": { + "message": "On" + }, + "memberAccessReportAuthenticationEnabledFalse": { + "message": "Off" + }, "higherKDFIterations": { "message": "Higher KDF iterations can help protect your master password from being brute forced by an attacker." }, diff --git a/bitwarden_license/bit-web/src/app/tools/reports/member-access-report/services/member-access-report.service.ts b/bitwarden_license/bit-web/src/app/tools/reports/member-access-report/services/member-access-report.service.ts index 4ab7ffd6e4..0548841e8c 100644 --- a/bitwarden_license/bit-web/src/app/tools/reports/member-access-report/services/member-access-report.service.ts +++ b/bitwarden_license/bit-web/src/app/tools/reports/member-access-report/services/member-access-report.service.ts @@ -64,14 +64,25 @@ export class MemberAccessReportService { const exportItems = memberAccessReports.flatMap((report) => { const userDetails = report.accessDetails.map((detail) => { + const collectionName = collectionNameMap.get(detail.collectionName.encryptedString); return { email: report.email, name: report.userName, - twoStepLogin: report.twoFactorEnabled ? "On" : "Off", - accountRecovery: report.accountRecoveryEnabled ? "On" : "Off", - group: detail.groupName, - collection: collectionNameMap.get(detail.collectionName.encryptedString), - collectionPermission: this.getPermissionText(detail), + twoStepLogin: report.twoFactorEnabled + ? this.i18nService.t("memberAccessReportTwoFactorEnabledTrue") + : this.i18nService.t("memberAccessReportTwoFactorEnabledFalse"), + accountRecovery: report.accountRecoveryEnabled + ? this.i18nService.t("memberAccessReportAuthenticationEnabledTrue") + : this.i18nService.t("memberAccessReportAuthenticationEnabledFalse"), + group: detail.groupName + ? detail.groupName + : this.i18nService.t("memberAccessReportNoGroup"), + collection: collectionName + ? collectionName + : this.i18nService.t("memberAccessReportNoCollection"), + collectionPermission: detail.collectionId + ? this.getPermissionText(detail) + : this.i18nService.t("memberAccessReportNoCollection"), totalItems: detail.itemCount.toString(), }; }); diff --git a/bitwarden_license/bit-web/src/app/tools/reports/member-access-report/view/member-access-export.view.ts b/bitwarden_license/bit-web/src/app/tools/reports/member-access-report/view/member-access-export.view.ts index be9035e1f2..2b009011af 100644 --- a/bitwarden_license/bit-web/src/app/tools/reports/member-access-report/view/member-access-export.view.ts +++ b/bitwarden_license/bit-web/src/app/tools/reports/member-access-report/view/member-access-export.view.ts @@ -10,12 +10,12 @@ export type MemberAccessExportItem = { }; export const userReportItemHeaders: { [key in keyof MemberAccessExportItem]: string } = { - email: "Email Address", - name: "Full Name", + email: "Email", + name: "Name", twoStepLogin: "Two-Step Login", accountRecovery: "Account Recovery", - group: "Group Name", - collection: "Collection Name", + group: "Group", + collection: "Collection", collectionPermission: "Collection Permission", totalItems: "Total Items", };