vaultwarden
/
bitwarden-estensione-browser
mirror of https://github.com/bitwarden/browser
1
0
Fork 0
Code Issues 1 Releases Wiki Activity

[AC-2648] Remove Organization.FlexibleCollections from Models (#10163) 

* chore: remove FlexibleCollections from profile-organization.response, refs AC-2648

* chore: remove FlexibleCollections from organization.response, refs AC-2648

* chore: remove FlexibleCollections from organization.data, refs AC-2648

* chore: remove FlexibleCollections from organization, refs AC-2648
This commit is contained in:
Vincent Salucci 2024-07-23 16:03:09 -05:00 committed by GitHub
parent 91aa475766
commit 06b370ee75
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libs/common/src/admin-console/models/data/organization.data.spec.ts
View File

@ -53,7 +53,6 @@ describe("ORGANIZATIONS state", () => {
accessSecretsManager: false, accessSecretsManager: false,
limitCollectionCreationDeletion: false, limitCollectionCreationDeletion: false,
allowAdminAccessToAllCollectionItems: false, allowAdminAccessToAllCollectionItems: false,
flexibleCollections: false,
familySponsorshipLastSyncDate: new Date(), familySponsorshipLastSyncDate: new Date(),
}, },
}; };

2
libs/common/src/admin-console/models/data/organization.data.ts
View File

@ -54,7 +54,6 @@ export class OrganizationData {
accessSecretsManager: boolean; accessSecretsManager: boolean;
limitCollectionCreationDeletion: boolean; limitCollectionCreationDeletion: boolean;
allowAdminAccessToAllCollectionItems: boolean; allowAdminAccessToAllCollectionItems: boolean;
flexibleCollections: boolean;
constructor( constructor(
response?: ProfileOrganizationResponse, response?: ProfileOrganizationResponse,
@ -113,7 +112,6 @@ export class OrganizationData {
this.accessSecretsManager = response.accessSecretsManager; this.accessSecretsManager = response.accessSecretsManager;
this.limitCollectionCreationDeletion = response.limitCollectionCreationDeletion; this.limitCollectionCreationDeletion = response.limitCollectionCreationDeletion;
this.allowAdminAccessToAllCollectionItems = response.allowAdminAccessToAllCollectionItems; this.allowAdminAccessToAllCollectionItems = response.allowAdminAccessToAllCollectionItems;
this.flexibleCollections = response.flexibleCollections;
this.isMember = options.isMember; this.isMember = options.isMember;
this.isProviderUser = options.isProviderUser; this.isProviderUser = options.isProviderUser;

6
libs/common/src/admin-console/models/domain/organization.ts
View File

@ -73,11 +73,6 @@ export class Organization {
* Refers to the ability for an owner/admin to access all collection items, regardless of assigned collections * Refers to the ability for an owner/admin to access all collection items, regardless of assigned collections
*/ */
allowAdminAccessToAllCollectionItems: boolean; allowAdminAccessToAllCollectionItems: boolean;
/**
* Returns true if this organization has enabled Flexible Collections (MVP) and their data has been migrated.
* Generally, you should use this as the feature flag to gate Flexible Collections features.
*/
flexibleCollections: boolean;
constructor(obj?: OrganizationData) { constructor(obj?: OrganizationData) {
if (obj == null) { if (obj == null) {
@ -132,7 +127,6 @@ export class Organization {
this.accessSecretsManager = obj.accessSecretsManager; this.accessSecretsManager = obj.accessSecretsManager;
this.limitCollectionCreationDeletion = obj.limitCollectionCreationDeletion; this.limitCollectionCreationDeletion = obj.limitCollectionCreationDeletion;
this.allowAdminAccessToAllCollectionItems = obj.allowAdminAccessToAllCollectionItems; this.allowAdminAccessToAllCollectionItems = obj.allowAdminAccessToAllCollectionItems;
this.flexibleCollections = obj.flexibleCollections;
} }
get canAccess() { get canAccess() {

2
libs/common/src/admin-console/models/response/organization.response.ts
View File

@ -34,7 +34,6 @@ export class OrganizationResponse extends BaseResponse {
maxAutoscaleSmServiceAccounts?: number; maxAutoscaleSmServiceAccounts?: number;
limitCollectionCreationDeletion: boolean; limitCollectionCreationDeletion: boolean;
allowAdminAccessToAllCollectionItems: boolean; allowAdminAccessToAllCollectionItems: boolean;
flexibleCollections: boolean;
constructor(response: any) { constructor(response: any) {
super(response); super(response);
@ -76,6 +75,5 @@ export class OrganizationResponse extends BaseResponse {
this.allowAdminAccessToAllCollectionItems = this.getResponseProperty( this.allowAdminAccessToAllCollectionItems = this.getResponseProperty(
"AllowAdminAccessToAllCollectionItems", "AllowAdminAccessToAllCollectionItems",
); );
this.flexibleCollections = this.getResponseProperty("FlexibleCollections");
} }
} }

2
libs/common/src/admin-console/models/response/profile-organization.response.ts
View File

@ -51,7 +51,6 @@ export class ProfileOrganizationResponse extends BaseResponse {
accessSecretsManager: boolean; accessSecretsManager: boolean;
limitCollectionCreationDeletion: boolean; limitCollectionCreationDeletion: boolean;
allowAdminAccessToAllCollectionItems: boolean; allowAdminAccessToAllCollectionItems: boolean;
flexibleCollections: boolean;
constructor(response: any) { constructor(response: any) {
super(response); super(response);
@ -116,6 +115,5 @@ export class ProfileOrganizationResponse extends BaseResponse {
this.allowAdminAccessToAllCollectionItems = this.getResponseProperty( this.allowAdminAccessToAllCollectionItems = this.getResponseProperty(
"AllowAdminAccessToAllCollectionItems", "AllowAdminAccessToAllCollectionItems",
); );
this.flexibleCollections = this.getResponseProperty("FlexibleCollections");
} }
} }