diff --git a/apps/web/src/app/admin-console/organizations/manage/groups.component.html b/apps/web/src/app/admin-console/organizations/manage/groups.component.html
index 1254d48cc76..82ad2c36b8c 100644
--- a/apps/web/src/app/admin-console/organizations/manage/groups.component.html
+++ b/apps/web/src/app/admin-console/organizations/manage/groups.component.html
@@ -12,7 +12,7 @@
diff --git a/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-status.component.html b/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-status.component.html
index 684c7971c1b..0b238c17d2f 100644
--- a/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-status.component.html
+++ b/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-status.component.html
@@ -18,7 +18,9 @@
{{ item.user.email }}
- {{ item.user.name }}
+ {{
+ item.user.name
+ }}
|
{{ item.message }}
diff --git a/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.html b/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.html
index 44c9d8319cb..db7422bd34b 100644
--- a/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.html
+++ b/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.html
@@ -12,7 +12,7 @@
diff --git a/apps/web/src/app/admin-console/organizations/members/members.component.html b/apps/web/src/app/admin-console/organizations/members/members.component.html
index 52315d30177..3856f6f4e28 100644
--- a/apps/web/src/app/admin-console/organizations/members/members.component.html
+++ b/apps/web/src/app/admin-console/organizations/members/members.component.html
@@ -48,7 +48,7 @@
@@ -187,7 +187,7 @@
class="tw-mr-3"
>
-
+
@@ -196,22 +196,25 @@
class="tw-text-xs"
variant="secondary"
*ngIf="u.status === userStatusType.Invited"
- >{{ "invited" | i18n }}
+ {{ "invited" | i18n }}
+
{{ "needsConfirmation" | i18n }}
+ {{ "needsConfirmation" | i18n }}
+
{{ "revoked" | i18n }}
+ {{ "revoked" | i18n }}
+
{{ u.email }}
diff --git a/apps/web/src/app/admin-console/organizations/sponsorships/accept-family-sponsorship.component.html b/apps/web/src/app/admin-console/organizations/sponsorships/accept-family-sponsorship.component.html
index 7640e1c7366..fdbb6dbba91 100644
--- a/apps/web/src/app/admin-console/organizations/sponsorships/accept-family-sponsorship.component.html
+++ b/apps/web/src/app/admin-console/organizations/sponsorships/accept-family-sponsorship.component.html
@@ -1,13 +1,13 @@
-
+
- ![Bitwarden]()
-
+
+
{{ "loading" | i18n }}
-
+
diff --git a/apps/web/src/app/admin-console/organizations/sponsorships/accept-family-sponsorship.component.ts b/apps/web/src/app/admin-console/organizations/sponsorships/accept-family-sponsorship.component.ts
index bef0589df83..7ceaed28f80 100644
--- a/apps/web/src/app/admin-console/organizations/sponsorships/accept-family-sponsorship.component.ts
+++ b/apps/web/src/app/admin-console/organizations/sponsorships/accept-family-sponsorship.component.ts
@@ -3,6 +3,7 @@
import { Component, inject } from "@angular/core";
import { Params } from "@angular/router";
+import { BitwardenLogo } from "@bitwarden/auth/angular";
import { PolicyApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy-api.service.abstraction";
import { OrganizationSponsorshipResponse } from "@bitwarden/common/admin-console/models/response/organization-sponsorship.response";
import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
@@ -20,6 +21,7 @@ import { BaseAcceptComponent } from "../../../common/base.accept.component";
templateUrl: "accept-family-sponsorship.component.html",
})
export class AcceptFamilySponsorshipComponent extends BaseAcceptComponent {
+ protected logo = BitwardenLogo;
failedShortMessage = "inviteAcceptFailedShort";
failedMessage = "inviteAcceptFailed";
diff --git a/apps/web/src/app/admin-console/organizations/sponsorships/families-for-enterprise-setup.component.html b/apps/web/src/app/admin-console/organizations/sponsorships/families-for-enterprise-setup.component.html
index b9956ebed1c..64a4eb3067d 100644
--- a/apps/web/src/app/admin-console/organizations/sponsorships/families-for-enterprise-setup.component.html
+++ b/apps/web/src/app/admin-console/organizations/sponsorships/families-for-enterprise-setup.component.html
@@ -29,7 +29,7 @@
-
+
diff --git a/apps/web/src/app/app.component.ts b/apps/web/src/app/app.component.ts
index f6e038f85d9..55e2595e0f7 100644
--- a/apps/web/src/app/app.component.ts
+++ b/apps/web/src/app/app.component.ts
@@ -16,10 +16,10 @@ import { InternalOrganizationServiceAbstraction } from "@bitwarden/common/admin-
import { InternalPolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
-import { KeyConnectorService } from "@bitwarden/common/auth/abstractions/key-connector.service";
import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
import { getUserId } from "@bitwarden/common/auth/services/account.service";
import { ProcessReloadServiceAbstraction } from "@bitwarden/common/key-management/abstractions/process-reload.service";
+import { KeyConnectorService } from "@bitwarden/common/key-management/key-connector/abstractions/key-connector.service";
import { VaultTimeoutService } from "@bitwarden/common/key-management/vault-timeout";
import { AppIdService } from "@bitwarden/common/platform/abstractions/app-id.service";
import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service";
diff --git a/apps/web/src/app/auth/hint.component.html b/apps/web/src/app/auth/hint.component.html
deleted file mode 100644
index 9f4d76d8405..00000000000
--- a/apps/web/src/app/auth/hint.component.html
+++ /dev/null
@@ -1,23 +0,0 @@
-
diff --git a/apps/web/src/app/auth/hint.component.ts b/apps/web/src/app/auth/hint.component.ts
deleted file mode 100644
index 5c180063084..00000000000
--- a/apps/web/src/app/auth/hint.component.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-import { Component, OnInit } from "@angular/core";
-import { FormBuilder, Validators } from "@angular/forms";
-import { Router } from "@angular/router";
-
-import { HintComponent as BaseHintComponent } from "@bitwarden/angular/auth/components/hint.component";
-import { LoginEmailServiceAbstraction } from "@bitwarden/auth/common";
-import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
-import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
-import { ToastService } from "@bitwarden/components";
-
-@Component({
- selector: "app-hint",
- templateUrl: "hint.component.html",
-})
-export class HintComponent extends BaseHintComponent implements OnInit {
- formGroup = this.formBuilder.group({
- email: ["", [Validators.email, Validators.required]],
- });
-
- get emailFormControl() {
- return this.formGroup.controls.email;
- }
-
- constructor(
- router: Router,
- i18nService: I18nService,
- apiService: ApiService,
- platformUtilsService: PlatformUtilsService,
- logService: LogService,
- loginEmailService: LoginEmailServiceAbstraction,
- private formBuilder: FormBuilder,
- protected toastService: ToastService,
- ) {
- super(
- router,
- i18nService,
- apiService,
- platformUtilsService,
- logService,
- loginEmailService,
- toastService,
- );
- }
-
- async ngOnInit(): Promise {
- await super.ngOnInit();
- this.emailFormControl.setValue(this.email);
- }
-
- // Wrapper method to call super.submit() since properties (e.g., submit) cannot use super directly
- // This is because properties are assigned per type and generally don't have access to the prototype
- async superSubmit() {
- await super.submit();
- }
-
- submit = async () => {
- this.email = this.emailFormControl.value;
- await this.superSubmit();
- };
-}
diff --git a/apps/web/src/app/auth/login/login-decryption-options/login-decryption-options-v1.component.html b/apps/web/src/app/auth/login/login-decryption-options/login-decryption-options-v1.component.html
deleted file mode 100644
index 615edb82d0c..00000000000
--- a/apps/web/src/app/auth/login/login-decryption-options/login-decryption-options-v1.component.html
+++ /dev/null
@@ -1,105 +0,0 @@
-
-
-
- ![Bitwarden]()
-
-
-
-
-
- {{ "loading" | i18n }}
-
-
-
-
-
- {{ "loginInitiated" | i18n }}
-
-
- {{ "deviceApprovalRequired" | i18n }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ "loggedInExclamation" | i18n }}
-
-
-
-
-
-
-
-
-
- {{ "loggingInAs" | i18n }} {{ data.userEmail }}
- {{ "notYou" | i18n }}
-
-
-
-
-
- ![Bitwarden]()
-
-
-
- {{ "loginOrCreateNewAccount" | i18n }}
-
-
-
- {{ "logInRequestSent" | i18n }}
-
-
- {{ "notificationSentDeviceComplete" | i18n }}
-
-
-
- {{ "fingerprintPhraseHeader" | i18n }}
-
- {{ fingerprintPhrase }}
-
-
-
-
-
-
-
-
-
-
-
-
- {{ "adminApprovalRequested" | i18n }}
-
-
- {{ "adminApprovalRequestSentToAdmins" | i18n }}
- {{ "youWillBeNotifiedOnceApproved" | i18n }}
-
-
-
- {{ "fingerprintPhraseHeader" | i18n }}
-
- {{ fingerprintPhrase }}
-
-
-
-
-
-
-
-
-
{{ "logInWithPasskey" | i18n }}
-
-
- {{ "off" | i18n }} - {{ "ssoLoginIsRequired" | i18n }}
-
-
- {{
- "on" | i18n
- }}
- {{
- "off" | i18n
- }}
+
+
+
+ {{ "off" | i18n }} - {{ "ssoLoginIsRequired" | i18n }}
+
+
+
+ {{ "on" | i18n }}
+
+
+ {{ "off" | i18n }}
+
+
-
- {{ "beta" | i18n }}
+ {{ "beta" | i18n }}
+
diff --git a/apps/web/src/app/auth/sso-v1.component.ts b/apps/web/src/app/auth/sso-v1.component.ts
index 42cd8301faf..d664f5b890b 100644
--- a/apps/web/src/app/auth/sso-v1.component.ts
+++ b/apps/web/src/app/auth/sso-v1.component.ts
@@ -16,10 +16,10 @@ import { OrgDomainApiServiceAbstraction } from "@bitwarden/common/admin-console/
import { OrganizationDomainSsoDetailsResponse } from "@bitwarden/common/admin-console/abstractions/organization-domain/responses/organization-domain-sso-details.response";
import { VerifiedOrganizationDomainSsoDetailsResponse } from "@bitwarden/common/admin-console/abstractions/organization-domain/responses/verified-organization-domain-sso-details.response";
import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
-import { InternalMasterPasswordServiceAbstraction } from "@bitwarden/common/auth/abstractions/master-password.service.abstraction";
import { SsoLoginServiceAbstraction } from "@bitwarden/common/auth/abstractions/sso-login.service.abstraction";
import { HttpStatusCode } from "@bitwarden/common/enums";
import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+import { InternalMasterPasswordServiceAbstraction } from "@bitwarden/common/key-management/master-password/abstractions/master-password.service.abstraction";
import { ErrorResponse } from "@bitwarden/common/models/response/error.response";
import { ListResponse } from "@bitwarden/common/models/response/list.response";
import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
diff --git a/apps/web/src/app/auth/two-factor-v1.component.ts b/apps/web/src/app/auth/two-factor-v1.component.ts
index 86b67fa7bb9..9a9fab02de3 100644
--- a/apps/web/src/app/auth/two-factor-v1.component.ts
+++ b/apps/web/src/app/auth/two-factor-v1.component.ts
@@ -14,10 +14,10 @@ import {
} from "@bitwarden/auth/common";
import { ApiService } from "@bitwarden/common/abstractions/api.service";
import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
-import { InternalMasterPasswordServiceAbstraction } from "@bitwarden/common/auth/abstractions/master-password.service.abstraction";
import { SsoLoginServiceAbstraction } from "@bitwarden/common/auth/abstractions/sso-login.service.abstraction";
import { TwoFactorService } from "@bitwarden/common/auth/abstractions/two-factor.service";
import { AuthResult } from "@bitwarden/common/auth/models/domain/auth-result";
+import { InternalMasterPasswordServiceAbstraction } from "@bitwarden/common/key-management/master-password/abstractions/master-password.service.abstraction";
import { AppIdService } from "@bitwarden/common/platform/abstractions/app-id.service";
import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
diff --git a/apps/web/src/app/billing/shared/adjust-payment-dialog/adjust-payment-dialog.component.html b/apps/web/src/app/billing/shared/adjust-payment-dialog/adjust-payment-dialog.component.html
index 4f7990f11a3..4409ab56d60 100644
--- a/apps/web/src/app/billing/shared/adjust-payment-dialog/adjust-payment-dialog.component.html
+++ b/apps/web/src/app/billing/shared/adjust-payment-dialog/adjust-payment-dialog.component.html
@@ -2,7 +2,7 @@
{
this.taxInformation = new TaxInformation();
});
+ } else if (this.providerId) {
+ this.billingApiService
+ .getProviderTaxInformation(this.providerId)
+ .then((response) => (this.taxInformation = TaxInformation.from(response)))
+ .catch(() => {
+ this.taxInformation = new TaxInformation();
+ });
} else {
this.apiService
.getTaxInfo()
@@ -104,10 +114,12 @@ export class AdjustPaymentDialogComponent implements OnInit {
}
try {
- if (!this.organizationId) {
- await this.updatePremiumUserPaymentMethod();
- } else {
+ if (this.organizationId) {
await this.updateOrganizationPaymentMethod();
+ } else if (this.providerId) {
+ await this.updateProviderPaymentMethod();
+ } else {
+ await this.updatePremiumUserPaymentMethod();
}
this.toastService.showToast({
@@ -137,20 +149,6 @@ export class AdjustPaymentDialogComponent implements OnInit {
await this.billingApiService.updateOrganizationPaymentMethod(this.organizationId, request);
};
- protected get showTaxIdField(): boolean {
- if (!this.organizationId) {
- return false;
- }
-
- switch (this.productTier) {
- case ProductTierType.Free:
- case ProductTierType.Families:
- return false;
- default:
- return true;
- }
- }
-
private updatePremiumUserPaymentMethod = async () => {
const { type, token } = await this.paymentComponent.tokenize();
@@ -168,6 +166,30 @@ export class AdjustPaymentDialogComponent implements OnInit {
await this.apiService.postAccountPayment(request);
};
+ private updateProviderPaymentMethod = async () => {
+ const paymentSource = await this.paymentComponent.tokenize();
+
+ const request = new UpdatePaymentMethodRequest();
+ request.paymentSource = paymentSource;
+ request.taxInformation = ExpandedTaxInfoUpdateRequest.From(this.taxInformation);
+
+ await this.billingApiService.updateProviderPaymentMethod(this.providerId, request);
+ };
+
+ protected get showTaxIdField(): boolean {
+ if (this.organizationId) {
+ switch (this.productTier) {
+ case ProductTierType.Free:
+ case ProductTierType.Families:
+ return false;
+ default:
+ return true;
+ }
+ } else {
+ return !!this.providerId;
+ }
+ }
+
static open = (
dialogService: DialogService,
dialogConfig: DialogConfig,
diff --git a/apps/web/src/app/core/core.module.ts b/apps/web/src/app/core/core.module.ts
index d0e876026d2..cc1e481d39b 100644
--- a/apps/web/src/app/core/core.module.ts
+++ b/apps/web/src/app/core/core.module.ts
@@ -50,11 +50,12 @@ import {
import { AccountApiService as AccountApiServiceAbstraction } from "@bitwarden/common/auth/abstractions/account-api.service";
import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
-import { InternalMasterPasswordServiceAbstraction } from "@bitwarden/common/auth/abstractions/master-password.service.abstraction";
+import { MasterPasswordApiService } from "@bitwarden/common/auth/abstractions/master-password-api.service.abstraction";
import { SsoLoginServiceAbstraction } from "@bitwarden/common/auth/abstractions/sso-login.service.abstraction";
import { ClientType } from "@bitwarden/common/enums";
import { ProcessReloadServiceAbstraction } from "@bitwarden/common/key-management/abstractions/process-reload.service";
import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
+import { InternalMasterPasswordServiceAbstraction } from "@bitwarden/common/key-management/master-password/abstractions/master-password.service.abstraction";
import {
VaultTimeout,
VaultTimeoutStringType,
@@ -279,6 +280,7 @@ const safeProviders: SafeProvider[] = [
useClass: WebSetPasswordJitService,
deps: [
ApiService,
+ MasterPasswordApiService,
KeyServiceAbstraction,
EncryptService,
I18nServiceAbstraction,
diff --git a/apps/web/src/app/key-management/key-rotation/user-key-rotation.service.spec.ts b/apps/web/src/app/key-management/key-rotation/user-key-rotation.service.spec.ts
index 3a6ff1585b7..09d35d34da8 100644
--- a/apps/web/src/app/key-management/key-rotation/user-key-rotation.service.spec.ts
+++ b/apps/web/src/app/key-management/key-rotation/user-key-rotation.service.spec.ts
@@ -2,10 +2,10 @@ import { mock, MockProxy } from "jest-mock-extended";
import { BehaviorSubject } from "rxjs";
import { OrganizationUserResetPasswordWithIdRequest } from "@bitwarden/admin-console/common";
-import { DeviceTrustServiceAbstraction } from "@bitwarden/common/auth/abstractions/device-trust.service.abstraction";
import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
import { WebauthnRotateCredentialRequest } from "@bitwarden/common/auth/models/request/webauthn-rotate-credential.request";
import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
+import { DeviceTrustServiceAbstraction } from "@bitwarden/common/key-management/device-trust/abstractions/device-trust.service.abstraction";
import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
import { EncString } from "@bitwarden/common/platform/models/domain/enc-string";
diff --git a/apps/web/src/app/key-management/key-rotation/user-key-rotation.service.ts b/apps/web/src/app/key-management/key-rotation/user-key-rotation.service.ts
index dd257282cfa..d200fff256c 100644
--- a/apps/web/src/app/key-management/key-rotation/user-key-rotation.service.ts
+++ b/apps/web/src/app/key-management/key-rotation/user-key-rotation.service.ts
@@ -2,11 +2,11 @@ import { Injectable } from "@angular/core";
import { firstValueFrom } from "rxjs";
import { Account } from "@bitwarden/common/auth/abstractions/account.service";
-import { DeviceTrustServiceAbstraction } from "@bitwarden/common/auth/abstractions/device-trust.service.abstraction";
import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
import { VerificationType } from "@bitwarden/common/auth/enums/verification-type";
import { MasterPasswordVerification } from "@bitwarden/common/auth/types/verification";
import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
+import { DeviceTrustServiceAbstraction } from "@bitwarden/common/key-management/device-trust/abstractions/device-trust.service.abstraction";
import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
import { EncryptedString } from "@bitwarden/common/platform/models/domain/enc-string";
import { SendService } from "@bitwarden/common/tools/send/services/send.service.abstraction";
diff --git a/apps/web/src/app/shared/loose-components.module.ts b/apps/web/src/app/shared/loose-components.module.ts
index d57cc6bc1b4..f21a9338491 100644
--- a/apps/web/src/app/shared/loose-components.module.ts
+++ b/apps/web/src/app/shared/loose-components.module.ts
@@ -12,7 +12,6 @@ import { EventsComponent as OrgEventsComponent } from "../admin-console/organiza
import { UserConfirmComponent as OrgUserConfirmComponent } from "../admin-console/organizations/manage/user-confirm.component";
import { VerifyRecoverDeleteOrgComponent } from "../admin-console/organizations/manage/verify-recover-delete-org.component";
import { AcceptFamilySponsorshipComponent } from "../admin-console/organizations/sponsorships/accept-family-sponsorship.component";
-import { HintComponent } from "../auth/hint.component";
import { RecoverDeleteComponent } from "../auth/recover-delete.component";
import { RecoverTwoFactorComponent } from "../auth/recover-two-factor.component";
import { RemovePasswordComponent } from "../auth/remove-password.component";
@@ -126,7 +125,6 @@ import { SharedModule } from "./shared.module";
EmergencyAccessViewComponent,
FolderAddEditComponent,
FrontendLayoutComponent,
- HintComponent,
OrgAddEditComponent,
OrgAttachmentsComponent,
OrgEventsComponent,
@@ -188,7 +186,6 @@ import { SharedModule } from "./shared.module";
EmergencyAccessViewComponent,
FolderAddEditComponent,
FrontendLayoutComponent,
- HintComponent,
OrgAddEditComponent,
OrganizationLayoutComponent,
OrgAttachmentsComponent,
diff --git a/apps/web/src/app/tools/reports/pages/exposed-passwords-report.component.html b/apps/web/src/app/tools/reports/pages/exposed-passwords-report.component.html
index 589704a409a..eb8e2c56527 100644
--- a/apps/web/src/app/tools/reports/pages/exposed-passwords-report.component.html
+++ b/apps/web/src/app/tools/reports/pages/exposed-passwords-report.component.html
@@ -49,8 +49,9 @@
appStopClick
(click)="selectCipher(row)"
title="{{ 'editItemWithName' | i18n: row.name }}"
- >{{ row.name }}
+ {{ row.name }}
+
{{ row.name }}
diff --git a/apps/web/src/app/vault/components/browser-extension-prompt/browser-extension-prompt-install.component.html b/apps/web/src/app/vault/components/browser-extension-prompt/browser-extension-prompt-install.component.html
index 709f4e8993e..eb8e3d16422 100644
--- a/apps/web/src/app/vault/components/browser-extension-prompt/browser-extension-prompt-install.component.html
+++ b/apps/web/src/app/vault/components/browser-extension-prompt/browser-extension-prompt-install.component.html
@@ -1,4 +1,6 @@
diff --git a/apps/web/src/app/vault/components/vault-item-dialog/vault-item-dialog.component.ts b/apps/web/src/app/vault/components/vault-item-dialog/vault-item-dialog.component.ts
index 881903e79e5..b2adeecbf69 100644
--- a/apps/web/src/app/vault/components/vault-item-dialog/vault-item-dialog.component.ts
+++ b/apps/web/src/app/vault/components/vault-item-dialog/vault-item-dialog.component.ts
@@ -15,6 +15,8 @@ import { AccountService } from "@bitwarden/common/auth/abstractions/account.serv
import { getUserId } from "@bitwarden/common/auth/services/account.service";
import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions";
import { EventType } from "@bitwarden/common/enums";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
@@ -231,6 +233,9 @@ export class VaultItemDialogComponent implements OnInit, OnDestroy {
* A user may restore items if they have delete permissions and the item is in the trash.
*/
protected async canUserRestore() {
+ if (await firstValueFrom(this.limitItemDeletion$)) {
+ return this.isTrashFilter && this.cipher?.isDeleted && this.cipher?.permissions.restore;
+ }
return this.isTrashFilter && this.cipher?.isDeleted && this.canDelete;
}
@@ -277,6 +282,8 @@ export class VaultItemDialogComponent implements OnInit, OnDestroy {
protected canDelete = false;
+ protected limitItemDeletion$ = this.configService.getFeatureFlag$(FeatureFlag.LimitItemDeletion);
+
constructor(
@Inject(DIALOG_DATA) protected params: VaultItemDialogParams,
private dialogRef: DialogRef,
@@ -294,6 +301,7 @@ export class VaultItemDialogComponent implements OnInit, OnDestroy {
private apiService: ApiService,
private eventCollectionService: EventCollectionService,
private routedVaultFilterService: RoutedVaultFilterService,
+ private configService: ConfigService,
) {
this.updateTitle();
}
diff --git a/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.html b/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.html
index befeee43f69..ef6a347f7d3 100644
--- a/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.html
+++ b/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.html
@@ -86,7 +86,12 @@
appStopProp
>
- |