Merge remote-tracking branch 'origin' into auth/pm-18720/change-password-component-non-dialog-v2

2026-02-19 19:04:01 +00:00 · 2025-05-13 15:22:11 -04:00
parent 339ce4731a b3df8a6c13
commit fb40ec9419
248 changed files with 3332 additions and 482 deletions
--- a/libs/common/src/abstractions/api.service.ts
+++ b/libs/common/src/abstractions/api.service.ts
@@ -475,7 +475,6 @@ export abstract class ApiService {
  getSponsorshipSyncStatus: (
    sponsoredOrgId: string,
  ) => Promise<OrganizationSponsorshipSyncStatusResponse>;
-  deleteRevokeSponsorship: (sponsoringOrganizationId: string) => Promise<void>;
  deleteRemoveSponsorship: (sponsoringOrgId: string) => Promise<void>;
  postPreValidateSponsorshipToken: (
    sponsorshipToken: string,
--- a/libs/common/src/admin-console/enums/organization-api-key-type.enum.ts
+++ b/libs/common/src/admin-console/enums/organization-api-key-type.enum.ts
@@ -1,3 +1,5 @@
+// FIXME: update to use a const object instead of a typescript enum
+// eslint-disable-next-line @bitwarden/platform/no-enums
 export enum OrganizationApiKeyType {
  Default = 0,
  BillingSync = 1,
--- a/libs/common/src/admin-console/enums/organization-connection-type.enum.ts
+++ b/libs/common/src/admin-console/enums/organization-connection-type.enum.ts
@@ -1,3 +1,5 @@
+// FIXME: update to use a const object instead of a typescript enum
+// eslint-disable-next-line @bitwarden/platform/no-enums
 export enum OrganizationConnectionType {
  CloudBillingSync = 1,
  Scim = 2,
--- a/libs/common/src/admin-console/enums/organization-user-status-type.enum.ts
+++ b/libs/common/src/admin-console/enums/organization-user-status-type.enum.ts
@@ -1,3 +1,5 @@
+// FIXME: update to use a const object instead of a typescript enum
+// eslint-disable-next-line @bitwarden/platform/no-enums
 export enum OrganizationUserStatusType {
  Invited = 0,
  Accepted = 1,
--- a/libs/common/src/admin-console/enums/organization-user-type.enum.ts
+++ b/libs/common/src/admin-console/enums/organization-user-type.enum.ts
@@ -1,3 +1,5 @@
+// FIXME: update to use a const object instead of a typescript enum
+// eslint-disable-next-line @bitwarden/platform/no-enums
 export enum OrganizationUserType {
  Owner = 0,
  Admin = 1,
--- a/libs/common/src/admin-console/enums/policy-type.enum.ts
+++ b/libs/common/src/admin-console/enums/policy-type.enum.ts
@@ -1,3 +1,5 @@
+// FIXME: update to use a const object instead of a typescript enum
+// eslint-disable-next-line @bitwarden/platform/no-enums
 export enum PolicyType {
  TwoFactorAuthentication = 0, // Requires users to have 2fa enabled
  MasterPassword = 1, // Sets minimum requirements for master password complexity
--- a/libs/common/src/admin-console/enums/provider-status-type.enum.ts
+++ b/libs/common/src/admin-console/enums/provider-status-type.enum.ts
@@ -1,3 +1,5 @@
+// FIXME: update to use a const object instead of a typescript enum
+// eslint-disable-next-line @bitwarden/platform/no-enums
 export enum ProviderStatusType {
  Pending = 0,
  Created = 1,
--- a/libs/common/src/admin-console/enums/provider-type.enum.ts
+++ b/libs/common/src/admin-console/enums/provider-type.enum.ts
@@ -1,3 +1,5 @@
+// FIXME: update to use a const object instead of a typescript enum
+// eslint-disable-next-line @bitwarden/platform/no-enums
 export enum ProviderType {
  Msp = 0,
  Reseller = 1,
--- a/libs/common/src/admin-console/enums/provider-user-status-type.enum.ts
+++ b/libs/common/src/admin-console/enums/provider-user-status-type.enum.ts
@@ -1,3 +1,5 @@
+// FIXME: update to use a const object instead of a typescript enum
+// eslint-disable-next-line @bitwarden/platform/no-enums
 export enum ProviderUserStatusType {
  Invited = 0,
  Accepted = 1,
--- a/libs/common/src/admin-console/enums/provider-user-type.enum.ts
+++ b/libs/common/src/admin-console/enums/provider-user-type.enum.ts
@@ -1,3 +1,5 @@
+// FIXME: update to use a const object instead of a typescript enum
+// eslint-disable-next-line @bitwarden/platform/no-enums
 export enum ProviderUserType {
  ProviderAdmin = 0,
  ServiceUser = 1,
--- a/libs/common/src/admin-console/enums/scim-provider-type.enum.ts
+++ b/libs/common/src/admin-console/enums/scim-provider-type.enum.ts
@@ -1,3 +1,5 @@
+// FIXME: update to use a const object instead of a typescript enum
+// eslint-disable-next-line @bitwarden/platform/no-enums
 export enum ScimProviderType {
  Default = 0,
  AzureAd = 1,
--- a/libs/common/src/admin-console/models/data/organization.data.spec.ts
+++ b/libs/common/src/admin-console/models/data/organization.data.spec.ts
@@ -59,6 +59,7 @@ describe("ORGANIZATIONS state", () => {
        userIsManagedByOrganization: false,
        useRiskInsights: false,
        useAdminSponsoredFamilies: false,
+        isAdminInitiated: false,
      },
    };
    const result = sut.deserializer(JSON.parse(JSON.stringify(expectedResult)));
--- a/libs/common/src/admin-console/models/data/organization.data.ts
+++ b/libs/common/src/admin-console/models/data/organization.data.ts
@@ -61,6 +61,7 @@ export class OrganizationData {
  userIsManagedByOrganization: boolean;
  useRiskInsights: boolean;
  useAdminSponsoredFamilies: boolean;
+  isAdminInitiated: boolean;

  constructor(
    response?: ProfileOrganizationResponse,
@@ -124,6 +125,7 @@ export class OrganizationData {
    this.userIsManagedByOrganization = response.userIsManagedByOrganization;
    this.useRiskInsights = response.useRiskInsights;
    this.useAdminSponsoredFamilies = response.useAdminSponsoredFamilies;
+    this.isAdminInitiated = response.isAdminInitiated;

    this.isMember = options.isMember;
    this.isProviderUser = options.isProviderUser;
--- a/libs/common/src/admin-console/models/domain/encrypted-organization-key.ts
+++ b/libs/common/src/admin-console/models/domain/encrypted-organization-key.ts
@@ -56,14 +56,14 @@ export class ProviderEncryptedOrganizationKey implements BaseEncryptedOrganizati
  ) {}

  async decrypt(encryptService: EncryptService, providerKeys: Record<string, SymmetricCryptoKey>) {
-    const decValue = await encryptService.decryptToBytes(
+    const decValue = await encryptService.unwrapSymmetricKey(
      new EncString(this.key),
      providerKeys[this.providerId],
    );
    if (decValue == null) {
      throw new Error("Failed to decrypt organization key");
    }
-    return new SymmetricCryptoKey(decValue) as OrgKey;
+    return decValue as OrgKey;
  }

  get encryptedOrganizationKey() {
--- a/libs/common/src/admin-console/models/domain/organization.ts
+++ b/libs/common/src/admin-console/models/domain/organization.ts
@@ -91,6 +91,7 @@ export class Organization {
  userIsManagedByOrganization: boolean;
  useRiskInsights: boolean;
  useAdminSponsoredFamilies: boolean;
+  isAdminInitiated: boolean;

  constructor(obj?: OrganizationData) {
    if (obj == null) {
@@ -150,6 +151,7 @@ export class Organization {
    this.userIsManagedByOrganization = obj.userIsManagedByOrganization;
    this.useRiskInsights = obj.useRiskInsights;
    this.useAdminSponsoredFamilies = obj.useAdminSponsoredFamilies;
+    this.isAdminInitiated = obj.isAdminInitiated;
  }

  get canAccess() {
--- a/libs/common/src/admin-console/models/request/organization-create.request.ts
+++ b/libs/common/src/admin-console/models/request/organization-create.request.ts
@@ -6,4 +6,5 @@ import { OrganizationNoPaymentMethodCreateRequest } from "../../../billing/model
 export class OrganizationCreateRequest extends OrganizationNoPaymentMethodCreateRequest {
  paymentMethodType: PaymentMethodType;
  paymentToken: string;
+  skipTrial?: boolean;
 }
--- a/libs/common/src/admin-console/models/response/profile-organization.response.ts
+++ b/libs/common/src/admin-console/models/response/profile-organization.response.ts
@@ -56,6 +56,7 @@ export class ProfileOrganizationResponse extends BaseResponse {
  userIsManagedByOrganization: boolean;
  useRiskInsights: boolean;
  useAdminSponsoredFamilies: boolean;
+  isAdminInitiated: boolean;

  constructor(response: any) {
    super(response);
@@ -123,5 +124,6 @@ export class ProfileOrganizationResponse extends BaseResponse {
    this.userIsManagedByOrganization = this.getResponseProperty("UserIsManagedByOrganization");
    this.useRiskInsights = this.getResponseProperty("UseRiskInsights");
    this.useAdminSponsoredFamilies = this.getResponseProperty("UseAdminSponsoredFamilies");
+    this.isAdminInitiated = this.getResponseProperty("IsAdminInitiated");
  }
 }
--- a/libs/common/src/auth/enums/auth-request-type.ts
+++ b/libs/common/src/auth/enums/auth-request-type.ts
@@ -1,3 +1,5 @@
+// FIXME: update to use a const object instead of a typescript enum
+// eslint-disable-next-line @bitwarden/platform/no-enums
 export enum AuthRequestType {
  AuthenticateAndUnlock = 0,
  Unlock = 1,
--- a/libs/common/src/auth/enums/authentication-status.ts
+++ b/libs/common/src/auth/enums/authentication-status.ts
@@ -1,3 +1,5 @@
+// FIXME: update to use a const object instead of a typescript enum
+// eslint-disable-next-line @bitwarden/platform/no-enums
 export enum AuthenticationStatus {
  LoggedOut = 0,
  Locked = 1,
--- a/libs/common/src/auth/enums/authentication-type.ts
+++ b/libs/common/src/auth/enums/authentication-type.ts
@@ -1,3 +1,5 @@
+// FIXME: update to use a const object instead of a typescript enum
+// eslint-disable-next-line @bitwarden/platform/no-enums
 export enum AuthenticationType {
  Password = 0,
  Sso = 1,
--- a/libs/common/src/auth/enums/sso.ts
+++ b/libs/common/src/auth/enums/sso.ts
@@ -1,25 +1,35 @@
+// FIXME: update to use a const object instead of a typescript enum
+// eslint-disable-next-line @bitwarden/platform/no-enums
 export enum SsoType {
  None = 0,
  OpenIdConnect = 1,
  Saml2 = 2,
 }

+// FIXME: update to use a const object instead of a typescript enum
+// eslint-disable-next-line @bitwarden/platform/no-enums
 export enum MemberDecryptionType {
  MasterPassword = 0,
  KeyConnector = 1,
  TrustedDeviceEncryption = 2,
 }

+// FIXME: update to use a const object instead of a typescript enum
+// eslint-disable-next-line @bitwarden/platform/no-enums
 export enum OpenIdConnectRedirectBehavior {
  RedirectGet = 0,
  FormPost = 1,
 }

+// FIXME: update to use a const object instead of a typescript enum
+// eslint-disable-next-line @bitwarden/platform/no-enums
 export enum Saml2BindingType {
  HttpRedirect = 1,
  HttpPost = 2,
 }

+// FIXME: update to use a const object instead of a typescript enum
+// eslint-disable-next-line @bitwarden/platform/no-enums
 export enum Saml2NameIdFormat {
  NotConfigured = 0,
  Unspecified = 1,
@@ -32,6 +42,8 @@ export enum Saml2NameIdFormat {
  Transient = 8,
 }

+// FIXME: update to use a const object instead of a typescript enum
+// eslint-disable-next-line @bitwarden/platform/no-enums
 export enum Saml2SigningBehavior {
  IfIdpWantAuthnRequestsSigned = 0,
  Always = 1,
--- a/libs/common/src/auth/enums/two-factor-provider-type.ts
+++ b/libs/common/src/auth/enums/two-factor-provider-type.ts
@@ -1,3 +1,5 @@
+// FIXME: update to use a const object instead of a typescript enum
+// eslint-disable-next-line @bitwarden/platform/no-enums
 export enum TwoFactorProviderType {
  Authenticator = 0,
  Email = 1,
--- a/libs/common/src/auth/enums/verification-type.ts
+++ b/libs/common/src/auth/enums/verification-type.ts
@@ -1,3 +1,5 @@
+// FIXME: update to use a const object instead of a typescript enum
+// eslint-disable-next-line @bitwarden/platform/no-enums
 export enum VerificationType {
  MasterPassword = 0,
  OTP = 1,
--- a/libs/common/src/auth/models/domain/force-set-password-reason.ts
+++ b/libs/common/src/auth/models/domain/force-set-password-reason.ts
@@ -2,6 +2,8 @@
 * This enum is used to determine if a user should be forced to initially set or reset their password
 * on login (server flag) or unlock via MP (client evaluation).
 */
+// FIXME: update to use a const object instead of a typescript enum
+// eslint-disable-next-line @bitwarden/platform/no-enums
 export enum ForceSetPasswordReason {
  /**
   * A password reset should not be forced.
--- a/libs/common/src/auth/services/token.service.ts
+++ b/libs/common/src/auth/services/token.service.ts
@@ -43,6 +43,8 @@ import {
  SECURITY_STAMP_MEMORY,
 } from "./token.state";

+// FIXME: update to use a const object instead of a typescript enum
+// eslint-disable-next-line @bitwarden/platform/no-enums
 export enum TokenStorageLocation {
  Disk = "disk",
  SecureStorage = "secureStorage",
--- a/libs/common/src/autofill/constants/index.ts
+++ b/libs/common/src/autofill/constants/index.ts
@@ -38,7 +38,7 @@ export const ClearClipboardDelay = {
  FiveMinutes: 300,
 } as const;

-/* Context Menu item Ids */
+/* Ids for context menu items and messaging events */
 export const AUTOFILL_CARD_ID = "autofill-card";
 export const AUTOFILL_ID = "autofill";
 export const SHOW_AUTOFILL_BUTTON = "show-autofill-button";
@@ -54,6 +54,7 @@ export const GENERATE_PASSWORD_ID = "generate-password";
 export const NOOP_COMMAND_SUFFIX = "noop";
 export const ROOT_ID = "root";
 export const SEPARATOR_ID = "separator";
+export const UPDATE_PASSWORD = "update-password";

 export const NOTIFICATION_BAR_LIFESPAN_MS = 150000; // 150 seconds

--- a/libs/common/src/billing/abstractions/organization-billing.service.ts
+++ b/libs/common/src/billing/abstractions/organization-billing.service.ts
@@ -39,6 +39,7 @@ export type BillingInformation = {
 export type PaymentInformation = {
  paymentMethod: [string, PaymentMethodType];
  billing: BillingInformation;
+  skipTrial?: boolean;
 };

 export type SubscriptionInformation = {
--- a/libs/common/src/billing/abstractions/organizations/organization-sponsorship-api.service.abstraction.ts
+++ b/libs/common/src/billing/abstractions/organizations/organization-sponsorship-api.service.abstraction.ts
@@ -10,4 +10,9 @@ export abstract class OrganizationSponsorshipApiServiceAbstraction {
    sponsoringOrgId: string,
    friendlyName?: string,
  ): Promise<void>;
+
+  abstract deleteRevokeSponsorship: (
+    sponsoringOrganizationId: string,
+    isAdminInitiated?: boolean,
+  ) => Promise<void>;
 }
--- a/libs/common/src/billing/abstractions/tax.service.abstraction.ts
+++ b/libs/common/src/billing/abstractions/tax.service.abstraction.ts
@@ -1,7 +1,9 @@
 import { CountryListItem } from "../models/domain";
 import { PreviewIndividualInvoiceRequest } from "../models/request/preview-individual-invoice.request";
 import { PreviewOrganizationInvoiceRequest } from "../models/request/preview-organization-invoice.request";
+import { PreviewTaxAmountForOrganizationTrialRequest } from "../models/request/tax";
 import { PreviewInvoiceResponse } from "../models/response/preview-invoice.response";
+import { PreviewTaxAmountResponse } from "../models/response/tax";

 export abstract class TaxServiceAbstraction {
  abstract getCountries(): CountryListItem[];
@@ -15,4 +17,8 @@ export abstract class TaxServiceAbstraction {
  abstract previewOrganizationInvoice(
    request: PreviewOrganizationInvoiceRequest,
  ): Promise<PreviewInvoiceResponse>;
+
+  abstract previewTaxAmountForOrganizationTrial: (
+    request: PreviewTaxAmountForOrganizationTrialRequest,
+  ) => Promise<PreviewTaxAmountResponse>;
 }
--- a/libs/common/src/billing/enums/bitwarden-product-type.enum.ts
+++ b/libs/common/src/billing/enums/bitwarden-product-type.enum.ts
@@ -1,3 +1,5 @@
+// FIXME: update to use a const object instead of a typescript enum
+// eslint-disable-next-line @bitwarden/platform/no-enums
 export enum BitwardenProductType {
  PasswordManager = 0,
  SecretsManager = 1,
--- a/libs/common/src/billing/enums/payment-method-type.enum.ts
+++ b/libs/common/src/billing/enums/payment-method-type.enum.ts
@@ -1,3 +1,5 @@
+// FIXME: update to use a const object instead of a typescript enum
+// eslint-disable-next-line @bitwarden/platform/no-enums
 export enum PaymentMethodType {
  Card = 0,
  BankAccount = 1,
--- a/libs/common/src/billing/enums/plan-interval.enum.ts
+++ b/libs/common/src/billing/enums/plan-interval.enum.ts
@@ -1,3 +1,5 @@
+// FIXME: update to use a const object instead of a typescript enum
+// eslint-disable-next-line @bitwarden/platform/no-enums
 export enum PlanInterval {
  Monthly = 0,
  Annually = 1,
--- a/libs/common/src/billing/enums/plan-sponsorship-type.enum.ts
+++ b/libs/common/src/billing/enums/plan-sponsorship-type.enum.ts
@@ -1,3 +1,5 @@
+// FIXME: update to use a const object instead of a typescript enum
+// eslint-disable-next-line @bitwarden/platform/no-enums
 export enum PlanSponsorshipType {
  FamiliesForEnterprise = 0,
 }
--- a/libs/common/src/billing/enums/plan-type.enum.ts
+++ b/libs/common/src/billing/enums/plan-type.enum.ts
@@ -1,3 +1,5 @@
+// FIXME: update to use a const object instead of a typescript enum
+// eslint-disable-next-line @bitwarden/platform/no-enums
 export enum PlanType {
  Free = 0,
  FamiliesAnnually2019 = 1,
--- a/libs/common/src/billing/enums/product-tier-type.enum.ts
+++ b/libs/common/src/billing/enums/product-tier-type.enum.ts
@@ -1,3 +1,5 @@
+// FIXME: update to use a const object instead of a typescript enum
+// eslint-disable-next-line @bitwarden/platform/no-enums
 export enum ProductTierType {
  Free = 0,
  Families = 1,
--- a/libs/common/src/billing/enums/product-type.enum.ts
+++ b/libs/common/src/billing/enums/product-type.enum.ts
@@ -1,3 +1,5 @@
+// FIXME: update to use a const object instead of a typescript enum
+// eslint-disable-next-line @bitwarden/platform/no-enums
 export enum ProductType {
  PasswordManager = 0,
  SecretsManager = 1,
--- a/libs/common/src/billing/enums/transaction-type.enum.ts
+++ b/libs/common/src/billing/enums/transaction-type.enum.ts
@@ -1,3 +1,5 @@
+// FIXME: update to use a const object instead of a typescript enum
+// eslint-disable-next-line @bitwarden/platform/no-enums
 export enum TransactionType {
  Charge = 0,
  Credit = 1,
--- a/libs/common/src/billing/models/request/tax/index.ts
+++ b/libs/common/src/billing/models/request/tax/index.ts
@@ -0,0 +1 @@
+export * from "./preview-tax-amount-for-organization-trial.request";
--- a/libs/common/src/billing/models/request/tax/preview-tax-amount-for-organization-trial.request.ts
+++ b/libs/common/src/billing/models/request/tax/preview-tax-amount-for-organization-trial.request.ts
@@ -0,0 +1,11 @@
+import { PlanType, ProductType } from "../../../enums";
+
+export type PreviewTaxAmountForOrganizationTrialRequest = {
+  planType: PlanType;
+  productType: ProductType;
+  taxInformation: {
+    country: string;
+    postalCode: string;
+    taxId?: string;
+  };
+};
--- a/libs/common/src/billing/models/response/tax/index.ts
+++ b/libs/common/src/billing/models/response/tax/index.ts
@@ -0,0 +1 @@
+export * from "./preview-tax-amount.response";
--- a/libs/common/src/billing/models/response/tax/preview-tax-amount.response.ts
+++ b/libs/common/src/billing/models/response/tax/preview-tax-amount.response.ts
@@ -0,0 +1,11 @@
+import { BaseResponse } from "../../../../models/response/base.response";
+
+export class PreviewTaxAmountResponse extends BaseResponse {
+  taxAmount: number;
+
+  constructor(response: any) {
+    super(response);
+
+    this.taxAmount = this.getResponseProperty("TaxAmount");
+  }
+}
--- a/libs/common/src/billing/services/organization-billing.service.ts
+++ b/libs/common/src/billing/services/organization-billing.service.ts
@@ -174,6 +174,7 @@ export class OrganizationBillingService implements OrganizationBillingServiceAbs
    const [paymentToken, paymentMethodType] = information.paymentMethod;
    request.paymentToken = paymentToken;
    request.paymentMethodType = paymentMethodType;
+    request.skipTrial = information.skipTrial;

    const billingInformation = information.billing;
    request.billingAddressPostalCode = billingInformation.postalCode;
--- a/libs/common/src/billing/services/organization/organization-sponsorship-api.service.ts
+++ b/libs/common/src/billing/services/organization/organization-sponsorship-api.service.ts
@@ -1,12 +1,16 @@
 import { ApiService } from "../../../abstractions/api.service";
 import { ListResponse } from "../../../models/response/list.response";
+import { PlatformUtilsService } from "../../../platform/abstractions/platform-utils.service";
 import { OrganizationSponsorshipApiServiceAbstraction } from "../../abstractions/organizations/organization-sponsorship-api.service.abstraction";
 import { OrganizationSponsorshipInvitesResponse } from "../../models/response/organization-sponsorship-invites.response";

 export class OrganizationSponsorshipApiService
  implements OrganizationSponsorshipApiServiceAbstraction
 {
-  constructor(private apiService: ApiService) {}
+  constructor(
+    private apiService: ApiService,
+    private platformUtilsService: PlatformUtilsService,
+  ) {}
  async getOrganizationSponsorship(
    sponsoredOrgId: string,
  ): Promise<ListResponse<OrganizationSponsorshipInvitesResponse>> {
@@ -33,4 +37,21 @@ export class OrganizationSponsorshipApiService

    return await this.apiService.send("POST", url, null, true, false);
  }
+
+  async deleteRevokeSponsorship(
+    sponsoringOrganizationId: string,
+    isAdminInitiated: boolean = false,
+  ): Promise<void> {
+    const basePath = "/organization/sponsorship/";
+    const hostPath = this.platformUtilsService.isSelfHost() ? "self-hosted/" : "";
+    const queryParam = `?isAdminInitiated=${isAdminInitiated}`;
+
+    return await this.apiService.send(
+      "DELETE",
+      basePath + hostPath + sponsoringOrganizationId + queryParam,
+      null,
+      true,
+      false,
+    );
+  }
 }
--- a/libs/common/src/billing/services/tax.service.ts
+++ b/libs/common/src/billing/services/tax.service.ts
@@ -1,3 +1,6 @@
+import { PreviewTaxAmountForOrganizationTrialRequest } from "@bitwarden/common/billing/models/request/tax";
+import { PreviewTaxAmountResponse } from "@bitwarden/common/billing/models/response/tax";
+
 import { ApiService } from "../../abstractions/api.service";
 import { TaxServiceAbstraction } from "../abstractions/tax.service.abstraction";
 import { CountryListItem } from "../models/domain";
@@ -300,4 +303,16 @@ export class TaxService implements TaxServiceAbstraction {
    );
    return new PreviewInvoiceResponse(response);
  }
+
+  async previewTaxAmountForOrganizationTrial(
+    request: PreviewTaxAmountForOrganizationTrialRequest,
+  ): Promise<PreviewTaxAmountResponse> {
+    return await this.apiService.send(
+      "POST",
+      "/tax/preview-amount/organization-trial",
+      request,
+      true,
+      true,
+    );
+  }
 }
--- a/libs/common/src/enums/client-type.enum.ts
+++ b/libs/common/src/enums/client-type.enum.ts
@@ -1,3 +1,5 @@
+// FIXME: update to use a const object instead of a typescript enum
+// eslint-disable-next-line @bitwarden/platform/no-enums
 export enum ClientType {
  Web = "web",
  Browser = "browser",
--- a/libs/common/src/enums/device-type.enum.ts
+++ b/libs/common/src/enums/device-type.enum.ts
@@ -1,3 +1,5 @@
+// FIXME: update to use a const object instead of a typescript enum
+// eslint-disable-next-line @bitwarden/platform/no-enums
 export enum DeviceType {
  Android = 0,
  iOS = 1,
--- a/libs/common/src/enums/event-system-user.enum.ts
+++ b/libs/common/src/enums/event-system-user.enum.ts
@@ -1,4 +1,6 @@
 // Note: the enum key is used to describe the EventSystemUser in the UI. Be careful about changing it.
+// FIXME: update to use a const object instead of a typescript enum
+// eslint-disable-next-line @bitwarden/platform/no-enums
 export enum EventSystemUser {
  SCIM = 1,
  DomainVerification = 2,
--- a/libs/common/src/enums/event-type.enum.ts
+++ b/libs/common/src/enums/event-type.enum.ts
@@ -1,4 +1,6 @@
 // Increment by 100 for each new set of events
+// FIXME: update to use a const object instead of a typescript enum
+// eslint-disable-next-line @bitwarden/platform/no-enums
 export enum EventType {
  User_LoggedIn = 1000,
  User_ChangedPassword = 1001,
--- a/libs/common/src/enums/feature-flag.enum.ts
+++ b/libs/common/src/enums/feature-flag.enum.ts
@@ -7,6 +7,8 @@ import { ServerConfig } from "../platform/abstractions/config/server-config";
 *
 * Flags should be grouped by team to have visibility of ownership and cleanup.
 */
+// FIXME: update to use a const object instead of a typescript enum
+// eslint-disable-next-line @bitwarden/platform/no-enums
 export enum FeatureFlag {
  /* Admin Console Team */
  VerifiedSsoDomainEndpoint = "pm-12337-refactor-sso-details-endpoint",
@@ -16,9 +18,8 @@ export enum FeatureFlag {
  SeparateCustomRolePermissions = "pm-19917-separate-custom-role-permissions",

  /* Auth */
-  PM9112_DeviceApprovalPersistence = "pm-9112-device-approval-persistence",
-  PM16117_ChangeExistingPasswordRefactor = "pm-16117-change-existing-password-refactor",
  PM9115_TwoFactorExtensionDataPersistence = "pm-9115-two-factor-extension-data-persistence",
+  PM16117_ChangeExistingPasswordRefactor = "pm-16117-change-existing-password-refactor",

  /* Autofill */
  BlockBrowserInjectionsByDomain = "block-browser-injections-by-domain",
@@ -56,7 +57,6 @@ export enum FeatureFlag {
  /* Vault */
  PM8851_BrowserOnboardingNudge = "pm-8851-browser-onboarding-nudge",
  PM9111ExtensionPersistAddEditForm = "pm-9111-extension-persist-add-edit-form",
-  VaultBulkManagementAction = "vault-bulk-management-action",
  SecurityTasks = "security-tasks",
  CipherKeyEncryption = "cipher-key-encryption",
  PM18520_UpdateDesktopCipherForm = "pm-18520-desktop-cipher-forms",
@@ -108,14 +108,12 @@ export const DefaultFeatureFlagValue = {
  /* Vault */
  [FeatureFlag.PM8851_BrowserOnboardingNudge]: FALSE,
  [FeatureFlag.PM9111ExtensionPersistAddEditForm]: FALSE,
-  [FeatureFlag.VaultBulkManagementAction]: FALSE,
  [FeatureFlag.SecurityTasks]: FALSE,
  [FeatureFlag.CipherKeyEncryption]: FALSE,
  [FeatureFlag.PM18520_UpdateDesktopCipherForm]: FALSE,
  [FeatureFlag.EndUserNotifications]: FALSE,

  /* Auth */
-  [FeatureFlag.PM9112_DeviceApprovalPersistence]: FALSE,
  [FeatureFlag.PM16117_ChangeExistingPasswordRefactor]: FALSE,
  [FeatureFlag.PM9115_TwoFactorExtensionDataPersistence]: FALSE,

--- a/libs/common/src/enums/http-status-code.enum.ts
+++ b/libs/common/src/enums/http-status-code.enum.ts
@@ -4,6 +4,8 @@
 * @see {@link https://en.wikipedia.org/wiki/List_of_HTTP_status_codes}
 * src: https://gist.github.com/RWOverdijk/6cef816cfdf5722228e01cc05fd4b094
 */
+// FIXME: update to use a const object instead of a typescript enum
+// eslint-disable-next-line @bitwarden/platform/no-enums
 export enum HttpStatusCode {
  /**
   * The server has received the request headers and the client should proceed to send the request body
--- a/libs/common/src/enums/integration-type.enum.ts
+++ b/libs/common/src/enums/integration-type.enum.ts
@@ -1,3 +1,5 @@
+// FIXME: update to use a const object instead of a typescript enum
+// eslint-disable-next-line @bitwarden/platform/no-enums
 export enum IntegrationType {
  Integration = "integration",
  SDK = "sdk",
--- a/libs/common/src/enums/native-messaging-version.enum.ts
+++ b/libs/common/src/enums/native-messaging-version.enum.ts
@@ -1,3 +1,5 @@
+// FIXME: update to use a const object instead of a typescript enum
+// eslint-disable-next-line @bitwarden/platform/no-enums
 export enum NativeMessagingVersion {
  One = 1, // Original implementation
  Latest = One,
--- a/libs/common/src/enums/notification-type.enum.ts
+++ b/libs/common/src/enums/notification-type.enum.ts
@@ -1,3 +1,5 @@
+// FIXME: update to use a const object instead of a typescript enum
+// eslint-disable-next-line @bitwarden/platform/no-enums
 export enum NotificationType {
  SyncCipherUpdate = 0,
  SyncCipherCreate = 1,
--- a/libs/common/src/enums/push-technology.enum.ts
+++ b/libs/common/src/enums/push-technology.enum.ts
@@ -1,6 +1,8 @@
 /**
 * The preferred push technology of the server.
 */
+// FIXME: update to use a const object instead of a typescript enum
+// eslint-disable-next-line @bitwarden/platform/no-enums
 export enum PushTechnology {
  /**
   * Indicates that we should use SignalR over web sockets to receive push notifications from the server.
--- a/libs/common/src/key-management/master-password/abstractions/master-password.service.abstraction.ts
+++ b/libs/common/src/key-management/master-password/abstractions/master-password.service.abstraction.ts
@@ -37,13 +37,13 @@ export abstract class MasterPasswordServiceAbstraction {
   * @param userKey The user's encrypted symmetric key
   * @throws If either the MasterKey or UserKey are not resolved, or if the UserKey encryption type
   *         is neither AesCbc256_B64 nor AesCbc256_HmacSha256_B64
-   * @returns The user key
+   * @returns The user key or null if the masterkey is wrong
   */
  abstract decryptUserKeyWithMasterKey: (
    masterKey: MasterKey,
    userId: string,
    userKey?: EncString,
-  ) => Promise<UserKey>;
+  ) => Promise<UserKey | null>;
 }

 export abstract class InternalMasterPasswordServiceAbstraction extends MasterPasswordServiceAbstraction {
--- a/libs/common/src/key-management/master-password/services/master-password.service.ts
+++ b/libs/common/src/key-management/master-password/services/master-password.service.ts
@@ -166,7 +166,7 @@ export class MasterPasswordService implements InternalMasterPasswordServiceAbstr
    masterKey: MasterKey,
    userId: UserId,
    userKey?: EncString,
-  ): Promise<UserKey> {
+  ): Promise<UserKey | null> {
    userKey ??= await this.getMasterKeyEncryptedUserKey(userId);
    masterKey ??= await firstValueFrom(this.masterKey$(userId));

@@ -177,16 +177,26 @@ export class MasterPasswordService implements InternalMasterPasswordServiceAbstr
    let decUserKey: SymmetricCryptoKey;

    if (userKey.encryptionType === EncryptionType.AesCbc256_B64) {
-      decUserKey = await this.encryptService.unwrapSymmetricKey(userKey, masterKey);
+      try {
+        decUserKey = await this.encryptService.unwrapSymmetricKey(userKey, masterKey);
+      } catch {
+        this.logService.warning("Failed to decrypt user key with master key.");
+        return null;
+      }
    } else if (userKey.encryptionType === EncryptionType.AesCbc256_HmacSha256_B64) {
-      const newKey = await this.keyGenerationService.stretchKey(masterKey);
-      decUserKey = await this.encryptService.unwrapSymmetricKey(userKey, newKey);
+      try {
+        const newKey = await this.keyGenerationService.stretchKey(masterKey);
+        decUserKey = await this.encryptService.unwrapSymmetricKey(userKey, newKey);
+      } catch {
+        this.logService.warning("Failed to decrypt user key with stretched master key.");
+        return null;
+      }
    } else {
      throw new Error("Unsupported encryption type.");
    }

    if (decUserKey == null) {
-      this.logService.warning("Failed to decrypt user key with master key.");
+      this.logService.warning("Failed to decrypt user key with master key, user key is null.");
      return null;
    }

--- a/libs/common/src/key-management/vault-timeout/enums/vault-timeout-action.enum.ts
+++ b/libs/common/src/key-management/vault-timeout/enums/vault-timeout-action.enum.ts
@@ -1,3 +1,5 @@
+// FIXME: update to use a const object instead of a typescript enum
+// eslint-disable-next-line @bitwarden/platform/no-enums
 export enum VaultTimeoutAction {
  Lock = "lock",
  LogOut = "logOut",
--- a/libs/common/src/platform/abstractions/environment.service.ts
+++ b/libs/common/src/platform/abstractions/environment.service.ts
@@ -17,6 +17,8 @@ export type Urls = {
 /**
 * A subset of available regions, additional regions can be loaded through configuration.
 */
+// FIXME: update to use a const object instead of a typescript enum
+// eslint-disable-next-line @bitwarden/platform/no-enums
 export enum Region {
  US = "US",
  EU = "EU",
--- a/libs/common/src/platform/abstractions/fido2/fido2-authenticator.service.abstraction.ts
+++ b/libs/common/src/platform/abstractions/fido2/fido2-authenticator.service.abstraction.ts
@@ -46,11 +46,15 @@ export abstract class Fido2AuthenticatorService<ParentWindowReference> {
  silentCredentialDiscovery: (rpId: string) => Promise<Fido2CredentialView[]>;
 }

+// FIXME: update to use a const object instead of a typescript enum
+// eslint-disable-next-line @bitwarden/platform/no-enums
 export enum Fido2AlgorithmIdentifier {
  ES256 = -7,
  RS256 = -257,
 }

+// FIXME: update to use a const object instead of a typescript enum
+// eslint-disable-next-line @bitwarden/platform/no-enums
 export enum Fido2AuthenticatorErrorCode {
  Unknown = "UnknownError",
  NotSupported = "NotSupportedError",
--- a/libs/common/src/platform/enums/encryption-type.enum.ts
+++ b/libs/common/src/platform/enums/encryption-type.enum.ts
@@ -1,3 +1,5 @@
+// FIXME: update to use a const object instead of a typescript enum
+// eslint-disable-next-line @bitwarden/platform/no-enums
 export enum EncryptionType {
  AesCbc256_B64 = 0,
  // Type 1 was the unused and removed AesCbc128_HmacSha256_B64
--- a/libs/common/src/platform/enums/file-upload-type.enum.ts
+++ b/libs/common/src/platform/enums/file-upload-type.enum.ts
@@ -1,3 +1,5 @@
+// FIXME: update to use a const object instead of a typescript enum
+// eslint-disable-next-line @bitwarden/platform/no-enums
 export enum FileUploadType {
  Direct = 0,
  Azure = 1,
--- a/libs/common/src/platform/enums/hash-purpose.enum.ts
+++ b/libs/common/src/platform/enums/hash-purpose.enum.ts
@@ -1,3 +1,5 @@
+// FIXME: update to use a const object instead of a typescript enum
+// eslint-disable-next-line @bitwarden/platform/no-enums
 export enum HashPurpose {
  ServerAuthorization = 1,
  LocalAuthorization = 2,
--- a/libs/common/src/platform/enums/html-storage-location.enum.ts
+++ b/libs/common/src/platform/enums/html-storage-location.enum.ts
@@ -1,3 +1,5 @@
+// FIXME: update to use a const object instead of a typescript enum
+// eslint-disable-next-line @bitwarden/platform/no-enums
 export enum HtmlStorageLocation {
  Local = "local",
  Memory = "memory",
--- a/libs/common/src/platform/enums/key-suffix-options.enum.ts
+++ b/libs/common/src/platform/enums/key-suffix-options.enum.ts
@@ -1,3 +1,5 @@
+// FIXME: update to use a const object instead of a typescript enum
+// eslint-disable-next-line @bitwarden/platform/no-enums
 export enum KeySuffixOptions {
  Auto = "auto",
  Pin = "pin",
--- a/libs/common/src/platform/enums/log-level-type.enum.ts
+++ b/libs/common/src/platform/enums/log-level-type.enum.ts
@@ -1,3 +1,5 @@
+// FIXME: update to use a const object instead of a typescript enum
+// eslint-disable-next-line @bitwarden/platform/no-enums
 export enum LogLevelType {
  Debug,
  Info,
--- a/libs/common/src/platform/enums/storage-location.enum.ts
+++ b/libs/common/src/platform/enums/storage-location.enum.ts
@@ -1,3 +1,5 @@
+// FIXME: update to use a const object instead of a typescript enum
+// eslint-disable-next-line @bitwarden/platform/no-enums
 export enum StorageLocation {
  Both = "both",
  Disk = "disk",
--- a/libs/common/src/platform/enums/theme-type.enum.ts
+++ b/libs/common/src/platform/enums/theme-type.enum.ts
@@ -1,6 +1,8 @@
 /**
 * @deprecated prefer the `ThemeTypes` constants and `Theme` type over unsafe enum types
 **/
+// FIXME: update to use a const object instead of a typescript enum
+// eslint-disable-next-line @bitwarden/platform/no-enums
 export enum ThemeType {
  System = "system",
  Light = "light",
--- a/libs/common/src/platform/services/cryptography/initializer-key.ts
+++ b/libs/common/src/platform/services/cryptography/initializer-key.ts
@@ -1,3 +1,5 @@
+// FIXME: update to use a const object instead of a typescript enum
+// eslint-disable-next-line @bitwarden/platform/no-enums
 export enum InitializerKey {
  Cipher = 0,
  CipherView = 1,
--- a/libs/common/src/services/api.service.ts
+++ b/libs/common/src/services/api.service.ts
@@ -1621,18 +1621,6 @@ export class ApiService implements ApiServiceAbstraction {
    return new OrganizationSponsorshipSyncStatusResponse(response);
  }

-  async deleteRevokeSponsorship(sponsoringOrganizationId: string): Promise<void> {
-    return await this.send(
-      "DELETE",
-      "/organization/sponsorship/" +
-        (this.platformUtilsService.isSelfHost() ? "self-hosted/" : "") +
-        sponsoringOrganizationId,
-      null,
-      true,
-      false,
-    );
-  }
-
  async deleteRemoveSponsorship(sponsoringOrgId: string): Promise<void> {
    return await this.send(
      "DELETE",
--- a/libs/common/src/state-migrations/migrations/28-move-provider-state-to-state-provider.ts
+++ b/libs/common/src/state-migrations/migrations/28-move-provider-state-to-state-provider.ts
@@ -5,6 +5,8 @@ import { Jsonify } from "type-fest";
 import { KeyDefinitionLike, MigrationHelper } from "../migration-helper";
 import { Migrator } from "../migrator";

+// FIXME: update to use a const object instead of a typescript enum
+// eslint-disable-next-line @bitwarden/platform/no-enums
 enum ProviderUserStatusType {
  Invited = 0,
  Accepted = 1,
@@ -12,6 +14,8 @@ enum ProviderUserStatusType {
  Revoked = -1,
 }

+// FIXME: update to use a const object instead of a typescript enum
+// eslint-disable-next-line @bitwarden/platform/no-enums
 enum ProviderUserType {
  ProviderAdmin = 0,
  ServiceUser = 1,
--- a/libs/common/src/state-migrations/migrations/30-move-policy-state-to-state-provider.ts
+++ b/libs/common/src/state-migrations/migrations/30-move-policy-state-to-state-provider.ts
@@ -3,6 +3,8 @@
 import { KeyDefinitionLike, MigrationHelper } from "../migration-helper";
 import { Migrator } from "../migrator";

+// FIXME: update to use a const object instead of a typescript enum
+// eslint-disable-next-line @bitwarden/platform/no-enums
 enum PolicyType {
  TwoFactorAuthentication = 0, // Requires users to have 2fa enabled
  MasterPassword = 1, // Sets minimum requirements for master password complexity
--- a/libs/common/src/state-migrations/migrations/40-move-organization-state-to-state-provider.ts
+++ b/libs/common/src/state-migrations/migrations/40-move-organization-state-to-state-provider.ts
@@ -7,6 +7,8 @@ import { Migrator } from "../migrator";

 // Local declarations of `OrganizationData` and the types of it's properties.
 // Duplicated to remain frozen in time when migration occurs.
+// FIXME: update to use a const object instead of a typescript enum
+// eslint-disable-next-line @bitwarden/platform/no-enums
 enum OrganizationUserStatusType {
  Invited = 0,
  Accepted = 1,
@@ -14,6 +16,8 @@ enum OrganizationUserStatusType {
  Revoked = -1,
 }

+// FIXME: update to use a const object instead of a typescript enum
+// eslint-disable-next-line @bitwarden/platform/no-enums
 enum OrganizationUserType {
  Owner = 0,
  Admin = 1,
@@ -40,11 +44,15 @@ type PermissionsApi = {
  manageScim: boolean;
 };

+// FIXME: update to use a const object instead of a typescript enum
+// eslint-disable-next-line @bitwarden/platform/no-enums
 enum ProviderType {
  Msp = 0,
  Reseller = 1,
 }

+// FIXME: update to use a const object instead of a typescript enum
+// eslint-disable-next-line @bitwarden/platform/no-enums
 enum ProductType {
  Free = 0,
  Families = 1,
--- a/libs/common/src/state-migrations/migrations/54-move-encrypted-sends.ts
+++ b/libs/common/src/state-migrations/migrations/54-move-encrypted-sends.ts
@@ -3,6 +3,8 @@
 import { KeyDefinitionLike, MigrationHelper } from "../migration-helper";
 import { Migrator } from "../migrator";

+// FIXME: update to use a const object instead of a typescript enum
+// eslint-disable-next-line @bitwarden/platform/no-enums
 export enum SendType {
  Text = 0,
  File = 1,
--- a/libs/common/src/state-migrations/migrations/59-move-kdf-config-to-state-provider.ts
+++ b/libs/common/src/state-migrations/migrations/59-move-kdf-config-to-state-provider.ts
@@ -3,6 +3,8 @@
 import { KeyDefinitionLike, MigrationHelper } from "../migration-helper";
 import { Migrator } from "../migrator";

+// FIXME: update to use a const object instead of a typescript enum
+// eslint-disable-next-line @bitwarden/platform/no-enums
 enum KdfType {
  PBKDF2_SHA256 = 0,
  Argon2id = 1,
--- a/libs/common/src/state-migrations/migrations/62-migrate-vault-timeout-settings-svc-to-state-provider.ts
+++ b/libs/common/src/state-migrations/migrations/62-migrate-vault-timeout-settings-svc-to-state-provider.ts
@@ -57,6 +57,8 @@ const vaultTimeoutTypeRollbackRecord: Record<VaultTimeout, any> = {
  onIdle: -4,
 };

+// FIXME: update to use a const object instead of a typescript enum
+// eslint-disable-next-line @bitwarden/platform/no-enums
 export enum ClientType {
  Web = "web",
  Browser = "browser",
--- a/libs/common/src/tools/send/enums/send-type.ts
+++ b/libs/common/src/tools/send/enums/send-type.ts
@@ -1,3 +1,5 @@
+// FIXME: update to use a const object instead of a typescript enum
+// eslint-disable-next-line @bitwarden/platform/no-enums
 export enum SendType {
  Text = 0,
  File = 1,
--- a/libs/common/src/vault/enums/cipher-reprompt-type.ts
+++ b/libs/common/src/vault/enums/cipher-reprompt-type.ts
@@ -1,3 +1,5 @@
+// FIXME: update to use a const object instead of a typescript enum
+// eslint-disable-next-line @bitwarden/platform/no-enums
 export enum CipherRepromptType {
  None = 0,
  Password = 1,
--- a/libs/common/src/vault/enums/cipher-type.ts
+++ b/libs/common/src/vault/enums/cipher-type.ts
@@ -1,3 +1,5 @@
+// FIXME: update to use a const object instead of a typescript enum
+// eslint-disable-next-line @bitwarden/platform/no-enums
 export enum CipherType {
  Login = 1,
  SecureNote = 2,
--- a/libs/common/src/vault/enums/field-type.enum.ts
+++ b/libs/common/src/vault/enums/field-type.enum.ts
@@ -1,3 +1,5 @@
+// FIXME: update to use a const object instead of a typescript enum
+// eslint-disable-next-line @bitwarden/platform/no-enums
 export enum FieldType {
  Text = 0,
  Hidden = 1,
--- a/libs/common/src/vault/enums/linked-id-type.enum.ts
+++ b/libs/common/src/vault/enums/linked-id-type.enum.ts
@@ -1,12 +1,16 @@
 export type LinkedIdType = LoginLinkedId | CardLinkedId | IdentityLinkedId;

 // LoginView
+// FIXME: update to use a const object instead of a typescript enum
+// eslint-disable-next-line @bitwarden/platform/no-enums
 export enum LoginLinkedId {
  Username = 100,
  Password = 101,
 }

 // CardView
+// FIXME: update to use a const object instead of a typescript enum
+// eslint-disable-next-line @bitwarden/platform/no-enums
 export enum CardLinkedId {
  CardholderName = 300,
  ExpMonth = 301,
@@ -17,6 +21,8 @@ export enum CardLinkedId {
 }

 // IdentityView
+// FIXME: update to use a const object instead of a typescript enum
+// eslint-disable-next-line @bitwarden/platform/no-enums
 export enum IdentityLinkedId {
  Title = 400,
  MiddleName = 401,
--- a/libs/common/src/vault/enums/secure-note-type.enum.ts
+++ b/libs/common/src/vault/enums/secure-note-type.enum.ts
@@ -1,3 +1,5 @@
+// FIXME: update to use a const object instead of a typescript enum
+// eslint-disable-next-line @bitwarden/platform/no-enums
 export enum SecureNoteType {
  Generic = 0,
 }
--- a/libs/common/src/vault/tasks/enums/security-task-status.enum.ts
+++ b/libs/common/src/vault/tasks/enums/security-task-status.enum.ts
@@ -1,3 +1,5 @@
+// FIXME: update to use a const object instead of a typescript enum
+// eslint-disable-next-line @bitwarden/platform/no-enums
 export enum SecurityTaskStatus {
  /**
   * Default status for newly created tasks that have not been completed.
--- a/libs/common/src/vault/tasks/enums/security-task-type.enum.ts
+++ b/libs/common/src/vault/tasks/enums/security-task-type.enum.ts
@@ -1,3 +1,5 @@
+// FIXME: update to use a const object instead of a typescript enum
+// eslint-disable-next-line @bitwarden/platform/no-enums
 export enum SecurityTaskType {
  /**
   * Task to update a cipher's password that was found to be at-risk by an administrator
				`@@ -0,0 +1 @@`
				`export * from "./preview-tax-amount-for-organization-trial.request";`
				`@@ -0,0 +1 @@`
				`export * from "./preview-tax-amount.response";`