bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-23 03:33:54 +00:00
Code Issues Releases Wiki Activity

[PM-26356] Remove client-side pre-consolidated billing code (#16707)

Browse Source 
* Remove legacy provider files

* Removing index files to make file re-org easier

* Move manage-clients.component and associated API invocation to AC

* Move add-existing-organization-dialog.component to AC

* Move manage-client-name-dialog.component and associated API call to AC

* Move misc clients files to AC

* Move create-client-dialog.component and associated API call to AC

* Move manage-client-subscription-dialog.component to AC

* Update provider-layout.component

* Cleanup

* Fix linting
This commit is contained in:
Alex Morask
2025-10-21 14:15:29 -05:00
committed by GitHub
parent 8beb1c6ab0
commit 5b2682ff21
41 changed files with 169 additions and 686 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
bitwarden_license/bit-web/src/app/billing/providers/clients/add-existing-organization-dialog.component.html → bitwarden_license/bit-web/src/app/admin-console/providers/clients/add-existing-organization-dialog.component.html
View File

4
bitwarden_license/bit-web/src/app/billing/providers/clients/add-existing-organization-dialog.component.ts → bitwarden_license/bit-web/src/app/admin-console/providers/clients/add-existing-organization-dialog.component.ts
View File

@@ -12,7 +12,7 @@ import {
ToastService,
} from "@bitwarden/components";
import { WebProviderService } from "../../../admin-console/providers/services/web-provider.service";
import { WebProviderService } from "../services/web-provider.service";
export type AddExistingOrganizationDialogParams = {
provider: Provider;
@@ -55,7 +55,7 @@ export class AddExistingOrganizationDialogComponent implements OnInit {
addExistingOrganization = async (): Promise<void> => {
if (this.selectedOrganization) {
await this.webProviderService.addOrganizationToProviderVNext(
await this.webProviderService.addOrganizationToProvider(
this.dialogParams.provider.id,
this.selectedOrganization.id,
);

32
bitwarden_license/bit-web/src/app/admin-console/providers/clients/add-organization.component.html
View File

@@ -1,32 +0,0 @@
<bit-dialog [loading]="loading">
<span bitDialogTitle>{{ "addExistingOrganization" | i18n }}</span>
<ng-container bitDialogContent>
<bit-table>
<ng-template body>
<tr bitRow *ngFor="let o of data.organizations">
<td bitCell width="30">
<bit-avatar [text]="o.name" [id]="o.id" size="small"></bit-avatar>
</td>
<td bitCell>
{{ o.name }}
</td>
<td bitCell>
<button
type="button"
bitButton
[bitAction]="add(o, provider$ | async)"
class="tw-float-right"
>
Add
</button>
</td>
</tr>
</ng-template>
</bit-table>
</ng-container>
<ng-container bitDialogFooter>
<button type="button" bitButton bitDialogClose>
{{ "close" | i18n }}
</button>
</ng-container>
</bit-dialog>

101
bitwarden_license/bit-web/src/app/admin-console/providers/clients/add-organization.component.ts
View File

@@ -1,101 +0,0 @@
// FIXME: Update this file to be type safe and remove this and next line
// @ts-strict-ignore
import { Component, Inject, OnInit } from "@angular/core";
import { Observable, switchMap } from "rxjs";
import { ProviderService } from "@bitwarden/common/admin-console/abstractions/provider.service";
import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
import { Provider } from "@bitwarden/common/admin-console/models/domain/provider";
import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
import { getUserId } from "@bitwarden/common/auth/services/account.service";
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
import { ValidationService } from "@bitwarden/common/platform/abstractions/validation.service";
import { DIALOG_DATA, DialogRef, DialogService, ToastService } from "@bitwarden/components";
import { WebProviderService } from "../services/web-provider.service";
interface AddOrganizationDialogData {
providerId: string;
organizations: Organization[];
}
@Component({
templateUrl: "add-organization.component.html",
standalone: false,
})
export class AddOrganizationComponent implements OnInit {
protected provider$: Observable<Provider>;
protected loading = true;
constructor(
private dialogRef: DialogRef,
@Inject(DIALOG_DATA) protected data: AddOrganizationDialogData,
private providerService: ProviderService,
private webProviderService: WebProviderService,
private i18nService: I18nService,
private platformUtilsService: PlatformUtilsService,
private validationService: ValidationService,
private dialogService: DialogService,
private toastService: ToastService,
private accountService: AccountService,
) {}
async ngOnInit() {
await this.load();
}
async load() {
if (this.data.providerId == null) {
return;
}
this.provider$ = this.accountService.activeAccount$.pipe(
getUserId,
switchMap((userId) => this.providerService.get$(this.data.providerId, userId)),
);
this.loading = false;
}
add(organization: Organization, provider: Provider) {
return async () => {
const confirmed = await this.dialogService.openSimpleDialog({
title: organization.name,
content: {
key: "addOrganizationConfirmation",
placeholders: [organization.name, provider.name],
},
type: "warning",
});
if (!confirmed) {
return false;
}
try {
await this.webProviderService.addOrganizationToProvider(
this.data.providerId,
organization.id,
);
} catch (e) {
this.validationService.showError(e);
return;
}
this.toastService.showToast({
variant: "success",
title: null,
message: this.i18nService.t("organizationJoinedProvider"),
});
this.dialogRef.close(true);
};
}
static open(dialogService: DialogService, data: AddOrganizationDialogData) {
return dialogService.open<boolean, AddOrganizationDialogData>(AddOrganizationComponent, {
data,
});
}
}

78
bitwarden_license/bit-web/src/app/admin-console/providers/clients/clients.component.html
View File

@@ -1,78 +0,0 @@
@let isAdminOrServiceUser = isAdminOrServiceUser$ | async;
<app-header>
<bit-search
class="tw-grow"
[formControl]="searchControl"
[placeholder]="'search' | i18n"
></bit-search>
<a bitButton routerLink="create" *ngIf="isAdminOrServiceUser" buttonType="primary">
<i class="bwi bwi-plus bwi-fw" aria-hidden="true"></i>
{{ "newClient" | i18n }}
</a>
<button
type="button"
bitButton
(click)="addExistingOrganization()"
*ngIf="isAdminOrServiceUser && showAddExisting"
>
<i class="bwi bwi-plus bwi-fw" aria-hidden="true"></i>
{{ "addExistingOrganization" | i18n }}
</button>
</app-header>
<ng-container *ngIf="loading">
<i
class="bwi bwi-spinner bwi-spin tw-text-muted"
title="{{ 'loading' | i18n }}"
aria-hidden="true"
></i>
<span class="tw-sr-only">{{ "loading" | i18n }}</span>
</ng-container>
<ng-container *ngIf="!loading">
<p *ngIf="dataSource.data.length < 1">{{ "noClientsInList" | i18n }}</p>
<ng-container *ngIf="dataSource.data.length >= 1">
<bit-table-scroll [dataSource]="dataSource" [rowSize]="53" class="tw-table tw-w-full">
<ng-container header>
<th bitCell colspan="2" bitSortable="organizationName">{{ "name" | i18n }}</th>
<th bitCell bitSortable="seats">{{ "numberOfUsers" | i18n }}</th>
<th bitCell bitSortable="plan">{{ "billingPlan" | i18n }}</th>
</ng-container>
<ng-template bitRowDef let-row>
<td bitCell width="30">
<bit-avatar [text]="row.organizationName" [id]="row.id" size="small"></bit-avatar>
</td>
<td bitCell width="320">
<a [routerLink]="['/organizations', row.organizationId]">{{ row.organizationName }}</a>
</td>
<td bitCell width="700">
<span>{{ row.userCount }}</span>
<span *ngIf="row.seats != null"> / {{ row.seats }}</span>
</td>
<td bitCell width="250" class="tw-flex tw-flex-row tw-items-center">
<span>{{ row.plan }}</span>
<div appListDropdown>
<button
*ngIf="isAdminOrServiceUser"
[bitMenuTriggerFor]="removeMenu"
bitMenuItem
buttonType="secondary"
type="button"
appA11yTitle="{{ 'options' | i18n }}"
>
<i class="bwi bwi-cog bwi-lg" aria-hidden="true"></i>
</button>
<bit-menu #removeMenu>
<button bitMenuItem type="button" appStopClick (click)="remove(row)">
<span class="tw-text-danger">
<i class="bwi bwi-fw bwi-close" aria-hidden="true"></i>
{{ "remove" | i18n }}
</span>
</button>
</bit-menu>
</div>
</td>
</ng-template>
</bit-table-scroll>
</ng-container>
</ng-container>

179
bitwarden_license/bit-web/src/app/admin-console/providers/clients/clients.component.ts
View File

@@ -1,179 +0,0 @@
import { CommonModule } from "@angular/common";
import { Component } from "@angular/core";
import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
import { FormControl } from "@angular/forms";
import { ActivatedRoute, Router, RouterModule } from "@angular/router";
import { combineLatest, firstValueFrom, from, map, Observable, switchMap } from "rxjs";
import { debounceTime, first } from "rxjs/operators";
import { JslibModule } from "@bitwarden/angular/jslib.module";
import { ApiService } from "@bitwarden/common/abstractions/api.service";
import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
import { ProviderService } from "@bitwarden/common/admin-console/abstractions/provider.service";
import { ProviderStatusType, ProviderUserType } from "@bitwarden/common/admin-console/enums";
import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
import { ProviderOrganizationOrganizationDetailsResponse } from "@bitwarden/common/admin-console/models/response/provider/provider-organization.response";
import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
import { getUserId } from "@bitwarden/common/auth/services/account.service";
import { PlanType } from "@bitwarden/common/billing/enums";
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
import { ValidationService } from "@bitwarden/common/platform/abstractions/validation.service";
import {
AvatarModule,
DialogService,
TableDataSource,
TableModule,
ToastService,
} from "@bitwarden/components";
import { SharedOrganizationModule } from "@bitwarden/web-vault/app/admin-console/organizations/shared";
import { HeaderModule } from "@bitwarden/web-vault/app/layouts/header/header.module";
import { WebProviderService } from "../services/web-provider.service";
import { AddOrganizationComponent } from "./add-organization.component";
const DisallowedPlanTypes = [
PlanType.Free,
PlanType.FamiliesAnnually2019,
PlanType.FamiliesAnnually,
PlanType.TeamsStarter2023,
PlanType.TeamsStarter,
];
@Component({
templateUrl: "clients.component.html",
imports: [
SharedOrganizationModule,
HeaderModule,
CommonModule,
JslibModule,
AvatarModule,
RouterModule,
TableModule,
],
})
export class ClientsComponent {
addableOrganizations: Organization[] = [];
loading = true;
showAddExisting = false;
dataSource: TableDataSource<ProviderOrganizationOrganizationDetailsResponse> =
new TableDataSource();
protected searchControl = new FormControl("", { nonNullable: true });
protected providerId$: Observable<string> =
this.activatedRoute.parent?.params.pipe(map((params) => params.providerId as string)) ??
new Observable();
protected provider$ = combineLatest([
this.providerId$,
this.accountService.activeAccount$.pipe(getUserId),
]).pipe(switchMap(([providerId, userId]) => this.providerService.get$(providerId, userId)));
protected isAdminOrServiceUser$ = this.provider$.pipe(
map(
(provider) =>
provider?.type === ProviderUserType.ProviderAdmin ||
provider?.type === ProviderUserType.ServiceUser,
),
);
constructor(
private router: Router,
private providerService: ProviderService,
private apiService: ApiService,
private organizationService: OrganizationService,
private organizationApiService: OrganizationApiServiceAbstraction,
private accountService: AccountService,
private activatedRoute: ActivatedRoute,
private dialogService: DialogService,
private i18nService: I18nService,
private toastService: ToastService,
private validationService: ValidationService,
private webProviderService: WebProviderService,
) {
this.activatedRoute.queryParams.pipe(first(), takeUntilDestroyed()).subscribe((queryParams) => {
this.searchControl.setValue(queryParams.search);
});
this.provider$
.pipe(
map((provider) => {
if (provider?.providerStatus === ProviderStatusType.Billable) {
return from(
this.router.navigate(["../manage-client-organizations"], {
relativeTo: this.activatedRoute,
}),
);
}
return from(this.load());
}),
takeUntilDestroyed(),
)
.subscribe();
this.searchControl.valueChanges
.pipe(debounceTime(200), takeUntilDestroyed())
.subscribe((searchText) => {
this.dataSource.filter = (data) =>
data.organizationName.toLowerCase().indexOf(searchText.toLowerCase()) > -1;
});
}
async remove(organization: ProviderOrganizationOrganizationDetailsResponse) {
const confirmed = await this.dialogService.openSimpleDialog({
title: organization.organizationName,
content: { key: "detachOrganizationConfirmation" },
type: "warning",
});
if (!confirmed) {
return;
}
try {
const providerId = await firstValueFrom(this.providerId$);
await this.webProviderService.detachOrganization(providerId, organization.id);
this.toastService.showToast({
variant: "success",
title: "",
message: this.i18nService.t("detachedOrganization", organization.organizationName),
});
await this.load();
} catch (e) {
this.validationService.showError(e);
}
}
async load() {
const providerId = await firstValueFrom(this.providerId$);
const response = await this.apiService.getProviderClients(providerId);
const userId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
const clients = response.data != null && response.data.length > 0 ? response.data : [];
this.dataSource.data = clients;
const candidateOrgs = (
await firstValueFrom(this.organizationService.organizations$(userId))
).filter((o) => o.isOwner && o.providerId == null);
const allowedOrgsIds = await Promise.all(
candidateOrgs.map((o) => this.organizationApiService.get(o.id)),
).then((orgs) =>
orgs.filter((o) => !DisallowedPlanTypes.includes(o.planType)).map((o) => o.id),
);
this.addableOrganizations = candidateOrgs.filter((o) => allowedOrgsIds.includes(o.id));
this.showAddExisting = this.addableOrganizations.length !== 0;
this.loading = false;
}
async addExistingOrganization() {
const providerId = await firstValueFrom(this.providerId$);
const dialogRef = AddOrganizationComponent.open(this.dialogService, {
providerId: providerId,
organizations: this.addableOrganizations,
});
if (await firstValueFrom(dialogRef.closed)) {
await this.load();
}
}
}

0
bitwarden_license/bit-web/src/app/billing/providers/clients/create-client-dialog.component.html → bitwarden_license/bit-web/src/app/admin-console/providers/clients/create-client-dialog.component.html
View File

2
bitwarden_license/bit-web/src/app/billing/providers/clients/create-client-dialog.component.ts → bitwarden_license/bit-web/src/app/admin-console/providers/clients/create-client-dialog.component.ts
View File

@@ -17,7 +17,7 @@ import {
ToastService,
} from "@bitwarden/components";
import { WebProviderService } from "../../../admin-console/providers/services/web-provider.service";
import { WebProviderService } from "../services/web-provider.service";
type CreateClientDialogParams = {
providerId: string;

3
bitwarden_license/bit-web/src/app/admin-console/providers/clients/create-organization.component.html
View File

@@ -1,3 +0,0 @@
<app-header [title]="'newClientOrganization' | i18n"></app-header>
<p>{{ "newClientOrganizationDesc" | i18n }}</p>
<app-organization-plans [providerId]="providerId"></app-organization-plans>

27
bitwarden_license/bit-web/src/app/admin-console/providers/clients/create-organization.component.ts
View File

@@ -1,27 +0,0 @@
// FIXME: Update this file to be type safe and remove this and next line
// @ts-strict-ignore
import { Component, OnInit, ViewChild } from "@angular/core";
import { ActivatedRoute } from "@angular/router";
import { OrganizationPlansComponent } from "@bitwarden/web-vault/app/billing";
@Component({
selector: "app-create-organization",
templateUrl: "create-organization.component.html",
standalone: false,
})
export class CreateOrganizationComponent implements OnInit {
@ViewChild(OrganizationPlansComponent, { static: true })
orgPlansComponent: OrganizationPlansComponent;
providerId: string;
constructor(private route: ActivatedRoute) {}
ngOnInit() {
// eslint-disable-next-line rxjs-angular/prefer-takeuntil, rxjs/no-async-subscribe
this.route.parent.params.subscribe(async (params) => {
this.providerId = params.providerId;
});
}
}

0
bitwarden_license/bit-web/src/app/billing/providers/clients/manage-client-name-dialog.component.html → bitwarden_license/bit-web/src/app/admin-console/providers/clients/manage-client-name-dialog.component.html
View File

10
bitwarden_license/bit-web/src/app/billing/providers/clients/manage-client-name-dialog.component.ts → bitwarden_license/bit-web/src/app/admin-console/providers/clients/manage-client-name-dialog.component.ts
View File

@@ -3,8 +3,8 @@
import { Component, Inject } from "@angular/core";
import { FormBuilder, Validators } from "@angular/forms";
import { BillingApiServiceAbstraction } from "@bitwarden/common/billing/abstractions/billing-api.service.abstraction";
import { UpdateClientOrganizationRequest } from "@bitwarden/common/billing/models/request/update-client-organization.request";
import { ProviderApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/provider/provider-api.service.abstraction";
import { UpdateProviderOrganizationRequest } from "@bitwarden/common/admin-console/models/request/update-provider-organization.request";
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
import {
DIALOG_DATA,
@@ -51,7 +51,7 @@ export class ManageClientNameDialogComponent {
constructor(
@Inject(DIALOG_DATA) protected dialogParams: ManageClientNameDialogParams,
private billingApiService: BillingApiServiceAbstraction,
private providerApiService: ProviderApiServiceAbstraction,
private dialogRef: DialogRef<ManageClientNameDialogResultType>,
private formBuilder: FormBuilder,
private i18nService: I18nService,
@@ -65,11 +65,11 @@ export class ManageClientNameDialogComponent {
return;
}
const request = new UpdateClientOrganizationRequest();
const request = new UpdateProviderOrganizationRequest();
request.assignedSeats = this.dialogParams.organization.seats;
request.name = this.formGroup.value.name;
await this.billingApiService.updateProviderClientOrganization(
await this.providerApiService.updateProviderOrganization(
this.dialogParams.providerId,
this.dialogParams.organization.id,
request,

0
bitwarden_license/bit-web/src/app/billing/providers/clients/manage-client-subscription-dialog.component.html → bitwarden_license/bit-web/src/app/admin-console/providers/clients/manage-client-subscription-dialog.component.html
View File

8
bitwarden_license/bit-web/src/app/billing/providers/clients/manage-client-subscription-dialog.component.ts → bitwarden_license/bit-web/src/app/admin-console/providers/clients/manage-client-subscription-dialog.component.ts
View File

@@ -3,11 +3,12 @@
import { Component, Inject, OnInit } from "@angular/core";
import { FormControl, FormGroup, ValidationErrors, ValidatorFn, Validators } from "@angular/forms";
import { ProviderApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/provider/provider-api.service.abstraction";
import { ProviderUserType } from "@bitwarden/common/admin-console/enums";
import { Provider } from "@bitwarden/common/admin-console/models/domain/provider";
import { UpdateProviderOrganizationRequest } from "@bitwarden/common/admin-console/models/request/update-provider-organization.request";
import { ProviderOrganizationOrganizationDetailsResponse } from "@bitwarden/common/admin-console/models/response/provider/provider-organization.response";
import { BillingApiServiceAbstraction } from "@bitwarden/common/billing/abstractions";
import { UpdateClientOrganizationRequest } from "@bitwarden/common/billing/models/request/update-client-organization.request";
import { ProviderPlanResponse } from "@bitwarden/common/billing/models/response/provider-subscription-response";
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
import { DIALOG_DATA, DialogConfig, DialogRef, DialogService } from "@bitwarden/components";
@@ -56,6 +57,7 @@ export class ManageClientSubscriptionDialogComponent implements OnInit {
constructor(
private billingApiService: BillingApiServiceAbstraction,
private providerApiService: ProviderApiServiceAbstraction,
@Inject(DIALOG_DATA) protected dialogParams: ManageClientSubscriptionDialogParams,
private dialogRef: DialogRef<ManageClientSubscriptionDialogResultType>,
private i18nService: I18nService,
@@ -99,11 +101,11 @@ export class ManageClientSubscriptionDialogComponent implements OnInit {
}
try {
const request = new UpdateClientOrganizationRequest();
const request = new UpdateProviderOrganizationRequest();
request.assignedSeats = this.formGroup.value.assignedSeats;
request.name = this.dialogParams.organization.organizationName;
await this.billingApiService.updateProviderClientOrganization(
await this.providerApiService.updateProviderOrganization(
this.dialogParams.provider.id,
this.dialogParams.organization.id,
request,

0
bitwarden_license/bit-web/src/app/billing/providers/clients/manage-clients.component.html → bitwarden_license/bit-web/src/app/admin-console/providers/clients/manage-clients.component.html
View File

61
bitwarden_license/bit-web/src/app/billing/providers/clients/manage-clients.component.ts → bitwarden_license/bit-web/src/app/admin-console/providers/clients/manage-clients.component.ts
View File

@@ -1,25 +1,21 @@
import { Component } from "@angular/core";
import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
import { Component, OnDestroy, OnInit } from "@angular/core";
import { FormControl } from "@angular/forms";
import { ActivatedRoute, Router } from "@angular/router";
import { ActivatedRoute } from "@angular/router";
import {
firstValueFrom,
from,
lastValueFrom,
map,
combineLatest,
switchMap,
Observable,
Subject,
takeUntil,
} from "rxjs";
import { debounceTime, first } from "rxjs/operators";
import { ProviderApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/provider/provider-api.service.abstraction";
import { ProviderService } from "@bitwarden/common/admin-console/abstractions/provider.service";
import {
ProviderStatusType,
ProviderType,
ProviderUserType,
} from "@bitwarden/common/admin-console/enums";
import { Provider } from "@bitwarden/common/admin-console/models/domain/provider";
import { ProviderType, ProviderUserType } from "@bitwarden/common/admin-console/enums";
import { ProviderOrganizationOrganizationDetailsResponse } from "@bitwarden/common/admin-console/models/response/provider/provider-organization.response";
import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
import { getUserId } from "@bitwarden/common/auth/services/account.service";
@@ -40,7 +36,7 @@ import { SharedOrganizationModule } from "@bitwarden/web-vault/app/admin-console
import { BillingNotificationService } from "@bitwarden/web-vault/app/billing/services/billing-notification.service";
import { HeaderModule } from "@bitwarden/web-vault/app/layouts/header/header.module";
import { WebProviderService } from "../../../admin-console/providers/services/web-provider.service";
import { WebProviderService } from "../services/web-provider.service";
import {
AddExistingOrganizationDialogComponent,
@@ -72,7 +68,7 @@ import { ReplacePipe } from "./replace.pipe";
ReplacePipe,
],
})
export class ManageClientsComponent {
export class ManageClientsComponent implements OnInit, OnDestroy {
loading = true;
dataSource: TableDataSource<ProviderOrganizationOrganizationDetailsResponse> =
new TableDataSource();
@@ -117,10 +113,11 @@ export class ManageClientsComponent {
),
);
private destroy$ = new Subject<void>();
constructor(
private billingApiService: BillingApiServiceAbstraction,
private providerService: ProviderService,
private router: Router,
private activatedRoute: ActivatedRoute,
private dialogService: DialogService,
private i18nService: I18nService,
@@ -130,35 +127,31 @@ export class ManageClientsComponent {
private billingNotificationService: BillingNotificationService,
private configService: ConfigService,
private accountService: AccountService,
) {
this.activatedRoute.queryParams.pipe(first(), takeUntilDestroyed()).subscribe((queryParams) => {
this.searchControl.setValue(queryParams.search);
});
private providerApiService: ProviderApiServiceAbstraction,
) {}
this.provider$
.pipe(
map((provider: Provider | undefined) => {
if (provider?.providerStatus !== ProviderStatusType.Billable) {
return from(
this.router.navigate(["../clients"], {
relativeTo: this.activatedRoute,
}),
);
}
return from(this.load());
}),
takeUntilDestroyed(),
)
.subscribe();
async ngOnInit() {
this.activatedRoute.queryParams
.pipe(first(), takeUntil(this.destroy$))
.subscribe((queryParams) => {
this.searchControl.setValue(queryParams.search);
});
await this.load();
this.searchControl.valueChanges
.pipe(debounceTime(200), takeUntilDestroyed())
.pipe(debounceTime(200), takeUntil(this.destroy$))
.subscribe((searchText) => {
this.dataSource.filter = (data) =>
data.organizationName.toLowerCase().indexOf(searchText.toLowerCase()) > -1;
});
}
ngOnDestroy() {
this.destroy$.next();
this.destroy$.complete();
}
async load() {
try {
const providerId = await firstValueFrom(this.providerId$);
@@ -170,7 +163,7 @@ export class ManageClientsComponent {
this.newClientButtonLabel = this.i18nService.t("newBusinessUnit");
}
this.dataSource.data = (
await this.billingApiService.getProviderClientOrganizations(providerId)
await this.providerApiService.getProviderOrganizations(providerId)
).data;
this.plans = (await this.billingApiService.getPlans()).data;
this.loading = false;

0
bitwarden_license/bit-web/src/app/billing/providers/clients/no-clients.component.ts → bitwarden_license/bit-web/src/app/admin-console/providers/clients/no-clients.component.ts
View File

0
bitwarden_license/bit-web/src/app/billing/providers/clients/replace.pipe.ts → bitwarden_license/bit-web/src/app/admin-console/providers/clients/replace.pipe.ts
View File

2
bitwarden_license/bit-web/src/app/admin-console/providers/providers-layout.component.html
View File

@@ -9,7 +9,7 @@
<bit-nav-item
icon="bwi-provider"
[text]="clientsTranslationKey$ | async | i18n"
[route]="(isBillable | async) ? 'manage-client-organizations' : 'clients'"
route="clients"
>
<i
*ngIf="!provider.enabled && (providerPortalTakeover$ | async)"

13
bitwarden_license/bit-web/src/app/admin-console/providers/providers-layout.component.ts
View File

@@ -9,7 +9,7 @@ import { takeUntil } from "rxjs/operators";
import { JslibModule } from "@bitwarden/angular/jslib.module";
import { BusinessUnitPortalLogo, Icon, ProviderPortalLogo } from "@bitwarden/assets/svg";
import { ProviderService } from "@bitwarden/common/admin-console/abstractions/provider.service";
import { ProviderStatusType, ProviderType } from "@bitwarden/common/admin-console/enums";
import { ProviderType } from "@bitwarden/common/admin-console/enums";
import { Provider } from "@bitwarden/common/admin-console/models/domain/provider";
import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
import { getUserId } from "@bitwarden/common/auth/services/account.service";
@@ -43,7 +43,6 @@ export class ProvidersLayoutComponent implements OnInit, OnDestroy {
protected logo$: Observable<Icon>;
protected isBillable: Observable<boolean>;
protected canAccessBilling$: Observable<boolean>;
protected clientsTranslationKey$: Observable<string>;
@@ -83,15 +82,7 @@ export class ProvidersLayoutComponent implements OnInit, OnDestroy {
),
);
this.isBillable = this.provider$.pipe(
map((provider) => provider?.providerStatus === ProviderStatusType.Billable),
);
this.canAccessBilling$ = combineLatest([this.isBillable, this.provider$]).pipe(
map(
([hasConsolidatedBilling, provider]) => hasConsolidatedBilling && provider.isProviderAdmin,
),
);
this.canAccessBilling$ = this.provider$.pipe(map((provider) => provider.isProviderAdmin));
this.clientsTranslationKey$ = this.provider$.pipe(
map((provider) =>

25
bitwarden_license/bit-web/src/app/admin-console/providers/providers-routing.module.ts
View File

@@ -7,17 +7,12 @@ import { AnonLayoutWrapperComponent } from "@bitwarden/components";
import { FrontendLayoutComponent } from "@bitwarden/web-vault/app/layouts/frontend-layout.component";
import { UserLayoutComponent } from "@bitwarden/web-vault/app/layouts/user-layout.component";
import {
ManageClientsComponent,
ProviderSubscriptionComponent,
hasConsolidatedBilling,
ProviderBillingHistoryComponent,
} from "../../billing/providers";
import { ProviderBillingHistoryComponent } from "../../billing/providers/billing-history/provider-billing-history.component";
import { ProviderPaymentDetailsComponent } from "../../billing/providers/payment-details/provider-payment-details.component";
import { SetupBusinessUnitComponent } from "../../billing/providers/setup/setup-business-unit.component";
import { ProviderSubscriptionComponent } from "../../billing/providers/subscription/provider-subscription.component";
import { ClientsComponent } from "./clients/clients.component";
import { CreateOrganizationComponent } from "./clients/create-organization.component";
import { ManageClientsComponent } from "./clients/manage-clients.component";
import { providerPermissionsGuard } from "./guards/provider-permissions.guard";
import { AcceptProviderComponent } from "./manage/accept-provider.component";
import { EventsComponent } from "./manage/events.component";
@@ -88,14 +83,7 @@ const routes: Routes = [
canActivate: [providerPermissionsGuard()],
children: [
{ path: "", pathMatch: "full", redirectTo: "clients" },
{ path: "clients/create", component: CreateOrganizationComponent },
{ path: "clients", component: ClientsComponent, data: { titleId: "clients" } },
{
path: "manage-client-organizations",
canActivate: [hasConsolidatedBilling],
component: ManageClientsComponent,
data: { titleId: "clients" },
},
{ path: "clients", component: ManageClientsComponent, data: { titleId: "clients" } },
{
path: "manage",
children: [
@@ -128,7 +116,7 @@ const routes: Routes = [
},
{
path: "billing",
canActivate: [hasConsolidatedBilling],
canActivate: [providerPermissionsGuard()],
children: [
{
path: "",
@@ -138,7 +126,6 @@ const routes: Routes = [
{
path: "subscription",
component: ProviderSubscriptionComponent,
canActivate: [providerPermissionsGuard()],
data: {
titleId: "subscription",
},
@@ -146,7 +133,6 @@ const routes: Routes = [
{
path: "payment-details",
component: ProviderPaymentDetailsComponent,
canActivate: [providerPermissionsGuard()],
data: {
titleId: "paymentDetails",
},
@@ -154,7 +140,6 @@ const routes: Routes = [
{
path: "history",
component: ProviderBillingHistoryComponent,
canActivate: [providerPermissionsGuard()],
data: {
titleId: "billingHistory",
},

24
bitwarden_license/bit-web/src/app/admin-console/providers/providers.module.ts
View File

@@ -13,22 +13,18 @@ import {
} from "@bitwarden/web-vault/app/billing/payment/components";
import { OssModule } from "@bitwarden/web-vault/app/oss.module";
import {
CreateClientDialogComponent,
InvoicesComponent,
ManageClientNameDialogComponent,
ManageClientSubscriptionDialogComponent,
NoInvoicesComponent,
ProviderBillingHistoryComponent,
ProviderSubscriptionComponent,
ProviderSubscriptionStatusComponent,
} from "../../billing/providers";
import { AddExistingOrganizationDialogComponent } from "../../billing/providers/clients/add-existing-organization-dialog.component";
import { InvoicesComponent } from "../../billing/providers/billing-history/invoices.component";
import { NoInvoicesComponent } from "../../billing/providers/billing-history/no-invoices.component";
import { ProviderBillingHistoryComponent } from "../../billing/providers/billing-history/provider-billing-history.component";
import { SetupBusinessUnitComponent } from "../../billing/providers/setup/setup-business-unit.component";
import { ProviderSubscriptionStatusComponent } from "../../billing/providers/subscription/provider-subscription-status.component";
import { ProviderSubscriptionComponent } from "../../billing/providers/subscription/provider-subscription.component";
import { ProviderWarningsModule } from "../../billing/providers/warnings/provider-warnings.module";
import { AddOrganizationComponent } from "./clients/add-organization.component";
import { CreateOrganizationComponent } from "./clients/create-organization.component";
import { AddExistingOrganizationDialogComponent } from "./clients/add-existing-organization-dialog.component";
import { CreateClientDialogComponent } from "./clients/create-client-dialog.component";
import { ManageClientNameDialogComponent } from "./clients/manage-client-name-dialog.component";
import { ManageClientSubscriptionDialogComponent } from "./clients/manage-client-subscription-dialog.component";
import { AcceptProviderComponent } from "./manage/accept-provider.component";
import { AddEditMemberDialogComponent } from "./manage/dialogs/add-edit-member-dialog.component";
import { BulkConfirmDialogComponent } from "./manage/dialogs/bulk-confirm-dialog.component";
@@ -65,10 +61,8 @@ import { VerifyRecoverDeleteProviderComponent } from "./verify-recover-delete-pr
declarations: [
AcceptProviderComponent,
AccountComponent,
AddOrganizationComponent,
BulkConfirmDialogComponent,
BulkRemoveDialogComponent,
CreateOrganizationComponent,
EventsComponent,
MembersComponent,
SetupComponent,

10
bitwarden_license/bit-web/src/app/admin-console/providers/services/web-provider.service.spec.ts
View File

@@ -3,8 +3,6 @@ import { MockProxy, mock } from "jest-mock-extended";
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 { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
import { BillingApiServiceAbstraction } from "@bitwarden/common/billing/abstractions/billing-api.service.abstraction";
import { PlanType } from "@bitwarden/common/billing/enums";
import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
import { EncString } from "@bitwarden/common/key-management/crypto/models/enc-string";
@@ -26,10 +24,8 @@ describe("WebProviderService", () => {
let apiService: MockProxy<ApiService>;
let i18nService: MockProxy<I18nService>;
let encryptService: MockProxy<EncryptService>;
let billingApiService: MockProxy<BillingApiServiceAbstraction>;
let stateProvider: MockProxy<StateProvider>;
let providerApiService: MockProxy<ProviderApiServiceAbstraction>;
let accountService: MockProxy<AccountService>;
beforeEach(() => {
keyService = mock();
@@ -37,10 +33,8 @@ describe("WebProviderService", () => {
apiService = mock();
i18nService = mock();
encryptService = mock();
billingApiService = mock();
stateProvider = mock();
providerApiService = mock();
accountService = mock();
sut = new WebProviderService(
keyService,
@@ -48,10 +42,8 @@ describe("WebProviderService", () => {
apiService,
i18nService,
encryptService,
billingApiService,
stateProvider,
providerApiService,
accountService,
);
});
@@ -99,7 +91,7 @@ describe("WebProviderService", () => {
expect(keyService.getProviderKey).toHaveBeenCalledWith(providerId);
expect(encryptService.wrapSymmetricKey).toHaveBeenCalledWith(mockOrgKey, mockProviderKey);
expect(billingApiService.createProviderClientOrganization).toHaveBeenCalledWith(
expect(providerApiService.createProviderOrganization).toHaveBeenCalledWith(
providerId,
expect.objectContaining({
name,

35
bitwarden_license/bit-web/src/app/admin-console/providers/services/web-provider.service.ts
View File

@@ -6,13 +6,9 @@ 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 { CreateProviderOrganizationRequest } from "@bitwarden/common/admin-console/models/request/create-provider-organization.request";
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 { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
import { getUserId } from "@bitwarden/common/auth/services/account.service";
import { BillingApiServiceAbstraction } from "@bitwarden/common/billing/abstractions/billing-api.service.abstraction";
import { PlanType } from "@bitwarden/common/billing/enums";
import { CreateClientOrganizationRequest } from "@bitwarden/common/billing/models/request/create-client-organization.request";
import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
import { StateProvider } from "@bitwarden/common/platform/state";
@@ -29,34 +25,11 @@ export class WebProviderService {
private apiService: ApiService,
private i18nService: I18nService,
private encryptService: EncryptService,
private billingApiService: BillingApiServiceAbstraction,
private stateProvider: StateProvider,
private providerApiService: ProviderApiServiceAbstraction,
private accountService: AccountService,
) {}
async addOrganizationToProvider(providerId: string, organizationId: string) {
const orgKey = await firstValueFrom(
this.accountService.activeAccount$.pipe(
getUserId,
switchMap((userId) => this.keyService.orgKeys$(userId)),
map((orgKeys) => orgKeys[organizationId as OrganizationId] ?? null),
),
);
const providerKey = await this.keyService.getProviderKey(providerId);
const encryptedOrgKey = await this.encryptService.wrapSymmetricKey(orgKey, providerKey);
const request = new ProviderAddOrganizationRequest();
request.organizationId = organizationId;
request.key = encryptedOrgKey.encryptedString;
const response = await this.apiService.postProviderAddOrganization(providerId, request);
await this.syncService.fullSync(true);
return response;
}
async addOrganizationToProviderVNext(providerId: string, organizationId: string): Promise<void> {
async addOrganizationToProvider(providerId: string, organizationId: string): Promise<void> {
const orgKey = await firstValueFrom(
this.stateProvider.activeUserId$.pipe(
switchMap((userId) => this.keyService.orgKeys$(userId)),
@@ -96,7 +69,7 @@ export class WebProviderService {
providerKey,
);
const request = new CreateClientOrganizationRequest();
const request = new CreateProviderOrganizationRequest();
request.name = name;
request.ownerEmail = ownerEmail;
request.planType = planType;
@@ -106,7 +79,7 @@ export class WebProviderService {
request.keyPair = new OrganizationKeysRequest(publicKey, encryptedPrivateKey.encryptedString);
request.collectionName = encryptedCollectionName.encryptedString;
await this.billingApiService.createProviderClientOrganization(providerId, request);
await this.providerApiService.createProviderOrganization(providerId, request);
await this.apiService.refreshIdentityToken();

6
bitwarden_license/bit-web/src/app/billing/providers/clients/index.ts
View File

@@ -1,6 +0,0 @@
export * from "./create-client-dialog.component";
export * from "./manage-clients.component";
export * from "./manage-client-name-dialog.component";
export * from "./manage-client-subscription-dialog.component";
export * from "./no-clients.component";
export * from "./replace.pipe";

22
bitwarden_license/bit-web/src/app/billing/providers/guards/has-consolidated-billing.guard.ts
View File

@@ -1,22 +0,0 @@
import { inject } from "@angular/core";
import { ActivatedRouteSnapshot, CanActivateFn, createUrlTreeFromSnapshot } from "@angular/router";
import { firstValueFrom } from "rxjs";
import { ProviderService } from "@bitwarden/common/admin-console/abstractions/provider.service";
import { ProviderStatusType } from "@bitwarden/common/admin-console/enums";
import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
import { getUserId } from "@bitwarden/common/auth/services/account.service";
export const hasConsolidatedBilling: CanActivateFn = async (route: ActivatedRouteSnapshot) => {
const providerService = inject(ProviderService);
const accountService = inject(AccountService);
const userId = await firstValueFrom(getUserId(accountService.activeAccount$));
const provider = await firstValueFrom(providerService.get$(route.params.providerId, userId));
if (!provider || provider.providerStatus !== ProviderStatusType.Billable) {
return createUrlTreeFromSnapshot(route, ["/providers", route.params.providerId]);
}
return true;
};

7
bitwarden_license/bit-web/src/app/billing/providers/index.ts
View File

@@ -1,7 +0,0 @@
export * from "./billing-history/invoices.component";
export * from "./billing-history/no-invoices.component";
export * from "./billing-history/provider-billing-history.component";
export * from "./clients";
export * from "./guards/has-consolidated-billing.guard";
export * from "./subscription/provider-subscription.component";
export * from "./subscription/provider-subscription-status.component";