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

[AC-1139] Moved override logic from syncService to organizationService

Browse Source
This commit is contained in:
Rui Tome
2023-12-04 20:50:20 +00:00
parent 59d1fe647d
commit 1c4e73b8fc
5 changed files with 65 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
apps/web/src/app/billing/organizations/sm-subscribe-standalone.component.ts
View File

@@ -9,6 +9,8 @@ import { Organization } from "@bitwarden/common/admin-console/models/domain/orga
import { SecretsManagerSubscribeRequest } from "@bitwarden/common/billing/models/request/sm-subscribe.request";
import { BillingCustomerDiscount } from "@bitwarden/common/billing/models/response/organization-subscription.response";
import { PlanResponse } from "@bitwarden/common/billing/models/response/plan.response";
import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
import { ConfigServiceAbstraction } from "@bitwarden/common/platform/abstractions/config/config.service.abstraction";
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
@@ -32,7 +34,8 @@ export class SecretsManagerSubscribeStandaloneComponent {
private platformUtilsService: PlatformUtilsService,
private i18nService: I18nService,
private organizationApiService: OrganizationApiServiceAbstraction,
private organizationService: InternalOrganizationServiceAbstraction
private organizationService: InternalOrganizationServiceAbstraction,
private configService: ConfigServiceAbstraction,
) {}
submit = async () => {
@@ -46,13 +49,17 @@ export class SecretsManagerSubscribeStandaloneComponent {
const profileOrganization = await this.organizationApiService.subscribeToSecretsManager(
this.organization.id,
request
request,
);
const organizationData = new OrganizationData(profileOrganization, {
isMember: this.organization.isMember,
isProviderUser: this.organization.isProviderUser,
});
await this.organizationService.upsert(organizationData);
const flexibleCollectionsEnabled = await this.configService.getFeatureFlag(
FeatureFlag.FlexibleCollections,
false,
);
await this.organizationService.upsert(organizationData, flexibleCollectionsEnabled);
/*
Because subscribing to Secrets Manager automatically provides access to Secrets Manager for the
@@ -63,7 +70,7 @@ export class SecretsManagerSubscribeStandaloneComponent {
this.platformUtilsService.showToast(
"success",
null,
this.i18nService.t("subscribedToSecretsManager")
this.i18nService.t("subscribedToSecretsManager"),
);
this.onSubscribe.emit();