bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-11 22:03:36 +00:00
Code Issues Releases Wiki Activity

[AC-1077] Update "Master Password Reset" policy copy (#5463)

Browse Source 
* [AC-1077] Renamed "Master password reset" policy to "Account recovery administration"

* [AC-1077] Updated copy in TDE SSO option in configuration page to “Account Recovery Administration policy”

* [AC-1077] Updated “Reset password” action and modal to “Recover account”

* [AC-1077] Changed event message for user updating temporary password issued through account recovery

* [AC-1077] Renamed 'password reset' enrollment to 'account recovery'

* [AC-1077] Updated key names for messages that were modified for Account Recovery policy copy
This commit is contained in:
Rui Tomé
2023-06-01 08:57:30 +01:00
committed by GitHub
parent 4a7bfdb2bd
commit dea4c6858f
8 changed files with 44 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/web/src/app/admin-console/organizations/members/components/reset-password.component.html
View File

@@ -3,7 +3,7 @@
<form class="modal-content" #form (ngSubmit)="submit()" [appApiAction]="formPromise"> <form class="modal-content" #form (ngSubmit)="submit()" [appApiAction]="formPromise">
<div class="modal-header"> <div class="modal-header">
<h1 class="modal-title" id="resetPasswordTitle"> <h1 class="modal-title" id="resetPasswordTitle">
{{ "resetPassword" | i18n }} {{ "recoverAccount" | i18n }}
<small class="text-muted" *ngIf="name">{{ name }}</small> <small class="text-muted" *ngIf="name">{{ name }}</small>
</h1> </h1>
<button <button

6
apps/web/src/app/admin-console/organizations/members/people.component.html
View File

@@ -214,10 +214,10 @@
<ng-container *ngIf="showEnrolledStatus($any(u))"> <ng-container *ngIf="showEnrolledStatus($any(u))">
<i <i
class="bwi bwi-key" class="bwi bwi-key"
title="{{ 'enrolledPasswordReset' | i18n }}" title="{{ 'enrolledAccountRecovery' | i18n }}"
aria-hidden="true" aria-hidden="true"
></i> ></i>
<span class="tw-sr-only">{{ "enrolledPasswordReset" | i18n }}</span> <span class="tw-sr-only">{{ "enrolledAccountRecovery" | i18n }}</span>
</ng-container> </ng-container>
</td> </td>
<td bitCell> <td bitCell>
@@ -283,7 +283,7 @@
(click)="resetPassword(u)" (click)="resetPassword(u)"
*ngIf="allowResetPassword(u)" *ngIf="allowResetPassword(u)"
> >
<i aria-hidden="true" class="bwi bwi-key"></i> {{ "resetPassword" | i18n }} <i aria-hidden="true" class="bwi bwi-key"></i> {{ "recoverAccount" | i18n }}
</button> </button>
<button <button
type="button" type="button"

4
apps/web/src/app/admin-console/organizations/policies/reset-password.component.ts
View File

@@ -8,8 +8,8 @@ import { Organization } from "@bitwarden/common/admin-console/models/domain/orga
import { BasePolicy, BasePolicyComponent } from "./base-policy.component"; import { BasePolicy, BasePolicyComponent } from "./base-policy.component";
export class ResetPasswordPolicy extends BasePolicy { export class ResetPasswordPolicy extends BasePolicy {
name = "resetPasswordPolicy"; name = "accountRecoveryPolicy";
description = "resetPasswordPolicyDescription"; description = "accountRecoveryPolicyDescription";
type = PolicyType.ResetPassword; type = PolicyType.ResetPassword;
component = ResetPasswordPolicyComponent; component = ResetPasswordPolicyComponent;

2
apps/web/src/app/admin-console/organizations/users/enroll-master-password-reset.component.html
View File

@@ -14,7 +14,7 @@
> >
<div class="modal-header"> <div class="modal-header">
<h1 class="modal-title" id="enrollMasterPasswordResetTitle"> <h1 class="modal-title" id="enrollMasterPasswordResetTitle">
{{ "enrollPasswordReset" | i18n }} {{ "enrollAccountRecovery" | i18n }}
</h1> </h1>
<button <button
type="button" type="button"

10
apps/web/src/app/core/event.service.ts
View File

@@ -75,7 +75,7 @@ export class EventService {
msg = humanReadableMsg = this.i18nService.t("exportedVault"); msg = humanReadableMsg = this.i18nService.t("exportedVault");
break; break;
case EventType.User_UpdatedTempPassword: case EventType.User_UpdatedTempPassword:
msg = humanReadableMsg = this.i18nService.t("updatedMasterPassword"); msg = humanReadableMsg = this.i18nService.t("updatedTempPassword");
break; break;
case EventType.User_MigratedKeyToKeyConnector: case EventType.User_MigratedKeyToKeyConnector:
msg = humanReadableMsg = this.i18nService.t("migratedKeyConnector"); msg = humanReadableMsg = this.i18nService.t("migratedKeyConnector");
@@ -259,16 +259,16 @@ export class EventService {
); );
break; break;
case EventType.OrganizationUser_ResetPassword_Enroll: case EventType.OrganizationUser_ResetPassword_Enroll:
msg = this.i18nService.t("eventEnrollPasswordReset", this.formatOrgUserId(ev)); msg = this.i18nService.t("eventEnrollAccountRecovery", this.formatOrgUserId(ev));
humanReadableMsg = this.i18nService.t( humanReadableMsg = this.i18nService.t(
"eventEnrollPasswordReset", "eventEnrollAccountRecovery",
this.getShortId(ev.organizationUserId) this.getShortId(ev.organizationUserId)
); );
break; break;
case EventType.OrganizationUser_ResetPassword_Withdraw: case EventType.OrganizationUser_ResetPassword_Withdraw:
msg = this.i18nService.t("eventWithdrawPasswordReset", this.formatOrgUserId(ev)); msg = this.i18nService.t("eventWithdrawAccountRecovery", this.formatOrgUserId(ev));
humanReadableMsg = this.i18nService.t( humanReadableMsg = this.i18nService.t(
"eventWithdrawPasswordReset", "eventWithdrawAccountRecovery",
this.getShortId(ev.organizationUserId) this.getShortId(ev.organizationUserId)
); );
break; break;

4
apps/web/src/app/vault/individual-vault/vault-filter/components/organization-options.component.html
View File

@@ -18,7 +18,7 @@
(click)="toggleResetPasswordEnrollment(organization)" (click)="toggleResetPasswordEnrollment(organization)"
> >
<i class="bwi bwi-fw bwi-key" aria-hidden="true"></i> <i class="bwi bwi-fw bwi-key" aria-hidden="true"></i>
{{ "enrollPasswordReset" | i18n }} {{ "enrollAccountRecovery" | i18n }}
</button> </button>
<button <button
type="button" type="button"
@@ -27,7 +27,7 @@
(click)="toggleResetPasswordEnrollment(organization)" (click)="toggleResetPasswordEnrollment(organization)"
> >
<i class="bwi bwi-fw bwi-undo" aria-hidden="true"></i> <i class="bwi bwi-fw bwi-undo" aria-hidden="true"></i>
{{ "withdrawPasswordReset" | i18n }} {{ "withdrawAccountRecovery" | i18n }}
</button> </button>
<ng-container *ngIf="organization.useSso && organization.identifier"> <ng-container *ngIf="organization.useSso && organization.identifier">
<button <button

48
apps/web/src/locales/en/messages.json
View File

@@ -4493,14 +4493,14 @@
"hintEqualsPassword": { "hintEqualsPassword": {
"message": "Your password hint cannot be the same as your password." "message": "Your password hint cannot be the same as your password."
}, },
"enrollPasswordReset": { "enrollAccountRecovery": {
"message": "Enroll in password reset" "message": "Enroll in account recovery"
}, },
"enrolledPasswordReset": { "enrolledAccountRecovery": {
"message": "Enrolled in password reset" "message": "Enrolled in account recovery"
}, },
"withdrawPasswordReset": { "withdrawAccountRecovery": {
"message": "Withdraw from password reset" "message": "Withdraw from account recovery"
}, },
"enrollPasswordResetSuccess": { "enrollPasswordResetSuccess": {
"message": "Enrollment success!" "message": "Enrollment success!"
@@ -4508,8 +4508,8 @@
"withdrawPasswordResetSuccess": { "withdrawPasswordResetSuccess": {
"message": "Withdrawal success!" "message": "Withdrawal success!"
}, },
"eventEnrollPasswordReset": { "eventEnrollAccountRecovery": {
"message": "User $ID$ enrolled in password reset.", "message": "User $ID$ enrolled in account recovery.",
"placeholders": { "placeholders": {
"id": { "id": {
"content": "$1", "content": "$1",
@@ -4517,8 +4517,8 @@
} }
} }
}, },
"eventWithdrawPasswordReset": { "eventWithdrawAccountRecovery": {
"message": "User $ID$ withdrew from password reset.", "message": "User $ID$ withdrew from account recovery.",
"placeholders": { "placeholders": {
"id": { "id": {
"content": "$1", "content": "$1",
@@ -4577,11 +4577,11 @@
"resetPasswordEnrollmentWarning": { "resetPasswordEnrollmentWarning": {
"message": "Enrollment will allow organization administrators to change your master password" "message": "Enrollment will allow organization administrators to change your master password"
}, },
"resetPasswordPolicy": { "accountRecoveryPolicy": {
"message": "Master password reset" "message": "Account recovery administration"
}, },
"resetPasswordPolicyDescription": { "accountRecoveryPolicyDescription": {
"message": "Allow admins to reset master passwords for members." "message": "Recover member accounts when master password or trusted devices are forgotten or lost. The recovery processes is based on the account encryption method."
}, },
"resetPasswordPolicyWarning": { "resetPasswordPolicyWarning": {
"message": "Members in the organization will need to self-enroll or be auto-enrolled before administrators can reset their master password." "message": "Members in the organization will need to self-enroll or be auto-enrolled before administrators can reset their master password."
@@ -6818,16 +6818,22 @@
"trustedDeviceEncryption": { "trustedDeviceEncryption": {
"message": "Trusted device encryption" "message": "Trusted device encryption"
}, },
"memberDecryptionTdeDescStart": { "memberDecryptionTdeDescriptionStart": {
"message": "Once authenticated, members will decrypt vault data using a key stored on their device. The", "message": "Once authenticated, members will decrypt vault data using a key stored on their device. The",
"description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Once authenticated, members will decrypt vault data using a key stored on their device. The master password reset policy with automatic enrollment will turn on when this option is used.'" "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Once authenticated, members will decrypt vault data using a key stored on their device. The account recovery administration policy with automatic enrollment will turn on when this option is used.'"
}, },
"memberDecryptionTdeDescLink": { "memberDecryptionTdeDescriptionLink": {
"message": "master password reset policy", "message": "account recovery administration policy",
"description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Once authenticated, members will decrypt vault data using a key stored on their device. The master password reset policy with automatic enrollment will turn on when this option is used.'" "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Once authenticated, members will decrypt vault data using a key stored on their device. The account recovery administration policy with automatic enrollment will turn on when this option is used.'"
}, },
"memberDecryptionTdeDescEnd": { "memberDecryptionTdeDescriptionEnd": {
"message": "with automatic enrollment will turn on when this option is used.", "message": "with automatic enrollment will turn on when this option is used.",
"description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Once authenticated, members will decrypt vault data using a key stored on their device. The master password reset policy with automatic enrollment will turn on when this option is used.'" "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Once authenticated, members will decrypt vault data using a key stored on their device. The account recovery administration policy with automatic enrollment will turn on when this option is used.'"
},
"recoverAccount": {
"message": "Recover account"
},
"updatedTempPassword": {
"message": "User updated a password issued through account recovery."
} }
} }

6
bitwarden_license/bit-web/src/app/auth/sso/sso.component.html
View File

@@ -81,9 +81,9 @@
{{ "trustedDeviceEncryption" | i18n }} {{ "trustedDeviceEncryption" | i18n }}
</bit-label> </bit-label>
<bit-hint> <bit-hint>
{{ "memberDecryptionTdeDescStart" | i18n }} {{ "memberDecryptionTdeDescriptionStart" | i18n }}
<a routerLink="../policies">{{ "memberDecryptionTdeDescLink" | i18n }}</a> <a routerLink="../policies">{{ "memberDecryptionTdeDescriptionLink" | i18n }}</a>
{{ "memberDecryptionTdeDescEnd" | i18n }} {{ "memberDecryptionTdeDescriptionEnd" | i18n }}
</bit-hint> </bit-hint>
</bit-radio-button> </bit-radio-button>
</bit-radio-group> </bit-radio-group>