{{ "reviewAtRiskPasswords" | i18n }}
@@ -9,7 +11,7 @@
class="tw-bg-primary-100 tw-rounded-lg tw-w-full tw-px-8 tw-py-4 tw-my-4 tw-flex tw-items-center"
>
{{
diff --git a/bitwarden_license/bit-web/src/main.ts b/bitwarden_license/bit-web/src/main.ts
index 1d1519c8b50..b202a170d26 100644
--- a/bitwarden_license/bit-web/src/main.ts
+++ b/bitwarden_license/bit-web/src/main.ts
@@ -11,6 +11,4 @@ if (process.env.NODE_ENV === "production") {
enableProdMode();
}
-// FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
-// eslint-disable-next-line @typescript-eslint/no-floating-promises
-platformBrowserDynamic().bootstrapModule(AppModule, { preserveWhitespaces: true });
+void platformBrowserDynamic().bootstrapModule(AppModule);
diff --git a/libs/angular/src/vault/components/add-edit.component.ts b/libs/angular/src/vault/components/add-edit.component.ts
index 923f667e680..c309aa9624a 100644
--- a/libs/angular/src/vault/components/add-edit.component.ts
+++ b/libs/angular/src/vault/components/add-edit.component.ts
@@ -827,9 +827,9 @@ export class AddEditComponent implements OnInit, OnDestroy {
private async generateSshKey(showNotification: boolean = true) {
await firstValueFrom(this.sdkService.client$);
const sshKey = generate_ssh_key("Ed25519");
- this.cipher.sshKey.privateKey = sshKey.private_key;
- this.cipher.sshKey.publicKey = sshKey.public_key;
- this.cipher.sshKey.keyFingerprint = sshKey.key_fingerprint;
+ this.cipher.sshKey.privateKey = sshKey.privateKey;
+ this.cipher.sshKey.publicKey = sshKey.publicKey;
+ this.cipher.sshKey.keyFingerprint = sshKey.fingerprint;
if (showNotification) {
this.toastService.showToast({
diff --git a/libs/angular/src/vault/components/view.component.ts b/libs/angular/src/vault/components/view.component.ts
index 637596256b0..92a231ab8db 100644
--- a/libs/angular/src/vault/components/view.component.ts
+++ b/libs/angular/src/vault/components/view.component.ts
@@ -11,7 +11,7 @@ import {
OnInit,
Output,
} from "@angular/core";
-import { filter, firstValueFrom, map, Observable, Subject, takeUntil } from "rxjs";
+import { filter, firstValueFrom, map, Observable } from "rxjs";
import { ApiService } from "@bitwarden/common/abstractions/api.service";
import { AuditService } from "@bitwarden/common/abstractions/audit.service";
@@ -80,8 +80,6 @@ export class ViewComponent implements OnDestroy, OnInit {
private previousCipherId: string;
private passwordReprompted = false;
- private destroyed$ = new Subject();
-
get fido2CredentialCreationDateValue(): string {
const dateCreated = this.i18nService.t("dateCreated");
const creationDate = this.datePipe.transform(
@@ -144,18 +142,14 @@ export class ViewComponent implements OnDestroy, OnInit {
async load() {
this.cleanUp();
- const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
// Grab individual cipher from `cipherViews$` for the most up-to-date information
- this.cipherService
- .cipherViews$(activeUserId)
- .pipe(
+ const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
+ this.cipher = await firstValueFrom(
+ this.cipherService.cipherViews$(activeUserId).pipe(
map((ciphers) => ciphers?.find((c) => c.id === this.cipherId)),
filter((cipher) => !!cipher),
- takeUntil(this.destroyed$),
- )
- .subscribe((cipher) => {
- this.cipher = cipher;
- });
+ ),
+ );
this.canAccessPremium = await firstValueFrom(
this.billingAccountProfileStateService.hasPremiumFromAnySource$(activeUserId),
@@ -528,7 +522,6 @@ export class ViewComponent implements OnDestroy, OnInit {
this.showCardNumber = false;
this.showCardCode = false;
this.passwordReprompted = false;
- this.destroyed$.next();
if (this.totpInterval) {
clearInterval(this.totpInterval);
}
diff --git a/libs/auth/src/angular/login/default-login-component.service.spec.ts b/libs/auth/src/angular/login/default-login-component.service.spec.ts
index 05b24da56cc..446ab44b4ee 100644
--- a/libs/auth/src/angular/login/default-login-component.service.spec.ts
+++ b/libs/auth/src/angular/login/default-login-component.service.spec.ts
@@ -56,13 +56,6 @@ describe("DefaultLoginComponentService", () => {
expect(service).toBeTruthy();
});
- describe("getOrgPolicies", () => {
- it("returns null", async () => {
- const result = await service.getOrgPolicies();
- expect(result).toBeNull();
- });
- });
-
describe("isLoginWithPasskeySupported", () => {
it("returns true when clientType is Web", () => {
service["clientType"] = ClientType.Web;
diff --git a/libs/auth/src/angular/login/default-login-component.service.ts b/libs/auth/src/angular/login/default-login-component.service.ts
index 84a7d923d12..41b761ce1d9 100644
--- a/libs/auth/src/angular/login/default-login-component.service.ts
+++ b/libs/auth/src/angular/login/default-login-component.service.ts
@@ -2,7 +2,7 @@
// @ts-strict-ignore
import { firstValueFrom } from "rxjs";
-import { LoginComponentService, PasswordPolicies } from "@bitwarden/auth/angular";
+import { LoginComponentService } from "@bitwarden/auth/angular";
import { SsoLoginServiceAbstraction } from "@bitwarden/common/auth/abstractions/sso-login.service.abstraction";
import { ClientType } from "@bitwarden/common/enums";
import { CryptoFunctionService } from "@bitwarden/common/platform/abstractions/crypto-function.service";
@@ -23,10 +23,6 @@ export class DefaultLoginComponentService implements LoginComponentService {
protected ssoLoginService: SsoLoginServiceAbstraction,
) {}
- async getOrgPolicies(): Promise {
- return null;
- }
-
isLoginWithPasskeySupported(): boolean {
return this.clientType === ClientType.Web;
}
diff --git a/libs/auth/src/angular/login/login-component.service.ts b/libs/auth/src/angular/login/login-component.service.ts
index 8ca857cef59..1147c5d8644 100644
--- a/libs/auth/src/angular/login/login-component.service.ts
+++ b/libs/auth/src/angular/login/login-component.service.ts
@@ -23,7 +23,7 @@ export abstract class LoginComponentService {
* Gets the organization policies if there is an organization invite.
* - Used by: Web
*/
- getOrgPolicies: () => Promise;
+ getOrgPoliciesFromOrgInvite?: () => Promise;
/**
* Indicates whether login with passkey is supported on the given client
diff --git a/libs/auth/src/angular/login/login.component.ts b/libs/auth/src/angular/login/login.component.ts
index 66fe2503508..f31e02fdb1f 100644
--- a/libs/auth/src/angular/login/login.component.ts
+++ b/libs/auth/src/angular/login/login.component.ts
@@ -12,6 +12,7 @@ import {
PasswordLoginCredentials,
} from "@bitwarden/auth/common";
import { InternalPolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
+import { PolicyData } from "@bitwarden/common/admin-console/models/data/policy.data";
import { MasterPasswordPolicyOptions } from "@bitwarden/common/admin-console/models/domain/master-password-policy-options";
import { Policy } from "@bitwarden/common/admin-console/models/domain/policy";
import { DevicesApiServiceAbstraction } from "@bitwarden/common/auth/abstractions/devices-api.service.abstraction";
@@ -30,6 +31,7 @@ import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/pl
import { ValidationService } from "@bitwarden/common/platform/abstractions/validation.service";
import { Utils } from "@bitwarden/common/platform/misc/utils";
import { PasswordStrengthServiceAbstraction } from "@bitwarden/common/tools/password-strength";
+import { UserId } from "@bitwarden/common/types/guid";
import {
AsyncActionsModule,
ButtonModule,
@@ -43,7 +45,7 @@ import {
import { AnonLayoutWrapperDataService } from "../anon-layout/anon-layout-wrapper-data.service";
import { VaultIcon, WaveIcon } from "../icons";
-import { LoginComponentService } from "./login-component.service";
+import { LoginComponentService, PasswordPolicies } from "./login-component.service";
const BroadcasterSubscriptionId = "LoginComponent";
@@ -72,7 +74,6 @@ export class LoginComponent implements OnInit, OnDestroy {
@ViewChild("masterPasswordInputRef") masterPasswordInputRef: ElementRef | undefined;
private destroy$ = new Subject();
- private enforcedMasterPasswordOptions: MasterPasswordPolicyOptions | undefined = undefined;
readonly Icons = { WaveIcon, VaultIcon };
clientType: ClientType;
@@ -97,11 +98,6 @@ export class LoginComponent implements OnInit, OnDestroy {
return this.formGroup.controls.email;
}
- // Web properties
- enforcedPasswordPolicyOptions: MasterPasswordPolicyOptions | undefined;
- policies: Policy[] | undefined;
- showResetPasswordAutoEnrollWarning = false;
-
// Desktop properties
deferFocus: boolean | null = null;
@@ -281,18 +277,39 @@ export class LoginComponent implements OnInit, OnDestroy {
return;
}
+ // User logged in successfully so execute side effects
await this.loginSuccessHandlerService.run(authResult.userId);
+ this.loginEmailService.clearValues();
+ // Determine where to send the user next
if (authResult.forcePasswordReset != ForceSetPasswordReason.None) {
- this.loginEmailService.clearValues();
await this.router.navigate(["update-temp-password"]);
return;
}
- // If none of the above cases are true, proceed with login...
- await this.evaluatePassword();
+ // TODO: PM-18269 - evaluate if we can combine this with the
+ // password evaluation done in the password login strategy.
+ // If there's an existing org invite, use it to get the org's password policies
+ // so we can evaluate the MP against the org policies
+ if (this.loginComponentService.getOrgPoliciesFromOrgInvite) {
+ const orgPolicies: PasswordPolicies | null =
+ await this.loginComponentService.getOrgPoliciesFromOrgInvite();
- this.loginEmailService.clearValues();
+ if (orgPolicies) {
+ // Since we have retrieved the policies, we can go ahead and set them into state for future use
+ // e.g., the update-password page currently only references state for policy data and
+ // doesn't fallback to pulling them from the server like it should if they are null.
+ await this.setPoliciesIntoState(authResult.userId, orgPolicies.policies);
+
+ const isPasswordChangeRequired = await this.isPasswordChangeRequiredByOrgPolicy(
+ orgPolicies.enforcedPasswordPolicyOptions,
+ );
+ if (isPasswordChangeRequired) {
+ await this.router.navigate(["update-password"]);
+ return;
+ }
+ }
+ }
if (this.clientType === ClientType.Browser) {
await this.router.navigate(["/tabs/vault"]);
@@ -310,54 +327,51 @@ export class LoginComponent implements OnInit, OnDestroy {
await this.loginComponentService.launchSsoBrowserWindow(email, clientId);
}
- protected async evaluatePassword(): Promise {
+ /**
+ * Checks if the master password meets the enforced policy requirements
+ * and if the user is required to change their password.
+ */
+ private async isPasswordChangeRequiredByOrgPolicy(
+ enforcedPasswordPolicyOptions: MasterPasswordPolicyOptions,
+ ): Promise {
try {
- // If we do not have any saved policies, attempt to load them from the service
- if (this.enforcedMasterPasswordOptions == undefined) {
- this.enforcedMasterPasswordOptions = await firstValueFrom(
- this.policyService.masterPasswordPolicyOptions$(),
- );
+ if (enforcedPasswordPolicyOptions == undefined) {
+ return false;
}
- if (this.requirePasswordChange()) {
- await this.router.navigate(["update-password"]);
- return;
+ // Note: we deliberately do not check enforcedPasswordPolicyOptions.enforceOnLogin
+ // as existing users who are logging in after getting an org invite should
+ // always be forced to set a password that meets the org's policy.
+ // Org Invite -> Registration also works this way for new BW users as well.
+
+ const masterPassword = this.formGroup.controls.masterPassword.value;
+
+ // Return false if masterPassword is null/undefined since this is only evaluated after successful login
+ if (!masterPassword) {
+ return false;
}
+
+ const passwordStrength = this.passwordStrengthService.getPasswordStrength(
+ masterPassword,
+ this.formGroup.value.email ?? undefined,
+ )?.score;
+
+ return !this.policyService.evaluateMasterPassword(
+ passwordStrength,
+ masterPassword,
+ enforcedPasswordPolicyOptions,
+ );
} catch (e) {
// Do not prevent unlock if there is an error evaluating policies
this.logService.error(e);
+ return false;
}
}
- /**
- * Checks if the master password meets the enforced policy requirements
- * If not, returns false
- */
- private requirePasswordChange(): boolean {
- if (
- this.enforcedMasterPasswordOptions == undefined ||
- !this.enforcedMasterPasswordOptions.enforceOnLogin
- ) {
- return false;
- }
-
- const masterPassword = this.formGroup.controls.masterPassword.value;
-
- // Return false if masterPassword is null/undefined since this is only evaluated after successful login
- if (!masterPassword) {
- return false;
- }
-
- const passwordStrength = this.passwordStrengthService.getPasswordStrength(
- masterPassword,
- this.formGroup.value.email ?? undefined,
- )?.score;
-
- return !this.policyService.evaluateMasterPassword(
- passwordStrength,
- masterPassword,
- this.enforcedMasterPasswordOptions,
- );
+ private async setPoliciesIntoState(userId: UserId, policies: Policy[]): Promise {
+ const policiesData: { [id: string]: PolicyData } = {};
+ policies.map((p) => (policiesData[p.id] = PolicyData.fromPolicy(p)));
+ await this.policyService.replace(policiesData, userId);
}
protected async startAuthRequestLogin(): Promise {
@@ -528,12 +542,6 @@ export class LoginComponent implements OnInit, OnDestroy {
}
private async defaultOnInit(): Promise {
- // If there's an existing org invite, use it to get the password policies
- const orgPolicies = await this.loginComponentService.getOrgPolicies();
-
- this.policies = orgPolicies?.policies;
- this.showResetPasswordAutoEnrollWarning = orgPolicies?.isPolicyAndAutoEnrollEnabled ?? false;
-
let paramEmailIsSet = false;
const params = await firstValueFrom(this.activatedRoute.queryParams);
diff --git a/libs/common/src/auth/enums/two-factor-provider-type.ts b/libs/common/src/auth/enums/two-factor-provider-type.ts
index a1708032016..b3308b6c12f 100644
--- a/libs/common/src/auth/enums/two-factor-provider-type.ts
+++ b/libs/common/src/auth/enums/two-factor-provider-type.ts
@@ -7,4 +7,5 @@ export enum TwoFactorProviderType {
Remember = 5,
OrganizationDuo = 6,
WebAuthn = 7,
+ RecoveryCode = 8,
}
diff --git a/libs/common/src/enums/feature-flag.enum.ts b/libs/common/src/enums/feature-flag.enum.ts
index 5137fda329f..75346c0edb8 100644
--- a/libs/common/src/enums/feature-flag.enum.ts
+++ b/libs/common/src/enums/feature-flag.enum.ts
@@ -50,6 +50,7 @@ export enum FeatureFlag {
AccountDeprovisioningBanner = "pm-17120-account-deprovisioning-admin-console-banner",
NewDeviceVerification = "new-device-verification",
PM15179_AddExistingOrgsFromProviderPortal = "pm-15179-add-existing-orgs-from-provider-portal",
+ RecoveryCodeLogin = "pm-17128-recovery-code-login",
}
export type AllowedFeatureFlagTypes = boolean | number | string;
@@ -110,6 +111,7 @@ export const DefaultFeatureFlagValue = {
[FeatureFlag.AccountDeprovisioningBanner]: FALSE,
[FeatureFlag.NewDeviceVerification]: FALSE,
[FeatureFlag.PM15179_AddExistingOrgsFromProviderPortal]: FALSE,
+ [FeatureFlag.RecoveryCodeLogin]: FALSE,
} satisfies Record;
export type DefaultFeatureFlagValueType = typeof DefaultFeatureFlagValue;
diff --git a/libs/common/src/platform/models/domain/domain-base.ts b/libs/common/src/platform/models/domain/domain-base.ts
index 192034254b9..5aa79946653 100644
--- a/libs/common/src/platform/models/domain/domain-base.ts
+++ b/libs/common/src/platform/models/domain/domain-base.ts
@@ -65,7 +65,6 @@ export default class Domain {
key: SymmetricCryptoKey = null,
objectContext: string = "No Domain Context",
): Promise {
- const promises = [];
const self: any = this;
for (const prop in map) {
@@ -74,27 +73,15 @@ export default class Domain {
continue;
}
- (function (theProp) {
- const p = Promise.resolve()
- .then(() => {
- const mapProp = map[theProp] || theProp;
- if (self[mapProp]) {
- return self[mapProp].decrypt(
- orgId,
- key,
- `Property: ${prop}; ObjectContext: ${objectContext}`,
- );
- }
- return null;
- })
- .then((val: any) => {
- (viewModel as any)[theProp] = val;
- });
- promises.push(p);
- })(prop);
+ const mapProp = map[prop] || prop;
+ if (self[mapProp]) {
+ (viewModel as any)[prop] = await self[mapProp].decrypt(
+ orgId,
+ key,
+ `Property: ${prop}; ObjectContext: ${objectContext}`,
+ );
+ }
}
-
- await Promise.all(promises);
return viewModel;
}
@@ -121,22 +108,20 @@ export default class Domain {
_: Constructor = this.constructor as Constructor,
objectContext: string = "No Domain Context",
): Promise> {
- const promises = [];
+ const decryptedObjects = [];
for (const prop of encryptedProperties) {
const value = (this as any)[prop] as EncString;
- promises.push(
- this.decryptProperty(
- prop,
- value,
- key,
- encryptService,
- `Property: ${prop.toString()}; ObjectContext: ${objectContext}`,
- ),
+ const decrypted = await this.decryptProperty(
+ prop,
+ value,
+ key,
+ encryptService,
+ `Property: ${prop.toString()}; ObjectContext: ${objectContext}`,
);
+ decryptedObjects.push(decrypted);
}
- const decryptedObjects = await Promise.all(promises);
const decryptedObject = decryptedObjects.reduce(
(acc, obj) => {
return { ...acc, ...obj };
diff --git a/libs/common/src/vault/models/domain/cipher.ts b/libs/common/src/vault/models/domain/cipher.ts
index d82f4585e65..21538b87788 100644
--- a/libs/common/src/vault/models/domain/cipher.ts
+++ b/libs/common/src/vault/models/domain/cipher.ts
@@ -12,7 +12,10 @@ import { CipherRepromptType } from "../../enums/cipher-reprompt-type";
import { CipherType } from "../../enums/cipher-type";
import { CipherData } from "../data/cipher.data";
import { LocalData } from "../data/local.data";
+import { AttachmentView } from "../view/attachment.view";
import { CipherView } from "../view/cipher.view";
+import { FieldView } from "../view/field.view";
+import { PasswordHistoryView } from "../view/password-history.view";
import { Attachment } from "./attachment";
import { Card } from "./card";
@@ -136,6 +139,7 @@ export class Cipher extends Domain implements Decryptable {
if (this.key != null) {
const encryptService = Utils.getContainerService().getEncryptService();
+
const keyBytes = await encryptService.decryptToBytes(
this.key,
encKey,
@@ -198,44 +202,28 @@ export class Cipher extends Domain implements Decryptable {
}
if (this.attachments != null && this.attachments.length > 0) {
- const attachments: any[] = [];
- await this.attachments.reduce((promise, attachment) => {
- return promise
- .then(() => {
- return attachment.decrypt(this.organizationId, `Cipher Id: ${this.id}`, encKey);
- })
- .then((decAttachment) => {
- attachments.push(decAttachment);
- });
- }, Promise.resolve());
+ const attachments: AttachmentView[] = [];
+ for (const attachment of this.attachments) {
+ attachments.push(
+ await attachment.decrypt(this.organizationId, `Cipher Id: ${this.id}`, encKey),
+ );
+ }
model.attachments = attachments;
}
if (this.fields != null && this.fields.length > 0) {
- const fields: any[] = [];
- await this.fields.reduce((promise, field) => {
- return promise
- .then(() => {
- return field.decrypt(this.organizationId, encKey);
- })
- .then((decField) => {
- fields.push(decField);
- });
- }, Promise.resolve());
+ const fields: FieldView[] = [];
+ for (const field of this.fields) {
+ fields.push(await field.decrypt(this.organizationId, encKey));
+ }
model.fields = fields;
}
if (this.passwordHistory != null && this.passwordHistory.length > 0) {
- const passwordHistory: any[] = [];
- await this.passwordHistory.reduce((promise, ph) => {
- return promise
- .then(() => {
- return ph.decrypt(this.organizationId, encKey);
- })
- .then((decPh) => {
- passwordHistory.push(decPh);
- });
- }, Promise.resolve());
+ const passwordHistory: PasswordHistoryView[] = [];
+ for (const ph of this.passwordHistory) {
+ passwordHistory.push(await ph.decrypt(this.organizationId, encKey));
+ }
model.passwordHistory = passwordHistory;
}
diff --git a/libs/components/src/chip-select/chip-select.component.ts b/libs/components/src/chip-select/chip-select.component.ts
index e9be66da7d4..a4c73b699cf 100644
--- a/libs/components/src/chip-select/chip-select.component.ts
+++ b/libs/components/src/chip-select/chip-select.component.ts
@@ -45,7 +45,6 @@ export type ChipSelectOption = Option & {
multi: true,
},
],
- preserveWhitespaces: false,
})
export class ChipSelectComponent implements ControlValueAccessor, AfterViewInit {
@ViewChild(MenuComponent) menu: MenuComponent;
diff --git a/libs/components/src/color-password/color-password.component.ts b/libs/components/src/color-password/color-password.component.ts
index e48758ca59a..4fc94e41854 100644
--- a/libs/components/src/color-password/color-password.component.ts
+++ b/libs/components/src/color-password/color-password.component.ts
@@ -22,7 +22,6 @@ enum CharacterType {
}
}`,
- preserveWhitespaces: false,
standalone: true,
})
export class ColorPasswordComponent {
diff --git a/libs/components/src/drawer/drawer.stories.ts b/libs/components/src/drawer/drawer.stories.ts
index 54b4c89f4ce..a524c9a7a1a 100644
--- a/libs/components/src/drawer/drawer.stories.ts
+++ b/libs/components/src/drawer/drawer.stories.ts
@@ -9,10 +9,7 @@ import { ButtonModule } from "../button";
import { CalloutModule } from "../callout";
import { LayoutComponent } from "../layout";
import { mockLayoutI18n } from "../layout/mocks";
-import {
- disableBothThemeDecorator,
- positionFixedWrapperDecorator,
-} from "../stories/storybook-decorators";
+import { positionFixedWrapperDecorator } from "../stories/storybook-decorators";
import { TypographyModule } from "../typography";
import { I18nMockService } from "../utils";
@@ -30,7 +27,6 @@ export default {
},
decorators: [
positionFixedWrapperDecorator(),
- disableBothThemeDecorator,
moduleMetadata({
imports: [
RouterTestingModule,
diff --git a/libs/components/src/index.ts b/libs/components/src/index.ts
index 7788f4986bf..319b60e6435 100644
--- a/libs/components/src/index.ts
+++ b/libs/components/src/index.ts
@@ -1,4 +1,4 @@
-export { ButtonType } from "./shared/button-like.abstraction";
+export { ButtonType, ButtonLikeAbstraction } from "./shared/button-like.abstraction";
export * from "./a11y";
export * from "./async-actions";
export * from "./avatar";
diff --git a/libs/components/src/navigation/nav-group.component.ts b/libs/components/src/navigation/nav-group.component.ts
index 62bdee26740..37244f37c8d 100644
--- a/libs/components/src/navigation/nav-group.component.ts
+++ b/libs/components/src/navigation/nav-group.component.ts
@@ -29,7 +29,6 @@ import { SideNavService } from "./side-nav.service";
],
standalone: true,
imports: [CommonModule, NavItemComponent, IconButtonModule, I18nPipe],
- preserveWhitespaces: false,
})
export class NavGroupComponent extends NavBaseComponent implements AfterContentInit {
@ContentChildren(NavBaseComponent, {
diff --git a/libs/components/src/stories/kitchen-sink/kitchen-sink.stories.ts b/libs/components/src/stories/kitchen-sink/kitchen-sink.stories.ts
index 62b93984384..af3b082d1c6 100644
--- a/libs/components/src/stories/kitchen-sink/kitchen-sink.stories.ts
+++ b/libs/components/src/stories/kitchen-sink/kitchen-sink.stories.ts
@@ -17,7 +17,7 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic
import { DialogService } from "../../dialog";
import { LayoutComponent } from "../../layout";
import { I18nMockService } from "../../utils/i18n-mock.service";
-import { disableBothThemeDecorator, positionFixedWrapperDecorator } from "../storybook-decorators";
+import { positionFixedWrapperDecorator } from "../storybook-decorators";
import { DialogVirtualScrollBlockComponent } from "./components/dialog-virtual-scroll-block.component";
import { KitchenSinkForm } from "./components/kitchen-sink-form.component";
@@ -31,7 +31,6 @@ export default {
component: LayoutComponent,
decorators: [
positionFixedWrapperDecorator(),
- disableBothThemeDecorator,
moduleMetadata({
imports: [
KitchenSinkSharedModule,
diff --git a/libs/components/src/stories/storybook-decorators.ts b/libs/components/src/stories/storybook-decorators.ts
index ec0df264c7e..d1146a7cd96 100644
--- a/libs/components/src/stories/storybook-decorators.ts
+++ b/libs/components/src/stories/storybook-decorators.ts
@@ -17,15 +17,3 @@ export const positionFixedWrapperDecorator = (wrapper?: (story: string) => strin
${wrapper ? wrapper(story) : story}