[PM-10996] Remove restrict-provider-access feature flag (#10977)

libs/angular/src/admin-console/components/collections.component.ts

@@ -4,8 +4,6 @@ import { firstValueFrom, map } from "rxjs";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
-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 { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
@@ -27,7 +25,6 @@ export class CollectionsComponent implements OnInit {
   collectionIds: string[];
   collections: CollectionView[] = [];
   organization: Organization;
-  restrictProviderAccess: boolean;
 
   protected cipherDomain: Cipher;
 
@@ -38,15 +35,11 @@ export class CollectionsComponent implements OnInit {
     protected cipherService: CipherService,
     protected organizationService: OrganizationService,
     private logService: LogService,
-    private configService: ConfigService,
     private accountService: AccountService,
     private toastService: ToastService,
   ) {}
 
   async ngOnInit() {
-    this.restrictProviderAccess = await this.configService.getFeatureFlag(
-      FeatureFlag.RestrictProviderAccess,
-    );
     await this.load();
   }
 
@@ -76,7 +69,7 @@ export class CollectionsComponent implements OnInit {
   async submit(): Promise<boolean> {
     const selectedCollectionIds = this.collections
       .filter((c) => {
-        if (this.organization.canEditAllCiphers(this.restrictProviderAccess)) {
+        if (this.organization.canEditAllCiphers) {
           return !!(c as any).checked;
         } else {
           return !!(c as any).checked && c.readOnly == null;

libs/angular/src/vault/components/add-edit.component.ts

@@ -13,7 +13,6 @@ import { OrganizationUserStatusType, PolicyType } from "@bitwarden/common/admin-
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { EventType } from "@bitwarden/common/enums";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { UriMatchStrategy } from "@bitwarden/common/models/domain/domain-service";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
@@ -92,8 +91,6 @@ export class AddEditComponent implements OnInit, OnDestroy {
   private personalOwnershipPolicyAppliesToActiveUser: boolean;
   private previousCipherId: string;
 
-  protected restrictProviderAccess = false;
-
   get fido2CredentialCreationDateValue(): string {
     const dateCreated = this.i18nService.t("dateCreated");
     const creationDate = this.datePipe.transform(
@@ -182,10 +179,6 @@ export class AddEditComponent implements OnInit, OnDestroy {
   }
 
   async ngOnInit() {
-    this.restrictProviderAccess = await this.configService.getFeatureFlag(
-      FeatureFlag.RestrictProviderAccess,
-    );
-
     this.policyService
       .policyAppliesToActiveUser$(PolicyType.PersonalOwnership)
       .pipe(
@@ -683,11 +676,11 @@ export class AddEditComponent implements OnInit, OnDestroy {
 
   protected saveCipher(cipher: Cipher) {
     const isNotClone = this.editMode && !this.cloneMode;
-    let orgAdmin = this.organization?.canEditAllCiphers(this.restrictProviderAccess);
+    let orgAdmin = this.organization?.canEditAllCiphers;
 
     // if a cipher is unassigned we want to check if they are an admin or have permission to edit any collection
     if (!cipher.collectionIds) {
-      orgAdmin = this.organization?.canEditUnassignedCiphers(this.restrictProviderAccess);
+      orgAdmin = this.organization?.canEditUnassignedCiphers;
     }
 
     return this.cipher.id == null
@@ -696,14 +689,14 @@ export class AddEditComponent implements OnInit, OnDestroy {
   }
 
   protected deleteCipher() {
-    const asAdmin = this.organization?.canEditAllCiphers(this.restrictProviderAccess);
+    const asAdmin = this.organization?.canEditAllCiphers;
     return this.cipher.isDeleted
       ? this.cipherService.deleteWithServer(this.cipher.id, asAdmin)
       : this.cipherService.softDeleteWithServer(this.cipher.id, asAdmin);
   }
 
   protected restoreCipher() {
-    const asAdmin = this.organization?.canEditAllCiphers(this.restrictProviderAccess);
+    const asAdmin = this.organization?.canEditAllCiphers;
     return this.cipherService.restoreWithServer(this.cipher.id, asAdmin);
   }
 

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

@@ -183,14 +183,7 @@ export class Organization {
     return this.isAdmin || this.permissions.editAnyCollection;
   }
 
-  canEditUnassignedCiphers(restrictProviderAccessFlagEnabled: boolean) {
-    // Providers can access items until the restrictProviderAccess flag is enabled
-    // After the flag is enabled and removed, this block will be deleted
-    // so that they permanently lose access to items
-    if (this.isProviderUser && !restrictProviderAccessFlagEnabled) {
-      return true;
-    }
-
+  get canEditUnassignedCiphers() {
     return (
       this.type === OrganizationUserType.Admin ||
       this.type === OrganizationUserType.Owner ||
@@ -198,14 +191,7 @@ export class Organization {
     );
   }
 
-  canEditAllCiphers(restrictProviderAccessFlagEnabled: boolean) {
-    // Providers can access items until the restrictProviderAccess flag is enabled
-    // After the flag is enabled and removed, this block will be deleted
-    // so that they permanently lose access to items
-    if (this.isProviderUser && !restrictProviderAccessFlagEnabled) {
-      return true;
-    }
-
+  get canEditAllCiphers() {
     // The allowAdminAccessToAllCollectionItems flag can restrict admins
     // Custom users with canEditAnyCollection are not affected by allowAdminAccessToAllCollectionItems flag
     return (

libs/common/src/enums/feature-flag.enum.ts

@@ -12,7 +12,6 @@ export enum FeatureFlag {
   EnableDeleteProvider = "AC-1218-delete-provider",
   ExtensionRefresh = "extension-refresh",
   PersistPopupView = "persist-popup-view",
-  RestrictProviderAccess = "restrict-provider-access",
   PM4154_BulkEncryptionService = "PM-4154-bulk-encryption-service",
   UseTreeWalkerApiForPageDetailsCollection = "use-tree-walker-api-for-page-details-collection",
   EmailVerification = "email-verification",
@@ -59,7 +58,6 @@ export const DefaultFeatureFlagValue = {
   [FeatureFlag.EnableDeleteProvider]: FALSE,
   [FeatureFlag.ExtensionRefresh]: FALSE,
   [FeatureFlag.PersistPopupView]: FALSE,
-  [FeatureFlag.RestrictProviderAccess]: FALSE,
   [FeatureFlag.PM4154_BulkEncryptionService]: FALSE,
   [FeatureFlag.UseTreeWalkerApiForPageDetailsCollection]: FALSE,
   [FeatureFlag.EmailVerification]: FALSE,

libs/common/src/vault/models/view/collection.view.ts

@@ -38,18 +38,14 @@ export class CollectionView implements View, ITreeNodeObject {
     }
   }
 
-  canEditItems(org: Organization, restrictProviderAccess: boolean): boolean {
+  canEditItems(org: Organization): boolean {
     if (org != null && org.id !== this.organizationId) {
       throw new Error(
         "Id of the organization provided does not match the org id of the collection.",
       );
     }
 
-    return (
-      org?.canEditAllCiphers(restrictProviderAccess) ||
-      this.manage ||
-      (this.assigned && !this.readOnly)
-    );
+    return org?.canEditAllCiphers || this.manage || (this.assigned && !this.readOnly);
   }
 
   /**

libs/vault/src/components/assign-collections.component.ts

@@ -11,12 +11,12 @@ import {
 } from "@angular/core";
 import { FormBuilder, ReactiveFormsModule, Validators } from "@angular/forms";
 import {
-  Observable,
-  Subject,
   combineLatest,
   firstValueFrom,
   map,
+  Observable,
   shareReplay,
+  Subject,
   switchMap,
   takeUntil,
   tap,
@@ -27,8 +27,6 @@ import { OrganizationService } from "@bitwarden/common/admin-console/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 { 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 { CipherId, CollectionId, OrganizationId, UserId } from "@bitwarden/common/types/guid";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
@@ -170,7 +168,6 @@ export class AssignCollectionsComponent implements OnInit, OnDestroy, AfterViewI
   constructor(
     private cipherService: CipherService,
     private i18nService: I18nService,
-    private configService: ConfigService,
     private organizationService: OrganizationService,
     private collectionService: CollectionService,
     private formBuilder: FormBuilder,
@@ -179,10 +176,6 @@ export class AssignCollectionsComponent implements OnInit, OnDestroy, AfterViewI
   ) {}
 
   async ngOnInit() {
-    const restrictProviderAccess = await this.configService.getFeatureFlag(
-      FeatureFlag.RestrictProviderAccess,
-    );
-
     this.activeUserId = await firstValueFrom(
       this.accountService.activeAccount$.pipe(map((a) => a?.id)),
     );
@@ -193,7 +186,7 @@ export class AssignCollectionsComponent implements OnInit, OnDestroy, AfterViewI
       this.showOrgSelector = true;
     }
 
-    await this.initializeItems(this.selectedOrgId, restrictProviderAccess);
+    await this.initializeItems(this.selectedOrgId);
 
     if (this.selectedOrgId && this.selectedOrgId !== MY_VAULT_ID) {
       await this.handleOrganizationCiphers();
@@ -339,7 +332,7 @@ export class AssignCollectionsComponent implements OnInit, OnDestroy, AfterViewI
     }
   }
 
-  private async initializeItems(organizationId: OrganizationId, restrictProviderAccess: boolean) {
+  private async initializeItems(organizationId: OrganizationId) {
     this.totalItemCount = this.params.ciphers.length;
 
     // If organizationId is not present or organizationId is MyVault, then all ciphers are considered personal items
@@ -354,7 +347,7 @@ export class AssignCollectionsComponent implements OnInit, OnDestroy, AfterViewI
     const org = await this.organizationService.get(organizationId);
     this.orgName = org.name;
 
-    this.editableItems = org.canEditAllCiphers(restrictProviderAccess)
+    this.editableItems = org.canEditAllCiphers
       ? this.params.ciphers
       : this.params.ciphers.filter((c) => c.edit);