-
+ template: `
+
`,
})
export class AppComponent implements OnInit, OnDestroy {
private viewCacheService = inject(PopupViewCacheService);
private compactModeService = inject(PopupCompactModeService);
+ private widthService = inject(PopupWidthService);
private lastActivity: Date;
private activeUserId: UserId;
@@ -99,6 +101,7 @@ export class AppComponent implements OnInit, OnDestroy {
await this.viewCacheService.init();
this.compactModeService.init();
+ this.widthService.init();
// Component states must not persist between closing and reopening the popup, otherwise they become dead objects
// Clear them aggressively to make sure this doesn't occur
@@ -220,23 +223,12 @@ export class AppComponent implements OnInit, OnDestroy {
this.destroy$.complete();
}
- getState(outlet: RouterOutlet) {
+ getRouteElevation(outlet: RouterOutlet) {
if (!this.routerAnimations) {
return;
- } else if (outlet.activatedRouteData.state === "ciphers") {
- const routeDirection =
- (window as any).routeDirection != null ? (window as any).routeDirection : "";
- return (
- "ciphers_direction=" +
- routeDirection +
- "_" +
- (outlet.activatedRoute.queryParams as any).value.folderId +
- "_" +
- (outlet.activatedRoute.queryParams as any).value.collectionId
- );
- } else {
- return outlet.activatedRouteData.state;
}
+
+ return outlet.activatedRouteData.elevation;
}
private async recordActivity() {
diff --git a/apps/browser/src/popup/app.module.ts b/apps/browser/src/popup/app.module.ts
index d6e46de6ba0..d637f695e81 100644
--- a/apps/browser/src/popup/app.module.ts
+++ b/apps/browser/src/popup/app.module.ts
@@ -24,7 +24,7 @@ import { ExtensionAnonLayoutWrapperComponent } from "../auth/popup/extension-ano
import { HintComponent } from "../auth/popup/hint.component";
import { HomeComponent } from "../auth/popup/home.component";
import { LockComponent } from "../auth/popup/lock.component";
-import { LoginDecryptionOptionsComponent } from "../auth/popup/login-decryption-options/login-decryption-options.component";
+import { LoginDecryptionOptionsComponentV1 } from "../auth/popup/login-decryption-options/login-decryption-options-v1.component";
import { LoginComponentV1 } from "../auth/popup/login-v1.component";
import { LoginViaAuthRequestComponentV1 } from "../auth/popup/login-via-auth-request-v1.component";
import { RegisterComponent } from "../auth/popup/register.component";
@@ -161,7 +161,7 @@ import "../platform/popup/locales";
LockComponent,
LoginViaAuthRequestComponentV1,
LoginComponentV1,
- LoginDecryptionOptionsComponent,
+ LoginDecryptionOptionsComponentV1,
NotificationsSettingsV1Component,
AppearanceComponent,
GeneratorComponent,
diff --git a/apps/browser/src/popup/main.ts b/apps/browser/src/popup/main.ts
index c98e30e6bca..db634ea2e2c 100644
--- a/apps/browser/src/popup/main.ts
+++ b/apps/browser/src/popup/main.ts
@@ -1,6 +1,7 @@
import { enableProdMode } from "@angular/core";
import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
+import { PopupWidthService } from "../platform/popup/layout/popup-width.service";
import { BrowserPlatformUtilsService } from "../platform/services/platform-utils/browser-platform-utils.service";
require("./scss/popup.scss");
@@ -8,7 +9,8 @@ require("./scss/tailwind.css");
import { AppModule } from "./app.module";
-// We put this first to minimize the delay in window changing.
+// We put these first to minimize the delay in window changing.
+PopupWidthService.initBodyWidthFromLocalStorage();
// Should be removed once we deprecate support for Safari 16.0 and older. See Jira ticket [PM-1861]
if (BrowserPlatformUtilsService.shouldApplySafariHeightFix(window)) {
document.documentElement.classList.add("safari_height_fix");
diff --git a/apps/browser/src/popup/scss/base.scss b/apps/browser/src/popup/scss/base.scss
index 89b8816567d..49847dd7778 100644
--- a/apps/browser/src/popup/scss/base.scss
+++ b/apps/browser/src/popup/scss/base.scss
@@ -19,7 +19,7 @@ body {
}
body {
- width: 380px !important;
+ min-width: 380px;
height: 600px !important;
position: relative;
min-height: 100vh;
diff --git a/apps/browser/src/popup/services/services.module.ts b/apps/browser/src/popup/services/services.module.ts
index 9a1acb54ab7..18d109776a4 100644
--- a/apps/browser/src/popup/services/services.module.ts
+++ b/apps/browser/src/popup/services/services.module.ts
@@ -1,4 +1,5 @@
import { APP_INITIALIZER, NgModule, NgZone } from "@angular/core";
+import { Router } from "@angular/router";
import { Subject, merge, of } from "rxjs";
import { CollectionService } from "@bitwarden/admin-console/common";
@@ -22,6 +23,7 @@ import {
AnonLayoutWrapperDataService,
LoginComponentService,
LockComponentService,
+ LoginDecryptionOptionsService,
} from "@bitwarden/auth/angular";
import { LockService, LoginEmailService, PinServiceAbstraction } from "@bitwarden/auth/common";
import { ApiService } from "@bitwarden/common/abstractions/api.service";
@@ -115,6 +117,7 @@ import { PasswordRepromptService } from "@bitwarden/vault";
import { ForegroundLockService } from "../../auth/popup/accounts/foreground-lock.service";
import { ExtensionAnonLayoutWrapperDataService } from "../../auth/popup/extension-anon-layout-wrapper/extension-anon-layout-wrapper-data.service";
import { ExtensionLoginComponentService } from "../../auth/popup/login/extension-login-component.service";
+import { ExtensionLoginDecryptionOptionsService } from "../../auth/popup/login-decryption-options/extension-login-decryption-options.service";
import { AutofillService as AutofillServiceAbstraction } from "../../autofill/services/abstractions/autofill.service";
import AutofillService from "../../autofill/services/autofill.service";
import { InlineMenuFieldQualificationService } from "../../autofill/services/inline-menu-field-qualification.service";
@@ -573,8 +576,9 @@ const safeProviders: SafeProvider[] = [
}),
safeProvider({
provide: SdkClientFactory,
- useClass: flagEnabled("sdk") ? BrowserSdkClientFactory : NoopSdkClientFactory,
- deps: [],
+ useFactory: (logService) =>
+ flagEnabled("sdk") ? new BrowserSdkClientFactory(logService) : new NoopSdkClientFactory(),
+ deps: [LogService],
}),
safeProvider({
provide: LoginEmailService,
@@ -591,6 +595,11 @@ const safeProviders: SafeProvider[] = [
useExisting: PopupCompactModeService,
deps: [],
}),
+ safeProvider({
+ provide: LoginDecryptionOptionsService,
+ useClass: ExtensionLoginDecryptionOptionsService,
+ deps: [MessagingServiceAbstraction, Router],
+ }),
];
@NgModule({
diff --git a/apps/browser/src/services/families-policy.service.spec.ts b/apps/browser/src/services/families-policy.service.spec.ts
new file mode 100644
index 00000000000..19291bcd825
--- /dev/null
+++ b/apps/browser/src/services/families-policy.service.spec.ts
@@ -0,0 +1,83 @@
+import { TestBed } from "@angular/core/testing";
+import { mock, MockProxy } from "jest-mock-extended";
+import { firstValueFrom, of } from "rxjs";
+
+import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
+import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
+import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
+import { Policy } from "@bitwarden/common/admin-console/models/domain/policy";
+
+import { FamiliesPolicyService } from "./families-policy.service"; // Adjust the import as necessary
+
+describe("FamiliesPolicyService", () => {
+ let service: FamiliesPolicyService;
+ let organizationService: MockProxy
;
+ let policyService: MockProxy;
+
+ beforeEach(() => {
+ organizationService = mock();
+ policyService = mock();
+
+ TestBed.configureTestingModule({
+ providers: [
+ FamiliesPolicyService,
+ { provide: OrganizationService, useValue: organizationService },
+ { provide: PolicyService, useValue: policyService },
+ ],
+ });
+
+ service = TestBed.inject(FamiliesPolicyService);
+ });
+
+ it("should return false when there are no enterprise organizations", async () => {
+ jest.spyOn(service, "hasSingleEnterpriseOrg$").mockReturnValue(of(false));
+
+ const result = await firstValueFrom(service.isFreeFamilyPolicyEnabled$());
+ expect(result).toBe(false);
+ });
+
+ it("should return true when the policy is enabled for the one enterprise organization", async () => {
+ jest.spyOn(service, "hasSingleEnterpriseOrg$").mockReturnValue(of(true));
+
+ const organizations = [{ id: "org1", canManageSponsorships: true }] as Organization[];
+ organizationService.getAll$.mockReturnValue(of(organizations));
+
+ const policies = [{ organizationId: "org1", enabled: true }] as Policy[];
+ policyService.getAll$.mockReturnValue(of(policies));
+
+ const result = await firstValueFrom(service.isFreeFamilyPolicyEnabled$());
+ expect(result).toBe(true);
+ });
+
+ it("should return false when the policy is not enabled for the one enterprise organization", async () => {
+ jest.spyOn(service, "hasSingleEnterpriseOrg$").mockReturnValue(of(true));
+
+ const organizations = [{ id: "org1", canManageSponsorships: true }] as Organization[];
+ organizationService.getAll$.mockReturnValue(of(organizations));
+
+ const policies = [{ organizationId: "org1", enabled: false }] as Policy[];
+ policyService.getAll$.mockReturnValue(of(policies));
+
+ const result = await firstValueFrom(service.isFreeFamilyPolicyEnabled$());
+ expect(result).toBe(false);
+ });
+
+ it("should return true when there is exactly one enterprise organization that can manage sponsorships", async () => {
+ const organizations = [{ id: "org1", canManageSponsorships: true }] as Organization[];
+ organizationService.getAll$.mockReturnValue(of(organizations));
+
+ const result = await firstValueFrom(service.hasSingleEnterpriseOrg$());
+ expect(result).toBe(true);
+ });
+
+ it("should return false when there are multiple organizations that can manage sponsorships", async () => {
+ const organizations = [
+ { id: "org1", canManageSponsorships: true },
+ { id: "org2", canManageSponsorships: true },
+ ] as Organization[];
+ organizationService.getAll$.mockReturnValue(of(organizations));
+
+ const result = await firstValueFrom(service.hasSingleEnterpriseOrg$());
+ expect(result).toBe(false);
+ });
+});
diff --git a/apps/browser/src/services/families-policy.service.ts b/apps/browser/src/services/families-policy.service.ts
new file mode 100644
index 00000000000..426f39dcfd0
--- /dev/null
+++ b/apps/browser/src/services/families-policy.service.ts
@@ -0,0 +1,54 @@
+import { Injectable } from "@angular/core";
+import { map, Observable, of, switchMap } from "rxjs";
+
+import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
+import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
+import { PolicyType } from "@bitwarden/common/admin-console/enums";
+
+@Injectable({ providedIn: "root" })
+export class FamiliesPolicyService {
+ constructor(
+ private policyService: PolicyService,
+ private organizationService: OrganizationService,
+ ) {}
+
+ hasSingleEnterpriseOrg$(): Observable {
+ // Retrieve all organizations the user is part of
+ return this.organizationService.getAll$().pipe(
+ map((organizations) => {
+ // Filter to only those organizations that can manage sponsorships
+ const sponsorshipOrgs = organizations.filter((org) => org.canManageSponsorships);
+
+ // Check if there is exactly one organization that can manage sponsorships.
+ // This is important because users that are part of multiple organizations
+ // may always access free bitwarden family menu. We want to restrict access
+ // to the policy only when there is a single enterprise organization and the free family policy is turn.
+ return sponsorshipOrgs.length === 1;
+ }),
+ );
+ }
+
+ isFreeFamilyPolicyEnabled$(): Observable {
+ return this.hasSingleEnterpriseOrg$().pipe(
+ switchMap((hasSingleEnterpriseOrg) => {
+ if (!hasSingleEnterpriseOrg) {
+ return of(false);
+ }
+ return this.organizationService.getAll$().pipe(
+ map((organizations) => organizations.find((org) => org.canManageSponsorships)?.id),
+ switchMap((enterpriseOrgId) =>
+ this.policyService
+ .getAll$(PolicyType.FreeFamiliesSponsorshipPolicy)
+ .pipe(
+ map(
+ (policies) =>
+ policies.find((policy) => policy.organizationId === enterpriseOrgId)?.enabled ??
+ false,
+ ),
+ ),
+ ),
+ );
+ }),
+ );
+ }
+}
diff --git a/apps/browser/src/tools/popup/settings/about-page/more-from-bitwarden-page-v2.component.html b/apps/browser/src/tools/popup/settings/about-page/more-from-bitwarden-page-v2.component.html
index 9322ab5113e..a2d01ce752e 100644
--- a/apps/browser/src/tools/popup/settings/about-page/more-from-bitwarden-page-v2.component.html
+++ b/apps/browser/src/tools/popup/settings/about-page/more-from-bitwarden-page-v2.component.html
@@ -12,7 +12,12 @@
-
+
- {{ "accountIsManagedMessage" | i18n: managingOrganization?.name }}
+ {{ "accountIsOwnedMessage" | i18n: managingOrganization?.name }}
diff --git a/apps/web/src/app/auth/settings/security/security-routing.module.ts b/apps/web/src/app/auth/settings/security/security-routing.module.ts
index ca1d7c6aa65..8af0499d05a 100644
--- a/apps/web/src/app/auth/settings/security/security-routing.module.ts
+++ b/apps/web/src/app/auth/settings/security/security-routing.module.ts
@@ -2,7 +2,7 @@ import { NgModule } from "@angular/core";
import { RouterModule, Routes } from "@angular/router";
import { ChangePasswordComponent } from "../change-password.component";
-import { TwoFactorSetupComponent } from "../two-factor-setup.component";
+import { TwoFactorSetupComponent } from "../two-factor/two-factor-setup.component";
import { SecurityKeysComponent } from "./security-keys.component";
import { SecurityComponent } from "./security.component";
diff --git a/apps/web/src/app/auth/settings/two-factor-recovery.component.html b/apps/web/src/app/auth/settings/two-factor/two-factor-recovery.component.html
similarity index 100%
rename from apps/web/src/app/auth/settings/two-factor-recovery.component.html
rename to apps/web/src/app/auth/settings/two-factor/two-factor-recovery.component.html
diff --git a/apps/web/src/app/auth/settings/two-factor-recovery.component.ts b/apps/web/src/app/auth/settings/two-factor/two-factor-recovery.component.ts
similarity index 100%
rename from apps/web/src/app/auth/settings/two-factor-recovery.component.ts
rename to apps/web/src/app/auth/settings/two-factor/two-factor-recovery.component.ts
diff --git a/apps/web/src/app/auth/settings/two-factor-authenticator.component.html b/apps/web/src/app/auth/settings/two-factor/two-factor-setup-authenticator.component.html
similarity index 100%
rename from apps/web/src/app/auth/settings/two-factor-authenticator.component.html
rename to apps/web/src/app/auth/settings/two-factor/two-factor-setup-authenticator.component.html
diff --git a/apps/web/src/app/auth/settings/two-factor-authenticator.component.ts b/apps/web/src/app/auth/settings/two-factor/two-factor-setup-authenticator.component.ts
similarity index 95%
rename from apps/web/src/app/auth/settings/two-factor-authenticator.component.ts
rename to apps/web/src/app/auth/settings/two-factor/two-factor-setup-authenticator.component.ts
index da5378f4790..a0187103913 100644
--- a/apps/web/src/app/auth/settings/two-factor-authenticator.component.ts
+++ b/apps/web/src/app/auth/settings/two-factor/two-factor-setup-authenticator.component.ts
@@ -18,7 +18,7 @@ import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/pl
import { Utils } from "@bitwarden/common/platform/misc/utils";
import { DialogService, ToastService } from "@bitwarden/components";
-import { TwoFactorBaseComponent } from "./two-factor-base.component";
+import { TwoFactorSetupMethodBaseComponent } from "./two-factor-setup-method-base.component";
// NOTE: There are additional options available but these are just the ones we are current using.
// See: https://github.com/neocotic/qrious#examples
@@ -35,11 +35,11 @@ declare global {
}
@Component({
- selector: "app-two-factor-authenticator",
- templateUrl: "two-factor-authenticator.component.html",
+ selector: "app-two-factor-setup-authenticator",
+ templateUrl: "two-factor-setup-authenticator.component.html",
})
-export class TwoFactorAuthenticatorComponent
- extends TwoFactorBaseComponent
+export class TwoFactorSetupAuthenticatorComponent
+ extends TwoFactorSetupMethodBaseComponent
implements OnInit, OnDestroy
{
@Output() onChangeStatus = new EventEmitter
();
@@ -200,7 +200,7 @@ export class TwoFactorAuthenticatorComponent
dialogService: DialogService,
config: DialogConfig>,
) {
- return dialogService.open(TwoFactorAuthenticatorComponent, config);
+ return dialogService.open(TwoFactorSetupAuthenticatorComponent, config);
}
async launchExternalUrl(url: string) {
diff --git a/apps/web/src/app/auth/settings/two-factor-duo.component.html b/apps/web/src/app/auth/settings/two-factor/two-factor-setup-duo.component.html
similarity index 100%
rename from apps/web/src/app/auth/settings/two-factor-duo.component.html
rename to apps/web/src/app/auth/settings/two-factor/two-factor-setup-duo.component.html
diff --git a/apps/web/src/app/auth/settings/two-factor-duo.component.ts b/apps/web/src/app/auth/settings/two-factor/two-factor-setup-duo.component.ts
similarity index 92%
rename from apps/web/src/app/auth/settings/two-factor-duo.component.ts
rename to apps/web/src/app/auth/settings/two-factor/two-factor-setup-duo.component.ts
index 1a5b5917108..abb9b016165 100644
--- a/apps/web/src/app/auth/settings/two-factor-duo.component.ts
+++ b/apps/web/src/app/auth/settings/two-factor/two-factor-setup-duo.component.ts
@@ -13,13 +13,16 @@ import { LogService } from "@bitwarden/common/platform/abstractions/log.service"
import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
import { DialogService, ToastService } from "@bitwarden/components";
-import { TwoFactorBaseComponent } from "./two-factor-base.component";
+import { TwoFactorSetupMethodBaseComponent } from "./two-factor-setup-method-base.component";
@Component({
- selector: "app-two-factor-duo",
- templateUrl: "two-factor-duo.component.html",
+ selector: "app-two-factor-setup-duo",
+ templateUrl: "two-factor-setup-duo.component.html",
})
-export class TwoFactorDuoComponent extends TwoFactorBaseComponent implements OnInit {
+export class TwoFactorSetupDuoComponent
+ extends TwoFactorSetupMethodBaseComponent
+ implements OnInit
+{
@Output() onChangeStatus: EventEmitter = new EventEmitter();
type = TwoFactorProviderType.Duo;
@@ -137,7 +140,7 @@ export class TwoFactorDuoComponent extends TwoFactorBaseComponent implements OnI
dialogService: DialogService,
config: DialogConfig,
) => {
- return dialogService.open(TwoFactorDuoComponent, config);
+ return dialogService.open(TwoFactorSetupDuoComponent, config);
};
}
diff --git a/apps/web/src/app/auth/settings/two-factor-email.component.html b/apps/web/src/app/auth/settings/two-factor/two-factor-setup-email.component.html
similarity index 100%
rename from apps/web/src/app/auth/settings/two-factor-email.component.html
rename to apps/web/src/app/auth/settings/two-factor/two-factor-setup-email.component.html
diff --git a/apps/web/src/app/auth/settings/two-factor-email.component.ts b/apps/web/src/app/auth/settings/two-factor/two-factor-setup-email.component.ts
similarity index 92%
rename from apps/web/src/app/auth/settings/two-factor-email.component.ts
rename to apps/web/src/app/auth/settings/two-factor/two-factor-setup-email.component.ts
index 524b00d114f..5b1e5e60d75 100644
--- a/apps/web/src/app/auth/settings/two-factor-email.component.ts
+++ b/apps/web/src/app/auth/settings/two-factor/two-factor-setup-email.component.ts
@@ -16,14 +16,17 @@ import { LogService } from "@bitwarden/common/platform/abstractions/log.service"
import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
import { DialogService, ToastService } from "@bitwarden/components";
-import { TwoFactorBaseComponent } from "./two-factor-base.component";
+import { TwoFactorSetupMethodBaseComponent } from "./two-factor-setup-method-base.component";
@Component({
- selector: "app-two-factor-email",
- templateUrl: "two-factor-email.component.html",
+ selector: "app-two-factor-setup-email",
+ templateUrl: "two-factor-setup-email.component.html",
outputs: ["onUpdated"],
})
-export class TwoFactorEmailComponent extends TwoFactorBaseComponent implements OnInit {
+export class TwoFactorSetupEmailComponent
+ extends TwoFactorSetupMethodBaseComponent
+ implements OnInit
+{
@Output() onChangeStatus: EventEmitter = new EventEmitter();
type = TwoFactorProviderType.Email;
sentEmail: string;
@@ -139,6 +142,6 @@ export class TwoFactorEmailComponent extends TwoFactorBaseComponent implements O
dialogService: DialogService,
config: DialogConfig>,
) {
- return dialogService.open(TwoFactorEmailComponent, config);
+ return dialogService.open(TwoFactorSetupEmailComponent, config);
}
}
diff --git a/apps/web/src/app/auth/settings/two-factor-base.component.ts b/apps/web/src/app/auth/settings/two-factor/two-factor-setup-method-base.component.ts
similarity index 96%
rename from apps/web/src/app/auth/settings/two-factor-base.component.ts
rename to apps/web/src/app/auth/settings/two-factor/two-factor-setup-method-base.component.ts
index 2a6af1df98c..0ea7ac0b6a1 100644
--- a/apps/web/src/app/auth/settings/two-factor-base.component.ts
+++ b/apps/web/src/app/auth/settings/two-factor/two-factor-setup-method-base.component.ts
@@ -12,8 +12,11 @@ import { LogService } from "@bitwarden/common/platform/abstractions/log.service"
import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
import { DialogService, ToastService } from "@bitwarden/components";
+/**
+ * Base class for two-factor setup components (ex: email, yubikey, webauthn, duo).
+ */
@Directive()
-export abstract class TwoFactorBaseComponent {
+export abstract class TwoFactorSetupMethodBaseComponent {
@Output() onUpdated = new EventEmitter();
type: TwoFactorProviderType;
diff --git a/apps/web/src/app/auth/settings/two-factor-webauthn.component.html b/apps/web/src/app/auth/settings/two-factor/two-factor-setup-webauthn.component.html
similarity index 100%
rename from apps/web/src/app/auth/settings/two-factor-webauthn.component.html
rename to apps/web/src/app/auth/settings/two-factor/two-factor-setup-webauthn.component.html
diff --git a/apps/web/src/app/auth/settings/two-factor-webauthn.component.ts b/apps/web/src/app/auth/settings/two-factor/two-factor-setup-webauthn.component.ts
similarity index 94%
rename from apps/web/src/app/auth/settings/two-factor-webauthn.component.ts
rename to apps/web/src/app/auth/settings/two-factor/two-factor-setup-webauthn.component.ts
index 6dfee920991..120c2168e84 100644
--- a/apps/web/src/app/auth/settings/two-factor-webauthn.component.ts
+++ b/apps/web/src/app/auth/settings/two-factor/two-factor-setup-webauthn.component.ts
@@ -18,7 +18,7 @@ import { LogService } from "@bitwarden/common/platform/abstractions/log.service"
import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
import { DialogService, ToastService } from "@bitwarden/components";
-import { TwoFactorBaseComponent } from "./two-factor-base.component";
+import { TwoFactorSetupMethodBaseComponent } from "./two-factor-setup-method-base.component";
interface Key {
id: number;
@@ -29,10 +29,10 @@ interface Key {
}
@Component({
- selector: "app-two-factor-webauthn",
- templateUrl: "two-factor-webauthn.component.html",
+ selector: "app-two-factor-setup-webauthn",
+ templateUrl: "two-factor-setup-webauthn.component.html",
})
-export class TwoFactorWebAuthnComponent extends TwoFactorBaseComponent {
+export class TwoFactorSetupWebAuthnComponent extends TwoFactorSetupMethodBaseComponent {
type = TwoFactorProviderType.WebAuthn;
name: string;
keys: Key[];
@@ -213,6 +213,6 @@ export class TwoFactorWebAuthnComponent extends TwoFactorBaseComponent {
dialogService: DialogService,
config: DialogConfig>,
) {
- return dialogService.open(TwoFactorWebAuthnComponent, config);
+ return dialogService.open(TwoFactorSetupWebAuthnComponent, config);
}
}
diff --git a/apps/web/src/app/auth/settings/two-factor-yubikey.component.html b/apps/web/src/app/auth/settings/two-factor/two-factor-setup-yubikey.component.html
similarity index 100%
rename from apps/web/src/app/auth/settings/two-factor-yubikey.component.html
rename to apps/web/src/app/auth/settings/two-factor/two-factor-setup-yubikey.component.html
diff --git a/apps/web/src/app/auth/settings/two-factor-yubikey.component.ts b/apps/web/src/app/auth/settings/two-factor/two-factor-setup-yubikey.component.ts
similarity index 93%
rename from apps/web/src/app/auth/settings/two-factor-yubikey.component.ts
rename to apps/web/src/app/auth/settings/two-factor/two-factor-setup-yubikey.component.ts
index 3b601084c35..0b661bb6998 100644
--- a/apps/web/src/app/auth/settings/two-factor-yubikey.component.ts
+++ b/apps/web/src/app/auth/settings/two-factor/two-factor-setup-yubikey.component.ts
@@ -13,7 +13,7 @@ import { LogService } from "@bitwarden/common/platform/abstractions/log.service"
import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
import { DialogService, ToastService } from "@bitwarden/components";
-import { TwoFactorBaseComponent } from "./two-factor-base.component";
+import { TwoFactorSetupMethodBaseComponent } from "./two-factor-setup-method-base.component";
interface Key {
key: string;
@@ -21,10 +21,13 @@ interface Key {
}
@Component({
- selector: "app-two-factor-yubikey",
- templateUrl: "two-factor-yubikey.component.html",
+ selector: "app-two-factor-setup-yubikey",
+ templateUrl: "two-factor-setup-yubikey.component.html",
})
-export class TwoFactorYubiKeyComponent extends TwoFactorBaseComponent implements OnInit {
+export class TwoFactorSetupYubiKeyComponent
+ extends TwoFactorSetupMethodBaseComponent
+ implements OnInit
+{
type = TwoFactorProviderType.Yubikey;
keys: Key[];
anyKeyHasNfc = false;
@@ -169,6 +172,6 @@ export class TwoFactorYubiKeyComponent extends TwoFactorBaseComponent implements
dialogService: DialogService,
config: DialogConfig>,
) {
- return dialogService.open(TwoFactorYubiKeyComponent, config);
+ return dialogService.open(TwoFactorSetupYubiKeyComponent, config);
}
}
diff --git a/apps/web/src/app/auth/settings/two-factor-setup.component.html b/apps/web/src/app/auth/settings/two-factor/two-factor-setup.component.html
similarity index 100%
rename from apps/web/src/app/auth/settings/two-factor-setup.component.html
rename to apps/web/src/app/auth/settings/two-factor/two-factor-setup.component.html
diff --git a/apps/web/src/app/auth/settings/two-factor-setup.component.ts b/apps/web/src/app/auth/settings/two-factor/two-factor-setup.component.ts
similarity index 90%
rename from apps/web/src/app/auth/settings/two-factor-setup.component.ts
rename to apps/web/src/app/auth/settings/two-factor/two-factor-setup.component.ts
index 3b8a9edd955..d4cbb5b0791 100644
--- a/apps/web/src/app/auth/settings/two-factor-setup.component.ts
+++ b/apps/web/src/app/auth/settings/two-factor/two-factor-setup.component.ts
@@ -29,13 +29,13 @@ import { ProductTierType } from "@bitwarden/common/billing/enums";
import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
import { DialogService } from "@bitwarden/components";
-import { TwoFactorAuthenticatorComponent } from "./two-factor-authenticator.component";
-import { TwoFactorDuoComponent } from "./two-factor-duo.component";
-import { TwoFactorEmailComponent } from "./two-factor-email.component";
import { TwoFactorRecoveryComponent } from "./two-factor-recovery.component";
+import { TwoFactorSetupAuthenticatorComponent } from "./two-factor-setup-authenticator.component";
+import { TwoFactorSetupDuoComponent } from "./two-factor-setup-duo.component";
+import { TwoFactorSetupEmailComponent } from "./two-factor-setup-email.component";
+import { TwoFactorSetupWebAuthnComponent } from "./two-factor-setup-webauthn.component";
+import { TwoFactorSetupYubiKeyComponent } from "./two-factor-setup-yubikey.component";
import { TwoFactorVerifyComponent } from "./two-factor-verify.component";
-import { TwoFactorWebAuthnComponent } from "./two-factor-webauthn.component";
-import { TwoFactorYubiKeyComponent } from "./two-factor-yubikey.component";
@Component({
selector: "app-two-factor-setup",
@@ -142,7 +142,7 @@ export class TwoFactorSetupComponent implements OnInit, OnDestroy {
if (!result) {
return;
}
- const authComp: DialogRef = TwoFactorAuthenticatorComponent.open(
+ const authComp: DialogRef = TwoFactorSetupAuthenticatorComponent.open(
this.dialogService,
{ data: result },
);
@@ -160,7 +160,7 @@ export class TwoFactorSetupComponent implements OnInit, OnDestroy {
if (!result) {
return;
}
- const yubiComp: DialogRef = TwoFactorYubiKeyComponent.open(
+ const yubiComp: DialogRef = TwoFactorSetupYubiKeyComponent.open(
this.dialogService,
{ data: result },
);
@@ -177,11 +177,14 @@ export class TwoFactorSetupComponent implements OnInit, OnDestroy {
if (!result) {
return;
}
- const duoComp: DialogRef = TwoFactorDuoComponent.open(this.dialogService, {
- data: {
- authResponse: result,
+ const duoComp: DialogRef = TwoFactorSetupDuoComponent.open(
+ this.dialogService,
+ {
+ data: {
+ authResponse: result,
+ },
},
- });
+ );
this.twoFactorSetupSubscription = duoComp.componentInstance.onChangeStatus
.pipe(first(), takeUntil(this.destroy$))
.subscribe((enabled: boolean) => {
@@ -196,7 +199,7 @@ export class TwoFactorSetupComponent implements OnInit, OnDestroy {
if (!result) {
return;
}
- const emailComp: DialogRef = TwoFactorEmailComponent.open(
+ const emailComp: DialogRef = TwoFactorSetupEmailComponent.open(
this.dialogService,
{
data: result,
@@ -216,7 +219,7 @@ export class TwoFactorSetupComponent implements OnInit, OnDestroy {
if (!result) {
return;
}
- const webAuthnComp: DialogRef = TwoFactorWebAuthnComponent.open(
+ const webAuthnComp: DialogRef = TwoFactorSetupWebAuthnComponent.open(
this.dialogService,
{ data: result },
);
diff --git a/apps/web/src/app/auth/settings/two-factor-verify.component.html b/apps/web/src/app/auth/settings/two-factor/two-factor-verify.component.html
similarity index 100%
rename from apps/web/src/app/auth/settings/two-factor-verify.component.html
rename to apps/web/src/app/auth/settings/two-factor/two-factor-verify.component.html
diff --git a/apps/web/src/app/auth/settings/two-factor-verify.component.ts b/apps/web/src/app/auth/settings/two-factor/two-factor-verify.component.ts
similarity index 100%
rename from apps/web/src/app/auth/settings/two-factor-verify.component.ts
rename to apps/web/src/app/auth/settings/two-factor/two-factor-verify.component.ts
diff --git a/apps/web/src/app/billing/services/free-families-policy.service.ts b/apps/web/src/app/billing/services/free-families-policy.service.ts
new file mode 100644
index 00000000000..cc53e0a32bc
--- /dev/null
+++ b/apps/web/src/app/billing/services/free-families-policy.service.ts
@@ -0,0 +1,125 @@
+import { Injectable } from "@angular/core";
+import { combineLatest, filter, from, map, Observable, of, switchMap } from "rxjs";
+
+import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
+import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
+import { PolicyType } from "@bitwarden/common/admin-console/enums";
+import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
+
+interface EnterpriseOrgStatus {
+ isFreeFamilyPolicyEnabled: boolean;
+ belongToOneEnterpriseOrgs: boolean;
+ belongToMultipleEnterpriseOrgs: boolean;
+}
+
+@Injectable({ providedIn: "root" })
+export class FreeFamiliesPolicyService {
+ protected enterpriseOrgStatus: EnterpriseOrgStatus = {
+ isFreeFamilyPolicyEnabled: false,
+ belongToOneEnterpriseOrgs: false,
+ belongToMultipleEnterpriseOrgs: false,
+ };
+
+ constructor(
+ private policyService: PolicyService,
+ private organizationService: OrganizationService,
+ private configService: ConfigService,
+ ) {}
+
+ get showFreeFamilies$(): Observable {
+ return this.isFreeFamilyFlagEnabled$.pipe(
+ switchMap((isFreeFamilyFlagEnabled) =>
+ isFreeFamilyFlagEnabled
+ ? this.getFreeFamiliesVisibility$()
+ : this.organizationService.canManageSponsorships$,
+ ),
+ );
+ }
+
+ private getFreeFamiliesVisibility$(): Observable {
+ return combineLatest([
+ this.checkEnterpriseOrganizationsAndFetchPolicy(),
+ this.organizationService.canManageSponsorships$,
+ ]).pipe(
+ map(([orgStatus, canManageSponsorships]) =>
+ this.shouldShowFreeFamilyLink(orgStatus, canManageSponsorships),
+ ),
+ );
+ }
+
+ private shouldShowFreeFamilyLink(
+ orgStatus: EnterpriseOrgStatus | null,
+ canManageSponsorships: boolean,
+ ): boolean {
+ if (!orgStatus) {
+ return false;
+ }
+ const { belongToOneEnterpriseOrgs, isFreeFamilyPolicyEnabled } = orgStatus;
+ return canManageSponsorships && !(belongToOneEnterpriseOrgs && isFreeFamilyPolicyEnabled);
+ }
+
+ checkEnterpriseOrganizationsAndFetchPolicy(): Observable {
+ return this.organizationService.organizations$.pipe(
+ filter((organizations) => Array.isArray(organizations) && organizations.length > 0),
+ switchMap((organizations) => this.fetchEnterpriseOrganizationPolicy(organizations)),
+ );
+ }
+
+ private fetchEnterpriseOrganizationPolicy(
+ organizations: Organization[],
+ ): Observable {
+ const { belongToOneEnterpriseOrgs, belongToMultipleEnterpriseOrgs } =
+ this.evaluateEnterpriseOrganizations(organizations);
+
+ if (!belongToOneEnterpriseOrgs) {
+ return of({
+ isFreeFamilyPolicyEnabled: false,
+ belongToOneEnterpriseOrgs,
+ belongToMultipleEnterpriseOrgs,
+ });
+ }
+
+ const organizationId = this.getOrganizationIdForOneEnterprise(organizations);
+ if (!organizationId) {
+ return of({
+ isFreeFamilyPolicyEnabled: false,
+ belongToOneEnterpriseOrgs,
+ belongToMultipleEnterpriseOrgs,
+ });
+ }
+
+ return this.policyService.getAll$(PolicyType.FreeFamiliesSponsorshipPolicy).pipe(
+ map((policies) => ({
+ isFreeFamilyPolicyEnabled: policies.some(
+ (policy) => policy.organizationId === organizationId && policy.enabled,
+ ),
+ belongToOneEnterpriseOrgs,
+ belongToMultipleEnterpriseOrgs,
+ })),
+ );
+ }
+
+ private evaluateEnterpriseOrganizations(organizations: any[]): {
+ belongToOneEnterpriseOrgs: boolean;
+ belongToMultipleEnterpriseOrgs: boolean;
+ } {
+ const enterpriseOrganizations = organizations.filter((org) => org.canManageSponsorships);
+ const count = enterpriseOrganizations.length;
+
+ return {
+ belongToOneEnterpriseOrgs: count === 1,
+ belongToMultipleEnterpriseOrgs: count > 1,
+ };
+ }
+
+ private getOrganizationIdForOneEnterprise(organizations: any[]): string | null {
+ const enterpriseOrganizations = organizations.filter((org) => org.canManageSponsorships);
+ return enterpriseOrganizations.length === 1 ? enterpriseOrganizations[0].id : null;
+ }
+
+ private get isFreeFamilyFlagEnabled$(): Observable {
+ return from(this.configService.getFeatureFlag(FeatureFlag.DisableFreeFamiliesSponsorship));
+ }
+}
diff --git a/apps/web/src/app/billing/settings/sponsored-families.component.ts b/apps/web/src/app/billing/settings/sponsored-families.component.ts
index c098b6044c8..f49e7acce29 100644
--- a/apps/web/src/app/billing/settings/sponsored-families.component.ts
+++ b/apps/web/src/app/billing/settings/sponsored-families.component.ts
@@ -8,13 +8,17 @@ import {
AsyncValidatorFn,
ValidationErrors,
} from "@angular/forms";
-import { firstValueFrom, map, Observable, Subject, takeUntil } from "rxjs";
+import { combineLatest, firstValueFrom, map, Observable, Subject, takeUntil } from "rxjs";
import { ApiService } from "@bitwarden/common/abstractions/api.service";
import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
+import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
+import { PolicyType } from "@bitwarden/common/admin-console/enums";
import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
import { PlanSponsorshipType } from "@bitwarden/common/billing/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 { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
@@ -31,6 +35,7 @@ interface RequestSponsorshipForm {
})
export class SponsoredFamiliesComponent implements OnInit, OnDestroy {
loading = false;
+ isFreeFamilyFlagEnabled: boolean;
availableSponsorshipOrgs$: Observable;
activeSponsorshipOrgs$: Observable;
@@ -53,6 +58,8 @@ export class SponsoredFamiliesComponent implements OnInit, OnDestroy {
private formBuilder: FormBuilder,
private accountService: AccountService,
private toastService: ToastService,
+ private configService: ConfigService,
+ private policyService: PolicyService,
) {
this.sponsorshipForm = this.formBuilder.group({
selectedSponsorshipOrgId: new FormControl("", {
@@ -72,10 +79,34 @@ export class SponsoredFamiliesComponent implements OnInit, OnDestroy {
}
async ngOnInit() {
- this.availableSponsorshipOrgs$ = this.organizationService.organizations$.pipe(
- map((orgs) => orgs.filter((o) => o.familySponsorshipAvailable)),
+ this.isFreeFamilyFlagEnabled = await this.configService.getFeatureFlag(
+ FeatureFlag.DisableFreeFamiliesSponsorship,
);
+ if (this.isFreeFamilyFlagEnabled) {
+ this.availableSponsorshipOrgs$ = combineLatest([
+ this.organizationService.organizations$,
+ this.policyService.getAll$(PolicyType.FreeFamiliesSponsorshipPolicy),
+ ]).pipe(
+ map(([organizations, policies]) =>
+ organizations
+ .filter((org) => org.familySponsorshipAvailable)
+ .map((org) => ({
+ organization: org,
+ isPolicyEnabled: policies.some(
+ (policy) => policy.organizationId === org.id && policy.enabled,
+ ),
+ }))
+ .filter(({ isPolicyEnabled }) => !isPolicyEnabled)
+ .map(({ organization }) => organization),
+ ),
+ );
+ } else {
+ this.availableSponsorshipOrgs$ = this.organizationService.organizations$.pipe(
+ map((orgs) => orgs.filter((o) => o.familySponsorshipAvailable)),
+ );
+ }
+
this.availableSponsorshipOrgs$.pipe(takeUntil(this._destroy)).subscribe((orgs) => {
if (orgs.length === 1) {
this.sponsorshipForm.patchValue({
diff --git a/apps/web/src/app/billing/settings/sponsoring-org-row.component.html b/apps/web/src/app/billing/settings/sponsoring-org-row.component.html
index b07cbbfad12..eeeaa256049 100644
--- a/apps/web/src/app/billing/settings/sponsoring-org-row.component.html
+++ b/apps/web/src/app/billing/settings/sponsoring-org-row.component.html
@@ -18,7 +18,11 @@