diff --git a/apps/browser/src/background/main.background.ts b/apps/browser/src/background/main.background.ts index 57237fded7..a42f19c228 100644 --- a/apps/browser/src/background/main.background.ts +++ b/apps/browser/src/background/main.background.ts @@ -539,6 +539,7 @@ export default class MainBackground { this.folderApiService, this.organizationService, this.sendApiService, + this.configService, logoutCallback, ); this.eventUploadService = new EventUploadService( diff --git a/apps/cli/src/bw.ts b/apps/cli/src/bw.ts index d00a1bd972..8b3ea41e21 100644 --- a/apps/cli/src/bw.ts +++ b/apps/cli/src/bw.ts @@ -443,6 +443,7 @@ export class Main { this.folderApiService, this.organizationService, this.sendApiService, + this.configService, async (expired: boolean) => await this.logout(), ); diff --git a/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.html b/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.html index 0b3ec78886..b69103bf12 100644 --- a/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.html +++ b/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.html @@ -138,25 +138,128 @@ -

- {{ "permissions" | i18n }} -

-
-
-
- -
- - + +

+ {{ "permissions" | i18n }} +

+
+
+
+ +
+ + +
+
+
+
+ +
+
+ + +
+
+ + +
+
+ + +
+ + +
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
-
-
- -
+ + +
+
+
+
-
- - -
-
- - -
-
- - -
-
- - -
-
- - +
+
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
-
+

diff --git a/apps/web/src/app/billing/organizations/sm-subscribe-standalone.component.ts b/apps/web/src/app/billing/organizations/sm-subscribe-standalone.component.ts index 1f8b70e03f..e2b3107ae7 100644 --- a/apps/web/src/app/billing/organizations/sm-subscribe-standalone.component.ts +++ b/apps/web/src/app/billing/organizations/sm-subscribe-standalone.component.ts @@ -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"; @@ -33,6 +35,7 @@ export class SecretsManagerSubscribeStandaloneComponent { private i18nService: I18nService, private organizationApiService: OrganizationApiServiceAbstraction, private organizationService: InternalOrganizationServiceAbstraction, + private configService: ConfigServiceAbstraction, ) {} submit = async () => { @@ -52,7 +55,11 @@ export class SecretsManagerSubscribeStandaloneComponent { 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 diff --git a/apps/web/src/app/vault/components/collection-dialog/collection-dialog.component.html b/apps/web/src/app/vault/components/collection-dialog/collection-dialog.component.html index 41e785a6eb..30227222e6 100644 --- a/apps/web/src/app/vault/components/collection-dialog/collection-dialog.component.html +++ b/apps/web/src/app/vault/components/collection-dialog/collection-dialog.component.html @@ -109,7 +109,7 @@ {{ "cancel" | i18n }}