{{ title }}
@@ -47,11 +52,11 @@ 'tw-hidden': collapsibleKey && !sectionOpenState(), }" > - {{ ciphers.length }} + {{ ciphers().length }} -+ {{ group.subHeaderKey | i18n }} +
+{{ paymentDesc }}
-{{ "manageSubscription" | i18n }}
+{{ resellerSeatsRemainingMessage }}
+
{{ "selfHostingTitleProper" | i18n }}
diff --git a/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.ts b/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.ts
index 003f816ac30..50c755af63b 100644
--- a/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.ts
+++ b/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.ts
@@ -4,13 +4,17 @@ import { Component, OnDestroy, OnInit } from "@angular/core";
import { ActivatedRoute } from "@angular/router";
import { firstValueFrom, lastValueFrom, Observable, Subject } from "rxjs";
+import { OrganizationUserApiService } from "@bitwarden/admin-console/common";
import { ApiService } from "@bitwarden/common/abstractions/api.service";
import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
import {
getOrganizationById,
OrganizationService,
} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
-import { OrganizationApiKeyType } from "@bitwarden/common/admin-console/enums";
+import {
+ OrganizationApiKeyType,
+ OrganizationUserStatusType,
+} 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 { getUserId } from "@bitwarden/common/auth/services/account.service";
@@ -61,12 +65,15 @@ export class OrganizationSubscriptionCloudComponent implements OnInit, OnDestroy
showSubscription = true;
showSelfHost = false;
organizationIsManagedByConsolidatedBillingMSP = false;
+ resellerSeatsRemainingMessage: string;
protected readonly subscriptionHiddenIcon = SubscriptionHiddenIcon;
protected readonly teamsStarter = ProductTierType.TeamsStarter;
private destroy$ = new Subject();
+ private seatsRemainingMessage: string;
+
constructor(
private apiService: ApiService,
private i18nService: I18nService,
@@ -79,6 +86,7 @@ export class OrganizationSubscriptionCloudComponent implements OnInit, OnDestroy
private configService: ConfigService,
private toastService: ToastService,
private billingApiService: BillingApiServiceAbstraction,
+ private organizationUserApiService: OrganizationUserApiService,
) {}
async ngOnInit() {
@@ -104,6 +112,28 @@ export class OrganizationSubscriptionCloudComponent implements OnInit, OnDestroy
}
}
}
+
+ if (this.userOrg.hasReseller) {
+ const allUsers = await this.organizationUserApiService.getAllUsers(this.userOrg.id);
+
+ const userCount = allUsers.data.filter((user) =>
+ [
+ OrganizationUserStatusType.Invited,
+ OrganizationUserStatusType.Accepted,
+ OrganizationUserStatusType.Confirmed,
+ ].includes(user.status),
+ ).length;
+
+ const remainingSeats = this.userOrg.seats - userCount;
+
+ const seatsRemaining = this.i18nService.t(
+ "seatsRemaining",
+ remainingSeats.toString(),
+ this.userOrg.seats.toString(),
+ );
+
+ this.resellerSeatsRemainingMessage = seatsRemaining;
+ }
}
ngOnDestroy() {
diff --git a/apps/web/src/app/billing/trial-initiation/secrets-manager/secrets-manager-trial-free-stepper.component.html b/apps/web/src/app/billing/trial-initiation/secrets-manager/secrets-manager-trial-free-stepper.component.html
index 0b6e44d4eb6..dddac598a46 100644
--- a/apps/web/src/app/billing/trial-initiation/secrets-manager/secrets-manager-trial-free-stepper.component.html
+++ b/apps/web/src/app/billing/trial-initiation/secrets-manager/secrets-manager-trial-free-stepper.component.html
@@ -1,17 +1,4 @@
-
-
-
-
-
-
-
-
-
-
- {{ "createAccount" | i18n }}
-
- 
-
-
-
-
- {{ freeTrialText }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/apps/web/src/app/billing/trial-initiation/trial-initiation.component.spec.ts b/apps/web/src/app/billing/trial-initiation/trial-initiation.component.spec.ts
deleted file mode 100644
index c8d4d35fb7d..00000000000
--- a/apps/web/src/app/billing/trial-initiation/trial-initiation.component.spec.ts
+++ /dev/null
@@ -1,336 +0,0 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-import { StepperSelectionEvent } from "@angular/cdk/stepper";
-import { TitleCasePipe } from "@angular/common";
-import { NO_ERRORS_SCHEMA } from "@angular/core";
-import { ComponentFixture, fakeAsync, TestBed, tick } from "@angular/core/testing";
-import { FormBuilder, UntypedFormBuilder } from "@angular/forms";
-import { ActivatedRoute, Router } from "@angular/router";
-import { RouterTestingModule } from "@angular/router/testing";
-import { mock, MockProxy } from "jest-mock-extended";
-import { BehaviorSubject, of } from "rxjs";
-
-import { I18nPipe } from "@bitwarden/angular/platform/pipes/i18n.pipe";
-import { PolicyApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy-api.service.abstraction";
-import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
-import { MasterPasswordPolicyOptions } from "@bitwarden/common/admin-console/models/domain/master-password-policy-options";
-import { Policy } from "@bitwarden/common/admin-console/models/domain/policy";
-import { OrganizationBillingServiceAbstraction as OrganizationBillingService } from "@bitwarden/common/billing/abstractions/organization-billing.service";
-import { PlanType } from "@bitwarden/common/billing/enums";
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
-import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
-import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
-
-import { AcceptOrganizationInviteService } from "../../auth/organization-invite/accept-organization.service";
-import { OrganizationInvite } from "../../auth/organization-invite/organization-invite";
-import { RouterService } from "../../core";
-import { SharedModule } from "../../shared";
-
-import { TrialInitiationComponent } from "./trial-initiation.component";
-import { VerticalStepperComponent } from "./vertical-stepper/vertical-stepper.component";
-
-describe("TrialInitiationComponent", () => {
- let component: TrialInitiationComponent;
- let fixture: ComponentFixture;
- const mockQueryParams = new BehaviorSubject({ org: "enterprise" });
- const testOrgId = "91329456-5b9f-44b3-9279-6bb9ee6a0974";
- const formBuilder: FormBuilder = new FormBuilder();
- let routerSpy: jest.SpyInstance;
-
- let stateServiceMock: MockProxy;
- let policyApiServiceMock: MockProxy;
- let policyServiceMock: MockProxy;
- let routerServiceMock: MockProxy;
- let acceptOrgInviteServiceMock: MockProxy;
- let organizationBillingServiceMock: MockProxy;
- let configServiceMock: MockProxy;
-
- beforeEach(() => {
- // only define services directly that we want to mock return values in this component
- stateServiceMock = mock();
- policyApiServiceMock = mock();
- policyServiceMock = mock();
- routerServiceMock = mock();
- acceptOrgInviteServiceMock = mock();
- organizationBillingServiceMock = mock();
- configServiceMock = mock();
-
- // 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
- TestBed.configureTestingModule({
- imports: [
- SharedModule,
- RouterTestingModule.withRoutes([
- { path: "trial", component: TrialInitiationComponent },
- {
- path: `organizations/${testOrgId}/vault`,
- component: BlankComponent,
- },
- {
- path: `organizations/${testOrgId}/members`,
- component: BlankComponent,
- },
- ]),
- ],
- declarations: [TrialInitiationComponent, I18nPipe],
- providers: [
- UntypedFormBuilder,
- {
- provide: ActivatedRoute,
- useValue: {
- queryParams: mockQueryParams.asObservable(),
- },
- },
- { provide: StateService, useValue: stateServiceMock },
- { provide: PolicyService, useValue: policyServiceMock },
- { provide: PolicyApiServiceAbstraction, useValue: policyApiServiceMock },
- { provide: LogService, useValue: mock() },
- { provide: I18nService, useValue: mock() },
- { provide: TitleCasePipe, useValue: mock() },
- {
- provide: VerticalStepperComponent,
- useClass: VerticalStepperStubComponent,
- },
- {
- provide: RouterService,
- useValue: routerServiceMock,
- },
- {
- provide: AcceptOrganizationInviteService,
- useValue: acceptOrgInviteServiceMock,
- },
- {
- provide: OrganizationBillingService,
- useValue: organizationBillingServiceMock,
- },
- {
- provide: ConfigService,
- useValue: configServiceMock,
- },
- ],
- schemas: [NO_ERRORS_SCHEMA], // Allows child components to be ignored (such as register component)
- }).compileComponents();
- });
-
- beforeEach(() => {
- fixture = TestBed.createComponent(TrialInitiationComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it("should create", () => {
- expect(component).toBeTruthy();
- });
-
- // These tests demonstrate mocking service calls
- describe("onInit() enforcedPolicyOptions", () => {
- it("should not set enforcedPolicyOptions if there isn't an org invite in deep linked url", async () => {
- acceptOrgInviteServiceMock.getOrganizationInvite.mockResolvedValueOnce(null);
- // Need to recreate component with new service mock
- fixture = TestBed.createComponent(TrialInitiationComponent);
- component = fixture.componentInstance;
- await component.ngOnInit();
-
- expect(component.enforcedPolicyOptions).toBe(undefined);
- });
- it("should set enforcedPolicyOptions if the deep linked url has an org invite", async () => {
- // Set up service method mocks
- acceptOrgInviteServiceMock.getOrganizationInvite.mockResolvedValueOnce({
- organizationId: testOrgId,
- token: "token",
- email: "testEmail",
- organizationUserId: "123",
- } as OrganizationInvite);
- policyApiServiceMock.getPoliciesByToken.mockReturnValueOnce(
- Promise.resolve([
- {
- id: "345",
- organizationId: testOrgId,
- type: 1,
- data: {
- minComplexity: 4,
- minLength: 10,
- requireLower: null,
- requireNumbers: null,
- requireSpecial: null,
- requireUpper: null,
- },
- enabled: true,
- },
- ] as Policy[]),
- );
- policyServiceMock.masterPasswordPolicyOptions$.mockReturnValue(
- of({
- minComplexity: 4,
- minLength: 10,
- requireLower: null,
- requireNumbers: null,
- requireSpecial: null,
- requireUpper: null,
- } as MasterPasswordPolicyOptions),
- );
-
- // Need to recreate component with new service mocks
- fixture = TestBed.createComponent(TrialInitiationComponent);
- component = fixture.componentInstance;
- await component.ngOnInit();
- expect(component.enforcedPolicyOptions).toMatchObject({
- minComplexity: 4,
- minLength: 10,
- requireLower: null,
- requireNumbers: null,
- requireSpecial: null,
- requireUpper: null,
- });
- });
- });
-
- // These tests demonstrate route params
- describe("Route params", () => {
- it("should set org variable to be enterprise and plan to EnterpriseAnnually if org param is enterprise", fakeAsync(() => {
- mockQueryParams.next({ org: "enterprise" });
- tick(); // wait for resolution
- fixture = TestBed.createComponent(TrialInitiationComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- expect(component.org).toBe("enterprise");
- expect(component.plan).toBe(PlanType.EnterpriseAnnually);
- }));
- it("should not set org variable if no org param is provided", fakeAsync(() => {
- mockQueryParams.next({});
- tick(); // wait for resolution
- fixture = TestBed.createComponent(TrialInitiationComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- expect(component.org).toBe("");
- expect(component.accountCreateOnly).toBe(true);
- }));
- it("should not set the org if org param is invalid ", fakeAsync(async () => {
- mockQueryParams.next({ org: "hahahaha" });
- tick(); // wait for resolution
- fixture = TestBed.createComponent(TrialInitiationComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- expect(component.org).toBe("");
- expect(component.accountCreateOnly).toBe(true);
- }));
- it("should set the layout variable if layout param is valid ", fakeAsync(async () => {
- mockQueryParams.next({ layout: "teams1" });
- tick(); // wait for resolution
- fixture = TestBed.createComponent(TrialInitiationComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- expect(component.layout).toBe("teams1");
- expect(component.accountCreateOnly).toBe(false);
- }));
- it("should not set the layout variable and leave as 'default' if layout param is invalid ", fakeAsync(async () => {
- mockQueryParams.next({ layout: "asdfasdf" });
- tick(); // wait for resolution
- fixture = TestBed.createComponent(TrialInitiationComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- // 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
- component.ngOnInit();
- expect(component.layout).toBe("default");
- expect(component.accountCreateOnly).toBe(true);
- }));
- });
-
- // These tests demonstrate the use of a stub component
- describe("createAccount()", () => {
- beforeEach(() => {
- component.verticalStepper = TestBed.createComponent(VerticalStepperStubComponent)
- .componentInstance as VerticalStepperComponent;
- });
-
- it("should set email and call verticalStepper.next()", fakeAsync(() => {
- const verticalStepperNext = jest.spyOn(component.verticalStepper, "next");
- component.createdAccount("test@email.com");
- expect(verticalStepperNext).toHaveBeenCalled();
- expect(component.email).toBe("test@email.com");
- }));
- });
-
- describe("billingSuccess()", () => {
- beforeEach(() => {
- component.verticalStepper = TestBed.createComponent(VerticalStepperStubComponent)
- .componentInstance as VerticalStepperComponent;
- });
-
- it("should set orgId and call verticalStepper.next()", () => {
- const verticalStepperNext = jest.spyOn(component.verticalStepper, "next");
- component.billingSuccess({ orgId: testOrgId });
- expect(verticalStepperNext).toHaveBeenCalled();
- expect(component.orgId).toBe(testOrgId);
- });
- });
-
- describe("stepSelectionChange()", () => {
- beforeEach(() => {
- component.verticalStepper = TestBed.createComponent(VerticalStepperStubComponent)
- .componentInstance as VerticalStepperComponent;
- });
-
- it("on step 2 should show organization copy text", () => {
- component.stepSelectionChange({
- selectedIndex: 1,
- previouslySelectedIndex: 0,
- } as StepperSelectionEvent);
-
- expect(component.orgInfoSubLabel).toContain("Enter your");
- expect(component.orgInfoSubLabel).toContain(" organization information");
- });
- it("going from step 2 to 3 should set the orgInforSubLabel to be the Org name from orgInfoFormGroup", () => {
- component.orgInfoFormGroup = formBuilder.group({
- name: ["Hooli"],
- email: [""],
- });
- component.stepSelectionChange({
- selectedIndex: 2,
- previouslySelectedIndex: 1,
- } as StepperSelectionEvent);
-
- expect(component.orgInfoSubLabel).toContain("Hooli");
- });
- });
-
- describe("previousStep()", () => {
- beforeEach(() => {
- component.verticalStepper = TestBed.createComponent(VerticalStepperStubComponent)
- .componentInstance as VerticalStepperComponent;
- });
-
- it("should call verticalStepper.previous()", fakeAsync(() => {
- const verticalStepperPrevious = jest.spyOn(component.verticalStepper, "previous");
- component.previousStep();
- expect(verticalStepperPrevious).toHaveBeenCalled();
- }));
- });
-
- // These tests demonstrate router navigation
- describe("navigation methods", () => {
- beforeEach(() => {
- component.orgId = testOrgId;
- const router = TestBed.inject(Router);
- fixture.detectChanges();
- routerSpy = jest.spyOn(router, "navigate");
- });
- describe("navigateToOrgVault", () => {
- it("should call verticalStepper.previous()", fakeAsync(() => {
- component.navigateToOrgVault();
- expect(routerSpy).toHaveBeenCalledWith(["organizations", testOrgId, "vault"]);
- }));
- });
- describe("navigateToOrgVault", () => {
- it("should call verticalStepper.previous()", fakeAsync(() => {
- component.navigateToOrgInvite();
- expect(routerSpy).toHaveBeenCalledWith(["organizations", testOrgId, "members"]);
- }));
- });
- });
-});
-
-export class VerticalStepperStubComponent extends VerticalStepperComponent {}
-export class BlankComponent {} // For router tests
diff --git a/apps/web/src/app/billing/trial-initiation/trial-initiation.component.ts b/apps/web/src/app/billing/trial-initiation/trial-initiation.component.ts
deleted file mode 100644
index 2403c28d267..00000000000
--- a/apps/web/src/app/billing/trial-initiation/trial-initiation.component.ts
+++ /dev/null
@@ -1,353 +0,0 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-import { StepperSelectionEvent } from "@angular/cdk/stepper";
-import { TitleCasePipe } from "@angular/common";
-import { Component, OnDestroy, OnInit, ViewChild } from "@angular/core";
-import { UntypedFormBuilder, Validators } from "@angular/forms";
-import { ActivatedRoute, Router } from "@angular/router";
-import { Subject, takeUntil } from "rxjs";
-
-import { PolicyApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy-api.service.abstraction";
-import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
-import { MasterPasswordPolicyOptions } from "@bitwarden/common/admin-console/models/domain/master-password-policy-options";
-import { Policy } from "@bitwarden/common/admin-console/models/domain/policy";
-import {
- OrganizationInformation,
- PlanInformation,
- OrganizationBillingServiceAbstraction as OrganizationBillingService,
-} from "@bitwarden/common/billing/abstractions/organization-billing.service";
-import { PlanType, ProductTierType } from "@bitwarden/common/billing/enums";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
-import { ReferenceEventRequest } from "@bitwarden/common/models/request/reference-event.request";
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
-import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
-
-import { AcceptOrganizationInviteService } from "../../auth/organization-invite/accept-organization.service";
-import { OrganizationInvite } from "../../auth/organization-invite/organization-invite";
-import {
- OrganizationCreatedEvent,
- SubscriptionProduct,
- TrialOrganizationType,
-} from "../../billing/accounts/trial-initiation/trial-billing-step.component";
-
-import { RouterService } from "./../../core/router.service";
-import { VerticalStepperComponent } from "./vertical-stepper/vertical-stepper.component";
-
-export enum ValidOrgParams {
- families = "families",
- enterprise = "enterprise",
- teams = "teams",
- teamsStarter = "teamsStarter",
- individual = "individual",
- premium = "premium",
- free = "free",
-}
-
-enum ValidLayoutParams {
- default = "default",
- teams = "teams",
- teams1 = "teams1",
- teams2 = "teams2",
- teams3 = "teams3",
- enterprise = "enterprise",
- enterprise1 = "enterprise1",
- enterprise2 = "enterprise2",
- cnetcmpgnent = "cnetcmpgnent",
- cnetcmpgnind = "cnetcmpgnind",
- cnetcmpgnteams = "cnetcmpgnteams",
- abmenterprise = "abmenterprise",
- abmteams = "abmteams",
- secretsManager = "secretsManager",
-}
-
-@Component({
- selector: "app-trial",
- templateUrl: "trial-initiation.component.html",
-})
-export class TrialInitiationComponent implements OnInit, OnDestroy {
- email = "";
- fromOrgInvite = false;
- org = "";
- orgInfoSubLabel = "";
- orgId = "";
- orgLabel = "";
- billingSubLabel = "";
- layout = "default";
- plan: PlanType;
- productTier: ProductTierType;
- accountCreateOnly = true;
- useTrialStepper = false;
- loading = false;
- policies: Policy[];
- enforcedPolicyOptions: MasterPasswordPolicyOptions;
- trialFlowOrgs: string[] = [
- ValidOrgParams.teams,
- ValidOrgParams.teamsStarter,
- ValidOrgParams.enterprise,
- ValidOrgParams.families,
- ];
- routeFlowOrgs: string[] = [
- ValidOrgParams.free,
- ValidOrgParams.premium,
- ValidOrgParams.individual,
- ];
- layouts = ValidLayoutParams;
- referenceData: ReferenceEventRequest;
- @ViewChild("stepper", { static: false }) verticalStepper: VerticalStepperComponent;
-
- orgInfoFormGroup = this.formBuilder.group({
- name: ["", { validators: [Validators.required, Validators.maxLength(50)], updateOn: "change" }],
- email: [""],
- });
-
- private set referenceDataId(referenceId: string) {
- if (referenceId != null) {
- this.referenceData.id = referenceId;
- } else {
- this.referenceData.id = ("; " + document.cookie)
- .split("; reference=")
- .pop()
- .split(";")
- .shift();
- }
-
- if (this.referenceData.id === "") {
- this.referenceData.id = null;
- } else {
- // Matches "_ga_QBRN562QQQ=value1.value2.session" and captures values and session.
- const regex = /_ga_QBRN562QQQ=([^.]+)\.([^.]+)\.(\d+)/;
- const match = document.cookie.match(regex);
- if (match) {
- this.referenceData.session = match[3];
- }
- }
- }
-
- private destroy$ = new Subject();
- protected enableTrialPayment$ = this.configService.getFeatureFlag$(
- FeatureFlag.TrialPaymentOptional,
- );
-
- constructor(
- private route: ActivatedRoute,
- protected router: Router,
- private formBuilder: UntypedFormBuilder,
- private titleCasePipe: TitleCasePipe,
- private logService: LogService,
- private policyApiService: PolicyApiServiceAbstraction,
- private policyService: PolicyService,
- private i18nService: I18nService,
- private routerService: RouterService,
- private acceptOrgInviteService: AcceptOrganizationInviteService,
- private organizationBillingService: OrganizationBillingService,
- private configService: ConfigService,
- ) {}
-
- async ngOnInit(): Promise {
- this.route.queryParams.pipe(takeUntil(this.destroy$)).subscribe((qParams) => {
- this.referenceData = new ReferenceEventRequest();
- if (qParams.email != null && qParams.email.indexOf("@") > -1) {
- this.email = qParams.email;
- this.fromOrgInvite = qParams.fromOrgInvite === "true";
- }
-
- this.referenceDataId = qParams.reference;
-
- if (Object.values(ValidLayoutParams).includes(qParams.layout)) {
- this.layout = qParams.layout;
- this.accountCreateOnly = false;
- }
-
- if (this.trialFlowOrgs.includes(qParams.org)) {
- this.org = qParams.org;
- this.orgLabel = this.titleCasePipe.transform(this.orgDisplayName);
- this.useTrialStepper = true;
- this.referenceData.flow = qParams.org;
-
- if (this.org === ValidOrgParams.families) {
- this.plan = PlanType.FamiliesAnnually;
- this.productTier = ProductTierType.Families;
- } else if (this.org === ValidOrgParams.teamsStarter) {
- this.plan = PlanType.TeamsStarter;
- this.productTier = ProductTierType.TeamsStarter;
- } else if (this.org === ValidOrgParams.teams) {
- this.plan = PlanType.TeamsAnnually;
- this.productTier = ProductTierType.Teams;
- } else if (this.org === ValidOrgParams.enterprise) {
- this.plan = PlanType.EnterpriseAnnually;
- this.productTier = ProductTierType.Enterprise;
- }
- } else if (this.routeFlowOrgs.includes(qParams.org)) {
- this.referenceData.flow = qParams.org;
- const route = this.router.createUrlTree(["create-organization"], {
- queryParams: { plan: qParams.org },
- });
- this.routerService.setPreviousUrl(route.toString());
- }
-
- // Are they coming from an email for sponsoring a families organization
- // After logging in redirect them to setup the families sponsorship
- this.setupFamilySponsorship(qParams.sponsorshipToken);
-
- this.referenceData.initiationPath = this.accountCreateOnly
- ? "Registration form"
- : "Password Manager trial from marketing website";
- });
-
- // If there's a deep linked org invite, use it to get the password policies
- const orgInvite = await this.acceptOrgInviteService.getOrganizationInvite();
- if (orgInvite != null) {
- await this.initPasswordPolicies(orgInvite);
- }
-
- this.orgInfoFormGroup.controls.name.valueChanges
- .pipe(takeUntil(this.destroy$))
- .subscribe(() => {
- this.orgInfoFormGroup.controls.name.markAsTouched();
- });
- }
-
- ngOnDestroy(): void {
- this.destroy$.next();
- this.destroy$.complete();
- }
-
- stepSelectionChange(event: StepperSelectionEvent) {
- // Set org info sub label
- if (event.selectedIndex === 1 && this.orgInfoFormGroup.controls.name.value === "") {
- this.orgInfoSubLabel =
- "Enter your " +
- this.titleCasePipe.transform(this.orgDisplayName) +
- " organization information";
- } else if (event.previouslySelectedIndex === 1) {
- this.orgInfoSubLabel = this.orgInfoFormGroup.controls.name.value;
- }
-
- //set billing sub label
- if (event.selectedIndex === 2) {
- this.billingSubLabel = this.i18nService.t("billingTrialSubLabel");
- }
- }
-
- async createOrganizationOnTrial() {
- this.loading = true;
- const organization: OrganizationInformation = {
- name: this.orgInfoFormGroup.get("name").value,
- billingEmail: this.orgInfoFormGroup.get("email").value,
- initiationPath: "Password Manager trial from marketing website",
- };
-
- const plan: PlanInformation = {
- type: this.plan,
- passwordManagerSeats: 1,
- };
-
- const response = await this.organizationBillingService.purchaseSubscriptionNoPaymentMethod({
- organization,
- plan,
- });
-
- this.orgId = response?.id;
- this.billingSubLabel = `${this.i18nService.t("annual")} ($0/${this.i18nService.t("yr")})`;
- this.loading = false;
- this.verticalStepper.next();
- }
-
- createdAccount(email: string) {
- this.email = email;
- this.orgInfoFormGroup.get("email")?.setValue(email);
- this.verticalStepper.next();
- }
-
- billingSuccess(event: any) {
- this.orgId = event?.orgId;
- this.billingSubLabel = event?.subLabelText;
- this.verticalStepper.next();
- }
-
- createdOrganization(event: OrganizationCreatedEvent) {
- this.orgId = event.organizationId;
- this.billingSubLabel = event.planDescription;
- this.verticalStepper.next();
- }
-
- navigateToOrgVault() {
- // 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
- this.router.navigate(["organizations", this.orgId, "vault"]);
- }
-
- navigateToOrgInvite() {
- // 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
- this.router.navigate(["organizations", this.orgId, "members"]);
- }
-
- previousStep() {
- this.verticalStepper.previous();
- }
-
- get orgDisplayName() {
- if (this.org === "teamsStarter") {
- return "Teams Starter";
- }
-
- return this.org;
- }
-
- get freeTrialText() {
- const translationKey =
- this.layout === this.layouts.secretsManager
- ? "startYour7DayFreeTrialOfBitwardenSecretsManagerFor"
- : "startYour7DayFreeTrialOfBitwardenFor";
-
- return this.i18nService.t(translationKey, this.org);
- }
-
- get trialOrganizationType(): TrialOrganizationType {
- switch (this.productTier) {
- case ProductTierType.Free:
- return null;
- default:
- return this.productTier;
- }
- }
-
- private setupFamilySponsorship(sponsorshipToken: string) {
- if (sponsorshipToken != null) {
- const route = this.router.createUrlTree(["setup/families-for-enterprise"], {
- queryParams: { plan: sponsorshipToken },
- });
- this.routerService.setPreviousUrl(route.toString());
- }
- }
-
- private async initPasswordPolicies(invite: OrganizationInvite): Promise {
- if (invite == null) {
- return;
- }
-
- try {
- this.policies = await this.policyApiService.getPoliciesByToken(
- invite.organizationId,
- invite.token,
- invite.email,
- invite.organizationUserId,
- );
- } catch (e) {
- this.logService.error(e);
- }
-
- if (this.policies != null) {
- this.policyService
- .masterPasswordPolicyOptions$(this.policies)
- .pipe(takeUntil(this.destroy$))
- .subscribe((enforcedPasswordPolicyOptions) => {
- this.enforcedPolicyOptions = enforcedPasswordPolicyOptions;
- });
- }
- }
-
- protected readonly SubscriptionProduct = SubscriptionProduct;
-}
diff --git a/apps/web/src/app/billing/trial-initiation/trial-initiation.module.ts b/apps/web/src/app/billing/trial-initiation/trial-initiation.module.ts
index 7b81f57e33b..2c6481ec1bf 100644
--- a/apps/web/src/app/billing/trial-initiation/trial-initiation.module.ts
+++ b/apps/web/src/app/billing/trial-initiation/trial-initiation.module.ts
@@ -6,7 +6,6 @@ import { InputPasswordComponent } from "@bitwarden/auth/angular";
import { FormFieldModule } from "@bitwarden/components";
import { OrganizationCreateModule } from "../../admin-console/organizations/create/organization-create.module";
-import { RegisterFormModule } from "../../auth/register-form/register-form.module";
import { TaxInfoComponent } from "../../billing";
import { TrialBillingStepComponent } from "../../billing/accounts/trial-initiation/trial-billing-step.component";
import { SecretsManagerTrialFreeStepperComponent } from "../../billing/trial-initiation/secrets-manager/secrets-manager-trial-free-stepper.component";
@@ -39,7 +38,6 @@ import { TeamsContentComponent } from "./content/teams-content.component";
import { Teams1ContentComponent } from "./content/teams1-content.component";
import { Teams2ContentComponent } from "./content/teams2-content.component";
import { Teams3ContentComponent } from "./content/teams3-content.component";
-import { TrialInitiationComponent } from "./trial-initiation.component";
import { VerticalStepperModule } from "./vertical-stepper/vertical-stepper.module";
@NgModule({
@@ -48,7 +46,6 @@ import { VerticalStepperModule } from "./vertical-stepper/vertical-stepper.modul
CdkStepperModule,
VerticalStepperModule,
FormFieldModule,
- RegisterFormModule,
OrganizationCreateModule,
EnvironmentSelectorModule,
TaxInfoComponent,
@@ -56,7 +53,6 @@ import { VerticalStepperModule } from "./vertical-stepper/vertical-stepper.modul
InputPasswordComponent,
],
declarations: [
- TrialInitiationComponent,
CompleteTrialInitiationComponent,
EnterpriseContentComponent,
TeamsContentComponent,
@@ -87,7 +83,7 @@ import { VerticalStepperModule } from "./vertical-stepper/vertical-stepper.modul
SecretsManagerTrialFreeStepperComponent,
SecretsManagerTrialPaidStepperComponent,
],
- exports: [TrialInitiationComponent, CompleteTrialInitiationComponent],
+ exports: [CompleteTrialInitiationComponent],
providers: [TitleCasePipe],
})
export class TrialInitiationModule {}
diff --git a/apps/web/src/app/shared/loose-components.module.ts b/apps/web/src/app/shared/loose-components.module.ts
index 3176ac81c1a..d6ba5a1990c 100644
--- a/apps/web/src/app/shared/loose-components.module.ts
+++ b/apps/web/src/app/shared/loose-components.module.ts
@@ -20,7 +20,6 @@ import { WeakPasswordsReportComponent as OrgWeakPasswordsReportComponent } from
import { HintComponent } from "../auth/hint.component";
import { RecoverDeleteComponent } from "../auth/recover-delete.component";
import { RecoverTwoFactorComponent } from "../auth/recover-two-factor.component";
-import { RegisterFormModule } from "../auth/register-form/register-form.module";
import { RemovePasswordComponent } from "../auth/remove-password.component";
import { SetPasswordComponent } from "../auth/set-password.component";
import { AccountComponent } from "../auth/settings/account/account.component";
@@ -90,7 +89,6 @@ import { SharedModule } from "./shared.module";
@NgModule({
imports: [
SharedModule,
- RegisterFormModule,
ProductSwitcherModule,
UserVerificationModule,
ChangeKdfModule,
diff --git a/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.ts b/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.ts
index 19dad4e9da0..4af08e19d74 100644
--- a/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.ts
+++ b/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.ts
@@ -42,6 +42,7 @@ export class VaultCipherRowComponent implements OnInit {
@Input() collections: CollectionView[];
@Input() viewingOrgVault: boolean;
@Input() canEditCipher: boolean;
+ @Input() canAssignCollections: boolean;
@Input() canManageCollection: boolean;
@Output() onEvent = new EventEmitter();
@@ -101,7 +102,7 @@ export class VaultCipherRowComponent implements OnInit {
}
protected get showAssignToCollections() {
- return this.organizations?.length && this.canEditCipher && !this.cipher.isDeleted;
+ return this.organizations?.length && this.canAssignCollections && !this.cipher.isDeleted;
}
protected get showClone() {
@@ -208,6 +209,6 @@ export class VaultCipherRowComponent implements OnInit {
return true; // Always show checkbox in individual vault or for non-org items
}
- return this.organization.canEditAllCiphers || this.cipher.edit;
+ return this.organization.canEditAllCiphers || (this.cipher.edit && this.cipher.viewPassword);
}
}
diff --git a/apps/web/src/app/vault/components/vault-items/vault-items.component.html b/apps/web/src/app/vault/components/vault-items/vault-items.component.html
index 653d05ef129..a32def5fc0c 100644
--- a/apps/web/src/app/vault/components/vault-items/vault-items.component.html
+++ b/apps/web/src/app/vault/components/vault-items/vault-items.component.html
@@ -144,6 +144,7 @@
[collections]="allCollections"
[checked]="selection.isSelected(item)"
[canEditCipher]="canEditCipher(item.cipher)"
+ [canAssignCollections]="canAssignCollections(item.cipher)"
[canManageCollection]="canManageCollection(item.cipher)"
(checkedToggled)="selection.toggle(item)"
(onEvent)="event($event)"
diff --git a/apps/web/src/app/vault/components/vault-items/vault-items.component.ts b/apps/web/src/app/vault/components/vault-items/vault-items.component.ts
index 3e1cf173a47..a641c5b5908 100644
--- a/apps/web/src/app/vault/components/vault-items/vault-items.component.ts
+++ b/apps/web/src/app/vault/components/vault-items/vault-items.component.ts
@@ -236,6 +236,13 @@ export class VaultItemsComponent {
return (organization.canEditAllCiphers && this.viewingOrgVault) || cipher.edit;
}
+ protected canAssignCollections(cipher: CipherView) {
+ const organization = this.allOrganizations.find((o) => o.id === cipher.organizationId);
+ return (
+ (organization?.canEditAllCiphers && this.viewingOrgVault) || cipher.canAssignToCollections
+ );
+ }
+
protected canManageCollection(cipher: CipherView) {
// If the cipher is not part of an organization (personal item), user can manage it
if (cipher.organizationId == null) {
@@ -461,7 +468,7 @@ export class VaultItemsComponent {
private allCiphersHaveEditAccess(): boolean {
return this.selection.selected
.filter(({ cipher }) => cipher)
- .every(({ cipher }) => cipher?.edit);
+ .every(({ cipher }) => cipher?.edit && cipher?.viewPassword);
}
private getUniqueOrganizationIds(): Set {
diff --git a/apps/web/src/app/vault/individual-vault/vault-filter/services/abstractions/vault-filter.service.ts b/apps/web/src/app/vault/individual-vault/vault-filter/services/abstractions/vault-filter.service.ts
index 7e6f7eb8588..b8494c8aa54 100644
--- a/apps/web/src/app/vault/individual-vault/vault-filter/services/abstractions/vault-filter.service.ts
+++ b/apps/web/src/app/vault/individual-vault/vault-filter/services/abstractions/vault-filter.service.ts
@@ -4,10 +4,8 @@ import { Observable } from "rxjs";
import { CollectionAdminView, CollectionView } from "@bitwarden/admin-console/common";
import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
-import { FolderView } from "@bitwarden/common/src/vault/models/view/folder.view";
import { TreeNode } from "@bitwarden/common/vault/models/domain/tree-node";
+import { FolderView } from "@bitwarden/common/vault/models/view/folder.view";
import {
CipherTypeFilter,
diff --git a/apps/web/src/app/vault/individual-vault/vault-filter/services/vault-filter.service.ts b/apps/web/src/app/vault/individual-vault/vault-filter/services/vault-filter.service.ts
index 9b24f95e2ea..03dfa92d0b5 100644
--- a/apps/web/src/app/vault/individual-vault/vault-filter/services/vault-filter.service.ts
+++ b/apps/web/src/app/vault/individual-vault/vault-filter/services/vault-filter.service.ts
@@ -274,6 +274,7 @@ export class VaultFilterService implements VaultFilterServiceAbstraction {
folderCopy.id = f.id;
folderCopy.revisionDate = f.revisionDate;
folderCopy.icon = "bwi-folder";
+ folderCopy.fullName = f.name; // save full folder name before separating it into parts
const parts = f.name != null ? f.name.replace(/^\/+|\/+$/g, "").split(NestingDelimiter) : [];
ServiceUtils.nestedTraverse(nodes, 0, parts, folderCopy, null, NestingDelimiter);
});
diff --git a/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/vault-filter.type.ts b/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/vault-filter.type.ts
index 10888aea13e..9259dd08114 100644
--- a/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/vault-filter.type.ts
+++ b/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/vault-filter.type.ts
@@ -1,10 +1,8 @@
import { CollectionAdminView } from "@bitwarden/admin-console/common";
import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
-import { FolderView } from "@bitwarden/common/src/vault/models/view/folder.view";
import { CipherType } from "@bitwarden/common/vault/enums";
import { ITreeNodeObject } from "@bitwarden/common/vault/models/domain/tree-node";
+import { FolderView } from "@bitwarden/common/vault/models/view/folder.view";
export type CipherStatus = "all" | "favorites" | "trash" | CipherType;
@@ -12,5 +10,13 @@ export type CipherTypeFilter = ITreeNodeObject & { type: CipherStatus; icon: str
export type CollectionFilter = CollectionAdminView & {
icon: string;
};
-export type FolderFilter = FolderView & { icon: string };
+export type FolderFilter = FolderView & {
+ icon: string;
+ /**
+ * Full folder name.
+ *
+ * Used for when the folder `name` property is be separated into parts.
+ */
+ fullName?: string;
+};
export type OrganizationFilter = Organization & { icon: string; hideOptions?: boolean };
diff --git a/apps/web/src/app/vault/individual-vault/vault.component.ts b/apps/web/src/app/vault/individual-vault/vault.component.ts
index 7215c980206..950c1d77731 100644
--- a/apps/web/src/app/vault/individual-vault/vault.component.ts
+++ b/apps/web/src/app/vault/individual-vault/vault.component.ts
@@ -77,6 +77,8 @@ import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
import { ServiceUtils } from "@bitwarden/common/vault/service-utils";
import { DialogService, Icons, ToastService } from "@bitwarden/components";
import {
+ AddEditFolderDialogComponent,
+ AddEditFolderDialogResult,
CipherFormConfig,
CollectionAssignmentResult,
DecryptionFailureDialogComponent,
@@ -118,7 +120,6 @@ import {
BulkMoveDialogResult,
openBulkMoveDialog,
} from "./bulk-action-dialogs/bulk-move-dialog/bulk-move-dialog.component";
-import { FolderAddEditDialogResult, openFolderAddEditDialog } from "./folder-add-edit.component";
import { VaultBannersComponent } from "./vault-banners/vault-banners.component";
import { VaultFilterComponent } from "./vault-filter/components/vault-filter.component";
import { VaultFilterService } from "./vault-filter/services/abstractions/vault-filter.service";
@@ -607,20 +608,24 @@ export class VaultComponent implements OnInit, OnDestroy {
await this.filterComponent.filters?.organizationFilter?.action(orgNode);
}
- addFolder = async (): Promise => {
- openFolderAddEditDialog(this.dialogService);
+ addFolder = (): void => {
+ AddEditFolderDialogComponent.open(this.dialogService);
};
editFolder = async (folder: FolderFilter): Promise => {
- const dialog = openFolderAddEditDialog(this.dialogService, {
- data: {
- folderId: folder.id,
+ const dialogRef = AddEditFolderDialogComponent.open(this.dialogService, {
+ editFolderConfig: {
+ // Shallow copy is used so the original folder object is not modified
+ folder: {
+ ...folder,
+ name: folder.fullName ?? folder.name, // If the filter has a fullName populated, use that as the editable name
+ },
},
});
- const result = await lastValueFrom(dialog.closed);
+ const result = await lastValueFrom(dialogRef.closed);
- if (result === FolderAddEditDialogResult.Deleted) {
+ if (result === AddEditFolderDialogResult.Deleted) {
await this.router.navigate([], {
queryParams: { folderId: null },
queryParamsHandling: "merge",
diff --git a/apps/web/src/app/vault/individual-vault/view.component.ts b/apps/web/src/app/vault/individual-vault/view.component.ts
index 9aa92f3995c..9b6d15c581d 100644
--- a/apps/web/src/app/vault/individual-vault/view.component.ts
+++ b/apps/web/src/app/vault/individual-vault/view.component.ts
@@ -15,6 +15,7 @@ import { LogService } from "@bitwarden/common/platform/abstractions/log.service"
import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
import { CollectionId } from "@bitwarden/common/types/guid";
import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
+import { PremiumUpgradePromptService } from "@bitwarden/common/vault/abstractions/premium-upgrade-prompt.service";
import { ViewPasswordHistoryService } from "@bitwarden/common/vault/abstractions/view-password-history.service";
import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
@@ -25,13 +26,8 @@ import {
DialogService,
ToastService,
} from "@bitwarden/components";
+import { CipherViewComponent } from "@bitwarden/vault";
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
-import { PremiumUpgradePromptService } from "../../../../../../libs/common/src/vault/abstractions/premium-upgrade-prompt.service";
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
-import { CipherViewComponent } from "../../../../../../libs/vault/src/cipher-view/cipher-view.component";
import { SharedModule } from "../../shared/shared.module";
import { WebVaultPremiumUpgradePromptService } from "../services/web-premium-upgrade-prompt.service";
import { WebViewPasswordHistoryService } from "../services/web-view-password-history.service";
diff --git a/apps/web/src/app/vault/org-vault/services/admin-console-cipher-form-config.service.spec.ts b/apps/web/src/app/vault/org-vault/services/admin-console-cipher-form-config.service.spec.ts
index d10f83fd42b..5ccddeee4bb 100644
--- a/apps/web/src/app/vault/org-vault/services/admin-console-cipher-form-config.service.spec.ts
+++ b/apps/web/src/app/vault/org-vault/services/admin-console-cipher-form-config.service.spec.ts
@@ -7,13 +7,10 @@ import { OrganizationService } from "@bitwarden/common/admin-console/abstraction
import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
import { OrganizationUserStatusType } 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 { CipherId } from "@bitwarden/common/types/guid";
+import { Account, AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { CipherId, UserId } from "@bitwarden/common/types/guid";
import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
-import { Account } from "../../../../../../../libs/importer/src/importers/lastpass/access/models";
import { RoutedVaultFilterService } from "../../individual-vault/vault-filter/services/routed-vault-filter.service";
import { AdminConsoleCipherFormConfigService } from "./admin-console-cipher-form-config.service";
@@ -85,7 +82,14 @@ describe("AdminConsoleCipherFormConfigService", () => {
{ provide: CipherService, useValue: { get: getCipher } },
{
provide: AccountService,
- useValue: { activeAccount$: new BehaviorSubject(new Account()) },
+ useValue: {
+ activeAccount$: new BehaviorSubject({
+ id: "123-456-789" as UserId,
+ email: "test@email.com",
+ emailVerified: true,
+ name: "Test User",
+ }),
+ },
},
],
});
diff --git a/apps/web/src/app/vault/org-vault/services/admin-console-cipher-form-config.service.ts b/apps/web/src/app/vault/org-vault/services/admin-console-cipher-form-config.service.ts
index 348037fdbea..32e75644d09 100644
--- a/apps/web/src/app/vault/org-vault/services/admin-console-cipher-form-config.service.ts
+++ b/apps/web/src/app/vault/org-vault/services/admin-console-cipher-form-config.service.ts
@@ -15,14 +15,8 @@ import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.servi
import { CipherType } from "@bitwarden/common/vault/enums";
import { CipherData } from "@bitwarden/common/vault/models/data/cipher.data";
import { Cipher } from "@bitwarden/common/vault/models/domain/cipher";
+import { CipherFormConfig, CipherFormConfigService, CipherFormMode } from "@bitwarden/vault";
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
-import {
- CipherFormConfig,
- CipherFormConfigService,
- CipherFormMode,
-} from "../../../../../../../libs/vault/src/cipher-form/abstractions/cipher-form-config.service";
import { RoutedVaultFilterService } from "../../individual-vault/vault-filter/services/routed-vault-filter.service";
/** Admin Console implementation of the `CipherFormConfigService`. */
diff --git a/apps/web/src/app/vault/services/web-view-password-history.service.ts b/apps/web/src/app/vault/services/web-view-password-history.service.ts
index 728a3b7e245..b1451b268de 100644
--- a/apps/web/src/app/vault/services/web-view-password-history.service.ts
+++ b/apps/web/src/app/vault/services/web-view-password-history.service.ts
@@ -1,11 +1,9 @@
import { Injectable } from "@angular/core";
+import { ViewPasswordHistoryService } from "@bitwarden/common/vault/abstractions/view-password-history.service";
import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
import { DialogService } from "@bitwarden/components";
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
-import { ViewPasswordHistoryService } from "../../../../../../libs/common/src/vault/abstractions/view-password-history.service";
import { openPasswordHistoryDialog } from "../individual-vault/password-history.component";
/**
diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json
index c6e8b492c1c..ef199163239 100644
--- a/apps/web/src/locales/en/messages.json
+++ b/apps/web/src/locales/en/messages.json
@@ -485,6 +485,18 @@
"editFolder": {
"message": "Edit folder"
},
+ "newFolder": {
+ "message": "New folder"
+ },
+ "folderName": {
+ "message": "Folder name"
+ },
+ "folderHintText": {
+ "message": "Nest a folder by adding the parent folder's name followed by a “/”. Example: Social/Forums"
+ },
+ "deleteFolderPermanently": {
+ "message": "Are you sure you want to permanently delete this folder?"
+ },
"baseDomain": {
"message": "Base domain",
"description": "Domain name. Example: website.com"
@@ -749,15 +761,6 @@
"itemName": {
"message": "Item name"
},
- "cannotRemoveViewOnlyCollections": {
- "message": "You cannot remove collections with View only permissions: $COLLECTIONS$",
- "placeholders": {
- "collections": {
- "content": "$1",
- "example": "Work, Personal"
- }
- }
- },
"ex": {
"message": "ex.",
"description": "Short abbreviation for 'example'."
@@ -10143,6 +10146,15 @@
"descriptorCode": {
"message": "Descriptor code"
},
+ "cannotRemoveViewOnlyCollections": {
+ "message": "You cannot remove collections with View only permissions: $COLLECTIONS$",
+ "placeholders": {
+ "collections": {
+ "content": "$1",
+ "example": "Work, Personal"
+ }
+ }
+ },
"importantNotice": {
"message": "Important notice"
},
@@ -10333,5 +10345,45 @@
"example": "Acme c"
}
}
+ },
+ "seatsRemaining": {
+ "message": "You have $REMAINING$ seats remaining out of $TOTAL$ seats assigned to this organization. Contact your provider to manage your subscription.",
+ "placeholders": {
+ "remaining": {
+ "content": "$1",
+ "example": "5"
+ },
+ "total": {
+ "content": "$2",
+ "example": "10"
+ }
+ }
+ },
+ "existingOrganization": {
+ "message": "Existing organization"
+ },
+ "selectOrganizationProviderPortal": {
+ "message": "Select an organization to add to your Provider Portal."
+ },
+ "noOrganizations": {
+ "message": "There are no organizations to list"
+ },
+ "yourProviderSubscriptionCredit": {
+ "message": "Your provider subscription will receive a credit for any remaining time in the organization's subscription."
+ },
+ "doYouWantToAddThisOrg": {
+ "message": "Do you want to add this organization to $PROVIDER$?",
+ "placeholders": {
+ "provider": {
+ "content": "$1",
+ "example": "Cool MSP"
+ }
+ }
+ },
+ "addedExistingOrganization": {
+ "message": "Added existing organization"
+ },
+ "assignedExceedsAvailable": {
+ "message": "Assigned seats exceed available seats."
}
}
diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/providers.module.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/providers.module.ts
index 37cb9618b60..3310be7ba36 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/providers/providers.module.ts
+++ b/bitwarden_license/bit-web/src/app/admin-console/providers/providers.module.ts
@@ -17,6 +17,7 @@ import {
ProviderSubscriptionComponent,
ProviderSubscriptionStatusComponent,
} from "../../billing/providers";
+import { AddExistingOrganizationDialogComponent } from "../../billing/providers/clients/add-existing-organization-dialog.component";
import { AddOrganizationComponent } from "./clients/add-organization.component";
import { CreateOrganizationComponent } from "./clients/create-organization.component";
@@ -63,6 +64,7 @@ import { VerifyRecoverDeleteProviderComponent } from "./verify-recover-delete-pr
SetupProviderComponent,
UserAddEditComponent,
AddEditMemberDialogComponent,
+ AddExistingOrganizationDialogComponent,
CreateClientDialogComponent,
ManageClientNameDialogComponent,
ManageClientSubscriptionDialogComponent,
diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/services/web-provider.service.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/services/web-provider.service.ts
index 264b43aee9d..6b9765e9e05 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/providers/services/web-provider.service.ts
+++ b/bitwarden_license/bit-web/src/app/admin-console/providers/services/web-provider.service.ts
@@ -1,8 +1,11 @@
// FIXME: Update this file to be type safe and remove this and next line
// @ts-strict-ignore
import { Injectable } from "@angular/core";
+import { firstValueFrom, map } from "rxjs";
+import { switchMap } from "rxjs/operators";
import { ApiService } from "@bitwarden/common/abstractions/api.service";
+import { ProviderApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/provider/provider-api.service.abstraction";
import { OrganizationKeysRequest } from "@bitwarden/common/admin-console/models/request/organization-keys.request";
import { ProviderAddOrganizationRequest } from "@bitwarden/common/admin-console/models/request/provider/provider-add-organization.request";
import { BillingApiServiceAbstraction } from "@bitwarden/common/billing/abstractions/billing-api.service.abstraction";
@@ -10,6 +13,8 @@ import { PlanType } from "@bitwarden/common/billing/enums";
import { CreateClientOrganizationRequest } from "@bitwarden/common/billing/models/request/create-client-organization.request";
import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { StateProvider } from "@bitwarden/common/platform/state";
+import { OrganizationId } from "@bitwarden/common/types/guid";
import { OrgKey } from "@bitwarden/common/types/key";
import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
import { KeyService } from "@bitwarden/key-management";
@@ -23,6 +28,8 @@ export class WebProviderService {
private i18nService: I18nService,
private encryptService: EncryptService,
private billingApiService: BillingApiServiceAbstraction,
+ private stateProvider: StateProvider,
+ private providerApiService: ProviderApiServiceAbstraction,
) {}
async addOrganizationToProvider(providerId: string, organizationId: string) {
@@ -40,6 +47,22 @@ export class WebProviderService {
return response;
}
+ async addOrganizationToProviderVNext(providerId: string, organizationId: string): Promise {
+ const orgKey = await firstValueFrom(
+ this.stateProvider.activeUserId$.pipe(
+ switchMap((userId) => this.keyService.orgKeys$(userId)),
+ map((organizationKeysById) => organizationKeysById[organizationId as OrganizationId]),
+ ),
+ );
+ const providerKey = await this.keyService.getProviderKey(providerId);
+ const encryptedOrgKey = await this.encryptService.encrypt(orgKey.key, providerKey);
+ await this.providerApiService.addOrganizationToProvider(providerId, {
+ key: encryptedOrgKey.encryptedString,
+ organizationId,
+ });
+ await this.syncService.fullSync(true);
+ }
+
async createClientOrganization(
providerId: string,
name: string,
diff --git a/bitwarden_license/bit-web/src/app/billing/providers/clients/add-existing-organization-dialog.component.html b/bitwarden_license/bit-web/src/app/billing/providers/clients/add-existing-organization-dialog.component.html
new file mode 100644
index 00000000000..a22484ed92d
--- /dev/null
+++ b/bitwarden_license/bit-web/src/app/billing/providers/clients/add-existing-organization-dialog.component.html
@@ -0,0 +1,73 @@
+
+
+ {{ "addExistingOrganization" | i18n }}
+
+
+
+ {{ "selectOrganizationProviderPortal" | i18n }}
+
+
+
+ {{ "name" | i18n }}
+ {{ "assigned" | i18n }}
+
+
+
+
+
+
+
+ {{ addable.name }}
+
+ {{ "assignedExceedsAvailable" | i18n }}
+
+
+ {{ addable.seats }}
+
+
+
+
+
+
+
+ {{ "noOrganizations" | i18n }}
+
+
+
+ {{ "yourProviderSubscriptionCredit" | i18n }}
+ {{ "doYouWantToAddThisOrg" | i18n: dialogParams.provider.name }}
+
+ {{ "organization" | i18n }}: {{ selectedOrganization.name }}
+ {{ "billingPlan" | i18n }}: {{ selectedOrganization.plan }}
+ {{ "assignedSeats" | i18n }}: {{ selectedOrganization.seats }}
+
+
+
+
+
+
+
+
diff --git a/bitwarden_license/bit-web/src/app/billing/providers/clients/add-existing-organization-dialog.component.ts b/bitwarden_license/bit-web/src/app/billing/providers/clients/add-existing-organization-dialog.component.ts
new file mode 100644
index 00000000000..3df0693d091
--- /dev/null
+++ b/bitwarden_license/bit-web/src/app/billing/providers/clients/add-existing-organization-dialog.component.ts
@@ -0,0 +1,82 @@
+import { DIALOG_DATA, DialogConfig, DialogRef } from "@angular/cdk/dialog";
+import { Component, Inject, OnInit } from "@angular/core";
+
+import { ProviderApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/provider/provider-api.service.abstraction";
+import { Provider } from "@bitwarden/common/admin-console/models/domain/provider";
+import { AddableOrganizationResponse } from "@bitwarden/common/admin-console/models/response/addable-organization.response";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { DialogService, ToastService } from "@bitwarden/components";
+
+import { WebProviderService } from "../../../admin-console/providers/services/web-provider.service";
+
+export type AddExistingOrganizationDialogParams = {
+ provider: Provider;
+};
+
+export enum AddExistingOrganizationDialogResultType {
+ Closed = "closed",
+ Submitted = "submitted",
+}
+
+@Component({
+ templateUrl: "./add-existing-organization-dialog.component.html",
+})
+export class AddExistingOrganizationDialogComponent implements OnInit {
+ protected loading: boolean = true;
+
+ addableOrganizations: AddableOrganizationResponse[] = [];
+ selectedOrganization?: AddableOrganizationResponse;
+
+ protected readonly ResultType = AddExistingOrganizationDialogResultType;
+
+ constructor(
+ @Inject(DIALOG_DATA) protected dialogParams: AddExistingOrganizationDialogParams,
+ private dialogRef: DialogRef,
+ private i18nService: I18nService,
+ private providerApiService: ProviderApiServiceAbstraction,
+ private toastService: ToastService,
+ private webProviderService: WebProviderService,
+ ) {}
+
+ async ngOnInit() {
+ this.addableOrganizations = await this.providerApiService.getProviderAddableOrganizations(
+ this.dialogParams.provider.id,
+ );
+ this.loading = false;
+ }
+
+ addExistingOrganization = async (): Promise => {
+ if (this.selectedOrganization) {
+ await this.webProviderService.addOrganizationToProviderVNext(
+ this.dialogParams.provider.id,
+ this.selectedOrganization.id,
+ );
+
+ this.toastService.showToast({
+ variant: "success",
+ title: "",
+ message: this.i18nService.t("addedExistingOrganization"),
+ });
+
+ this.dialogRef.close(this.ResultType.Submitted);
+ }
+ };
+
+ selectOrganization(organizationId: string) {
+ this.selectedOrganization = this.addableOrganizations.find(
+ (organization) => organization.id === organizationId,
+ );
+ }
+
+ static open = (
+ dialogService: DialogService,
+ dialogConfig: DialogConfig<
+ AddExistingOrganizationDialogParams,
+ DialogRef
+ >,
+ ) =>
+ dialogService.open<
+ AddExistingOrganizationDialogResultType,
+ AddExistingOrganizationDialogParams
+ >(AddExistingOrganizationDialogComponent, dialogConfig);
+}
diff --git a/bitwarden_license/bit-web/src/app/billing/providers/clients/manage-clients.component.html b/bitwarden_license/bit-web/src/app/billing/providers/clients/manage-clients.component.html
index 7c560e49579..077aeb6c124 100644
--- a/bitwarden_license/bit-web/src/app/billing/providers/clients/manage-clients.component.html
+++ b/bitwarden_license/bit-web/src/app/billing/providers/clients/manage-clients.component.html
@@ -1,9 +1,39 @@
+
+
+
+
+
+
+
+
+
+ {{ "addNewOrganization" | i18n }}
+
+
diff --git a/bitwarden_license/bit-web/src/app/billing/providers/clients/manage-clients.component.ts b/bitwarden_license/bit-web/src/app/billing/providers/clients/manage-clients.component.ts
index ee2c541e72f..07434369122 100644
--- a/bitwarden_license/bit-web/src/app/billing/providers/clients/manage-clients.component.ts
+++ b/bitwarden_license/bit-web/src/app/billing/providers/clients/manage-clients.component.ts
@@ -11,6 +11,8 @@ import { Provider } from "@bitwarden/common/admin-console/models/domain/provider
import { ProviderOrganizationOrganizationDetailsResponse } from "@bitwarden/common/admin-console/models/response/provider/provider-organization.response";
import { BillingApiServiceAbstraction } from "@bitwarden/common/billing/abstractions";
import { PlanResponse } from "@bitwarden/common/billing/models/response/plan.response";
+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 { ValidationService } from "@bitwarden/common/platform/abstractions/validation.service";
import {
@@ -25,6 +27,10 @@ import { HeaderModule } from "@bitwarden/web-vault/app/layouts/header/header.mod
import { WebProviderService } from "../../../admin-console/providers/services/web-provider.service";
+import {
+ AddExistingOrganizationDialogComponent,
+ AddExistingOrganizationDialogResultType,
+} from "./add-existing-organization-dialog.component";
import {
CreateClientDialogResultType,
openCreateClientDialog,
@@ -62,6 +68,9 @@ export class ManageClientsComponent {
protected searchControl = new FormControl("", { nonNullable: true });
protected plans: PlanResponse[] = [];
+ protected addExistingOrgsFromProviderPortal$ = this.configService.getFeatureFlag$(
+ FeatureFlag.PM15179_AddExistingOrgsFromProviderPortal,
+ );
constructor(
private billingApiService: BillingApiServiceAbstraction,
@@ -73,6 +82,7 @@ export class ManageClientsComponent {
private toastService: ToastService,
private validationService: ValidationService,
private webProviderService: WebProviderService,
+ private configService: ConfigService,
) {
this.activatedRoute.queryParams.pipe(first(), takeUntilDestroyed()).subscribe((queryParams) => {
this.searchControl.setValue(queryParams.search);
@@ -111,19 +121,30 @@ export class ManageClientsComponent {
async load() {
this.provider = await firstValueFrom(this.providerService.get$(this.providerId));
-
this.isProviderAdmin = this.provider?.type === ProviderUserType.ProviderAdmin;
-
- const clients = (await this.billingApiService.getProviderClientOrganizations(this.providerId))
- .data;
-
- this.dataSource.data = clients;
-
+ this.dataSource.data = (
+ await this.billingApiService.getProviderClientOrganizations(this.providerId)
+ ).data;
this.plans = (await this.billingApiService.getPlans()).data;
-
this.loading = false;
}
+ addExistingOrganization = async () => {
+ if (this.provider) {
+ const reference = AddExistingOrganizationDialogComponent.open(this.dialogService, {
+ data: {
+ provider: this.provider,
+ },
+ });
+
+ const result = await lastValueFrom(reference.closed);
+
+ if (result === AddExistingOrganizationDialogResultType.Submitted) {
+ await this.load();
+ }
+ }
+ };
+
createClient = async () => {
const reference = openCreateClientDialog(this.dialogService, {
data: {
diff --git a/bitwarden_license/bit-web/src/app/vault/services/abstractions/admin-task.abstraction.ts b/bitwarden_license/bit-web/src/app/vault/services/abstractions/admin-task.abstraction.ts
new file mode 100644
index 00000000000..014c9daa783
--- /dev/null
+++ b/bitwarden_license/bit-web/src/app/vault/services/abstractions/admin-task.abstraction.ts
@@ -0,0 +1,34 @@
+import { CipherId, OrganizationId } from "@bitwarden/common/types/guid";
+import { SecurityTask, SecurityTaskStatus, SecurityTaskType } from "@bitwarden/vault";
+
+/**
+ * Request type for creating tasks.
+ * @property cipherId - Optional. The ID of the cipher to create the task for.
+ * @property type - The type of task to create. Currently defined as "updateAtRiskCredential".
+ */
+export type CreateTasksRequest = Readonly<{
+ cipherId?: CipherId;
+ type: SecurityTaskType.UpdateAtRiskCredential;
+}>;
+
+export abstract class AdminTaskService {
+ /**
+ * Retrieves all tasks for a given organization.
+ * @param organizationId - The ID of the organization to retrieve tasks for.
+ * @param status - Optional. The status of the tasks to retrieve.
+ */
+ abstract getAllTasks(
+ organizationId: OrganizationId,
+ status?: SecurityTaskStatus | undefined,
+ ): Promise;
+
+ /**
+ * Creates multiple tasks for a given organization and sends out notifications to applicable users.
+ * @param organizationId - The ID of the organization to create tasks for.
+ * @param tasks - The tasks to create.
+ */
+ abstract bulkCreateTasks(
+ organizationId: OrganizationId,
+ tasks: CreateTasksRequest[],
+ ): Promise;
+}
diff --git a/bitwarden_license/bit-web/src/app/vault/services/default-admin-task.service.spec.ts b/bitwarden_license/bit-web/src/app/vault/services/default-admin-task.service.spec.ts
new file mode 100644
index 00000000000..d6a686a071a
--- /dev/null
+++ b/bitwarden_license/bit-web/src/app/vault/services/default-admin-task.service.spec.ts
@@ -0,0 +1,65 @@
+import { MockProxy, mock } from "jest-mock-extended";
+
+import { ApiService } from "@bitwarden/common/abstractions/api.service";
+import { CipherId, OrganizationId } from "@bitwarden/common/types/guid";
+import { SecurityTaskStatus, SecurityTaskType } from "@bitwarden/vault";
+
+import { CreateTasksRequest } from "./abstractions/admin-task.abstraction";
+import { DefaultAdminTaskService } from "./default-admin-task.service";
+
+describe("DefaultAdminTaskService", () => {
+ let defaultAdminTaskService: DefaultAdminTaskService;
+ let apiService: MockProxy;
+
+ beforeEach(() => {
+ apiService = mock();
+ defaultAdminTaskService = new DefaultAdminTaskService(apiService);
+ });
+
+ describe("getAllTasks", () => {
+ it("should call the api service with the correct parameters with status", async () => {
+ const organizationId = "orgId" as OrganizationId;
+ const status = SecurityTaskStatus.Pending;
+ const expectedUrl = `/tasks/organization?organizationId=${organizationId}&status=0`;
+
+ await defaultAdminTaskService.getAllTasks(organizationId, status);
+
+ expect(apiService.send).toHaveBeenCalledWith("GET", expectedUrl, null, true, true);
+ });
+
+ it("should call the api service with the correct parameters without status", async () => {
+ const organizationId = "orgId" as OrganizationId;
+ const expectedUrl = `/tasks/organization?organizationId=${organizationId}`;
+
+ await defaultAdminTaskService.getAllTasks(organizationId);
+
+ expect(apiService.send).toHaveBeenCalledWith("GET", expectedUrl, null, true, true);
+ });
+ });
+
+ describe("bulkCreateTasks", () => {
+ it("should call the api service with the correct parameters", async () => {
+ const organizationId = "orgId" as OrganizationId;
+ const tasks: CreateTasksRequest[] = [
+ {
+ cipherId: "cipherId-1" as CipherId,
+ type: SecurityTaskType.UpdateAtRiskCredential,
+ },
+ {
+ cipherId: "cipherId-2" as CipherId,
+ type: SecurityTaskType.UpdateAtRiskCredential,
+ },
+ ];
+
+ await defaultAdminTaskService.bulkCreateTasks(organizationId, tasks);
+
+ expect(apiService.send).toHaveBeenCalledWith(
+ "POST",
+ `/tasks/${organizationId}/bulk-create`,
+ tasks,
+ true,
+ true,
+ );
+ });
+ });
+});
diff --git a/bitwarden_license/bit-web/src/app/vault/services/default-admin-task.service.ts b/bitwarden_license/bit-web/src/app/vault/services/default-admin-task.service.ts
new file mode 100644
index 00000000000..442fde9dbf6
--- /dev/null
+++ b/bitwarden_license/bit-web/src/app/vault/services/default-admin-task.service.ts
@@ -0,0 +1,48 @@
+import { Injectable } from "@angular/core";
+
+import { ApiService } from "@bitwarden/common/abstractions/api.service";
+import { ListResponse } from "@bitwarden/common/models/response/list.response";
+import { OrganizationId } from "@bitwarden/common/types/guid";
+import {
+ SecurityTask,
+ SecurityTaskData,
+ SecurityTaskResponse,
+ SecurityTaskStatus,
+} from "@bitwarden/vault";
+
+import { AdminTaskService, CreateTasksRequest } from "./abstractions/admin-task.abstraction";
+
+@Injectable()
+export class DefaultAdminTaskService implements AdminTaskService {
+ constructor(private apiService: ApiService) {}
+
+ async getAllTasks(
+ organizationId: OrganizationId,
+ status?: SecurityTaskStatus | undefined,
+ ): Promise {
+ const queryParams = new URLSearchParams();
+
+ queryParams.append("organizationId", organizationId);
+ if (status !== undefined) {
+ queryParams.append("status", status.toString());
+ }
+
+ const r = await this.apiService.send(
+ "GET",
+ `/tasks/organization?${queryParams.toString()}`,
+ null,
+ true,
+ true,
+ );
+ const response = new ListResponse(r, SecurityTaskResponse);
+
+ return response.data.map((d) => new SecurityTask(new SecurityTaskData(d)));
+ }
+
+ async bulkCreateTasks(
+ organizationId: OrganizationId,
+ tasks: CreateTasksRequest[],
+ ): Promise {
+ await this.apiService.send("POST", `/tasks/${organizationId}/bulk-create`, tasks, true, true);
+ }
+}
diff --git a/eslint.config.mjs b/eslint.config.mjs
index 514d1ccf0be..2d7c91521f9 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -11,6 +11,8 @@ import rxjs from "eslint-plugin-rxjs";
import angularRxjs from "eslint-plugin-rxjs-angular";
import storybook from "eslint-plugin-storybook";
+import platformPlugins from "./libs/eslint/platform/index.mjs";
+
export default tseslint.config(
...storybook.configs["flat/recommended"],
{
@@ -28,6 +30,7 @@ export default tseslint.config(
plugins: {
rxjs: rxjs,
"rxjs-angular": angularRxjs,
+ "@bitwarden/platform": platformPlugins,
},
languageOptions: {
parserOptions: {
@@ -66,7 +69,7 @@ export default tseslint.config(
"@angular-eslint/no-outputs-metadata-property": 0,
"@angular-eslint/use-lifecycle-interface": "error",
"@angular-eslint/use-pipe-transform-interface": 0,
-
+ "@bitwarden/platform/required-using": "error",
"@typescript-eslint/explicit-member-accessibility": ["error", { accessibility: "no-public" }],
"@typescript-eslint/no-explicit-any": "off", // TODO: This should be re-enabled
"@typescript-eslint/no-floating-promises": "error",
diff --git a/jest.config.js b/jest.config.js
index ccde758dbc9..e8815f92ffb 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -30,6 +30,7 @@ module.exports = {
"/libs/billing/jest.config.js",
"/libs/common/jest.config.js",
"/libs/components/jest.config.js",
+ "/libs/eslint/jest.config.js",
"/libs/tools/export/vault-export/vault-export-core/jest.config.js",
"/libs/tools/generator/core/jest.config.js",
"/libs/tools/generator/components/jest.config.js",
diff --git a/libs/angular/src/auth/components/base-login-decryption-options-v1.component.ts b/libs/angular/src/auth/components/base-login-decryption-options-v1.component.ts
index ca3906cead3..32396c878d9 100644
--- a/libs/angular/src/auth/components/base-login-decryption-options-v1.component.ts
+++ b/libs/angular/src/auth/components/base-login-decryption-options-v1.component.ts
@@ -195,7 +195,7 @@ export class BaseLoginDecryptionOptionsComponentV1 implements OnInit, OnDestroy
async loadNewUserData() {
const autoEnrollStatus$ = defer(() =>
- this.ssoLoginService.getActiveUserOrganizationSsoIdentifier(),
+ this.ssoLoginService.getActiveUserOrganizationSsoIdentifier(this.activeAccountId),
).pipe(
switchMap((organizationIdentifier) => {
if (organizationIdentifier == undefined) {
diff --git a/libs/angular/src/auth/components/set-password.component.ts b/libs/angular/src/auth/components/set-password.component.ts
index 13d1a4f4131..70c103d972e 100644
--- a/libs/angular/src/auth/components/set-password.component.ts
+++ b/libs/angular/src/auth/components/set-password.component.ts
@@ -47,7 +47,7 @@ export class SetPasswordComponent extends BaseChangePasswordComponent implements
resetPasswordAutoEnroll = false;
onSuccessfulChangePassword: () => Promise;
successRoute = "vault";
- userId: UserId;
+ activeUserId: UserId;
forceSetPasswordReason: ForceSetPasswordReason = ForceSetPasswordReason.None;
ForceSetPasswordReason = ForceSetPasswordReason;
@@ -96,10 +96,10 @@ export class SetPasswordComponent extends BaseChangePasswordComponent implements
await this.syncService.fullSync(true);
this.syncLoading = false;
- this.userId = (await firstValueFrom(this.accountService.activeAccount$))?.id;
+ this.activeUserId = (await firstValueFrom(this.accountService.activeAccount$))?.id;
this.forceSetPasswordReason = await firstValueFrom(
- this.masterPasswordService.forceSetPasswordReason$(this.userId),
+ this.masterPasswordService.forceSetPasswordReason$(this.activeUserId),
);
this.route.queryParams
@@ -111,7 +111,7 @@ export class SetPasswordComponent extends BaseChangePasswordComponent implements
} else {
// Try to get orgSsoId from state as fallback
// Note: this is primarily for the TDE user w/out MP obtains admin MP reset permission scenario.
- return this.ssoLoginService.getActiveUserOrganizationSsoIdentifier();
+ return this.ssoLoginService.getActiveUserOrganizationSsoIdentifier(this.activeUserId);
}
}),
filter((orgSsoId) => orgSsoId != null),
@@ -167,10 +167,10 @@ export class SetPasswordComponent extends BaseChangePasswordComponent implements
// in case we have a local private key, and are not sure whether it has been posted to the server, we post the local private key instead of generating a new one
const existingUserPrivateKey = (await firstValueFrom(
- this.keyService.userPrivateKey$(this.userId),
+ this.keyService.userPrivateKey$(this.activeUserId),
)) as Uint8Array;
const existingUserPublicKey = await firstValueFrom(
- this.keyService.userPublicKey$(this.userId),
+ this.keyService.userPublicKey$(this.activeUserId),
);
if (existingUserPrivateKey != null && existingUserPublicKey != null) {
const existingUserPublicKeyB64 = Utils.fromBufferToB64(existingUserPublicKey);
@@ -217,7 +217,7 @@ export class SetPasswordComponent extends BaseChangePasswordComponent implements
return this.organizationUserApiService.putOrganizationUserResetPasswordEnrollment(
this.orgId,
- this.userId,
+ this.activeUserId,
resetRequest,
);
});
@@ -260,7 +260,7 @@ export class SetPasswordComponent extends BaseChangePasswordComponent implements
// Clear force set password reason to allow navigation back to vault.
await this.masterPasswordService.setForceSetPasswordReason(
ForceSetPasswordReason.None,
- this.userId,
+ this.activeUserId,
);
// User now has a password so update account decryption options in state
@@ -269,9 +269,9 @@ export class SetPasswordComponent extends BaseChangePasswordComponent implements
);
userDecryptionOpts.hasMasterPassword = true;
await this.userDecryptionOptionsService.setUserDecryptionOptions(userDecryptionOpts);
- await this.kdfConfigService.setKdfConfig(this.userId, this.kdfConfig);
- await this.masterPasswordService.setMasterKey(masterKey, this.userId);
- await this.keyService.setUserKey(userKey[0], this.userId);
+ await this.kdfConfigService.setKdfConfig(this.activeUserId, this.kdfConfig);
+ await this.masterPasswordService.setMasterKey(masterKey, this.activeUserId);
+ await this.keyService.setUserKey(userKey[0], this.activeUserId);
// Set private key only for new JIT provisioned users in MP encryption orgs
// Existing TDE users will have private key set on sync or on login
@@ -280,7 +280,7 @@ export class SetPasswordComponent extends BaseChangePasswordComponent implements
this.forceSetPasswordReason !=
ForceSetPasswordReason.TdeUserWithoutPasswordHasPasswordResetPermission
) {
- await this.keyService.setPrivateKey(keyPair[1].encryptedString, this.userId);
+ await this.keyService.setPrivateKey(keyPair[1].encryptedString, this.activeUserId);
}
const localMasterKeyHash = await this.keyService.hashMasterKey(
@@ -288,6 +288,6 @@ export class SetPasswordComponent extends BaseChangePasswordComponent implements
masterKey,
HashPurpose.LocalAuthorization,
);
- await this.masterPasswordService.setMasterKeyHash(localMasterKeyHash, this.userId);
+ await this.masterPasswordService.setMasterKeyHash(localMasterKeyHash, this.activeUserId);
}
}
diff --git a/libs/angular/src/auth/components/sso.component.ts b/libs/angular/src/auth/components/sso.component.ts
index 6c13809566a..d0fc2140f06 100644
--- a/libs/angular/src/auth/components/sso.component.ts
+++ b/libs/angular/src/auth/components/sso.component.ts
@@ -1,6 +1,7 @@
// FIXME: Update this file to be type safe and remove this and next line
// @ts-strict-ignore
import { Directive, OnInit } from "@angular/core";
+import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
import { ActivatedRoute, NavigationExtras, Router } from "@angular/router";
import { firstValueFrom } from "rxjs";
import { first } from "rxjs/operators";
@@ -27,6 +28,7 @@ import { LogService } from "@bitwarden/common/platform/abstractions/log.service"
import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
import { Utils } from "@bitwarden/common/platform/misc/utils";
+import { UserId } from "@bitwarden/common/types/guid";
import { ToastService } from "@bitwarden/components";
import { PasswordGenerationServiceAbstraction } from "@bitwarden/generator-legacy";
@@ -55,6 +57,7 @@ export class SsoComponent implements OnInit {
protected redirectUri: string;
protected state: string;
protected codeChallenge: string;
+ protected activeUserId: UserId;
constructor(
protected ssoLoginService: SsoLoginServiceAbstraction,
@@ -74,7 +77,11 @@ export class SsoComponent implements OnInit {
protected masterPasswordService: InternalMasterPasswordServiceAbstraction,
protected accountService: AccountService,
protected toastService: ToastService,
- ) {}
+ ) {
+ this.accountService.activeAccount$.pipe(takeUntilDestroyed()).subscribe((account) => {
+ this.activeUserId = account?.id;
+ });
+ }
async ngOnInit() {
// eslint-disable-next-line rxjs/no-async-subscribe
@@ -226,7 +233,10 @@ export class SsoComponent implements OnInit {
// - TDE login decryption options component
// - Browser SSO on extension open
// Note: you cannot set this in state before 2FA b/c there won't be an account in state.
- await this.ssoLoginService.setActiveUserOrganizationSsoIdentifier(orgSsoIdentifier);
+ await this.ssoLoginService.setActiveUserOrganizationSsoIdentifier(
+ orgSsoIdentifier,
+ this.activeUserId,
+ );
// Users enrolled in admin acct recovery can be forced to set a new password after
// having the admin set a temp password for them (affects TDE & standard users)
diff --git a/libs/angular/src/auth/components/two-factor-auth/two-factor-auth.component.html b/libs/angular/src/auth/components/two-factor-auth/two-factor-auth.component.html
index 8462a18ac2e..087ecd2764e 100644
--- a/libs/angular/src/auth/components/two-factor-auth/two-factor-auth.component.html
+++ b/libs/angular/src/auth/components/two-factor-auth/two-factor-auth.component.html
@@ -69,7 +69,7 @@
{{ "createAccount" | i18n }}
-
-
- - {{ freeTrialText }} -
-{{ "selectOrganizationProviderPortal" | i18n }}
++ {{ "noOrganizations" | i18n }} +
+{{ "yourProviderSubscriptionCredit" | i18n }}
+{{ "doYouWantToAddThisOrg" | i18n: dialogParams.provider.name }}
++
diff --git a/libs/common/src/admin-console/abstractions/provider/provider-api.service.abstraction.ts b/libs/common/src/admin-console/abstractions/provider/provider-api.service.abstraction.ts
index f348e7487de..ffe79f0ad3b 100644
--- a/libs/common/src/admin-console/abstractions/provider/provider-api.service.abstraction.ts
+++ b/libs/common/src/admin-console/abstractions/provider/provider-api.service.abstraction.ts
@@ -1,5 +1,7 @@
// FIXME: Update this file to be type safe and remove this and next line
// @ts-strict-ignore
+import { AddableOrganizationResponse } from "@bitwarden/common/admin-console/models/response/addable-organization.response";
+
import { ProviderSetupRequest } from "../../models/request/provider/provider-setup.request";
import { ProviderUpdateRequest } from "../../models/request/provider/provider-update.request";
import { ProviderVerifyRecoverDeleteRequest } from "../../models/request/provider/provider-verify-recover-delete.request";
@@ -14,4 +16,12 @@ export class ProviderApiServiceAbstraction {
request: ProviderVerifyRecoverDeleteRequest,
) => Promise`,
+ template: `@if (src) {
+
+ }`,
standalone: true,
- imports: [NgIf, NgClass],
+ imports: [NgClass],
})
export class AvatarComponent implements OnChanges {
@Input() border = false;
diff --git a/libs/components/src/badge-list/badge-list.component.html b/libs/components/src/badge-list/badge-list.component.html
index ebd63117d03..c8aa7b84680 100644
--- a/libs/components/src/badge-list/badge-list.component.html
+++ b/libs/components/src/badge-list/badge-list.component.html
@@ -1,11 +1,15 @@