From f04fef59f40ee986be2b6ea794d29ec0875b74c7 Mon Sep 17 00:00:00 2001 From: Nick Krantz Date: Fri, 4 Oct 2024 13:14:58 -0500 Subject: [PATCH] remove logic for personal ownership, not needed in AC --- ...-console-cipher-form-config.service.spec.ts | 18 ++---------------- ...admin-console-cipher-form-config.service.ts | 13 +++---------- 2 files changed, 5 insertions(+), 26 deletions(-) diff --git a/apps/web/src/app/vault/org-vault/services/admin-console-cipher-form-config.service.spec.ts b/apps/web/src/app/vault/org-vault/services/admin-console-cipher-form-config.service.spec.ts index 4013a6f1e57..f0624e6b2f2 100644 --- a/apps/web/src/app/vault/org-vault/services/admin-console-cipher-form-config.service.spec.ts +++ b/apps/web/src/app/vault/org-vault/services/admin-console-cipher-form-config.service.spec.ts @@ -4,7 +4,6 @@ import { BehaviorSubject } from "rxjs"; import { CollectionAdminService } from "@bitwarden/admin-console/common"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; -import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { CipherId } from "@bitwarden/common/types/guid"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; @@ -18,7 +17,6 @@ describe("AdminConsoleCipherFormConfigService", () => { const cipherId = "333-444-555" as CipherId; const testOrg = { id: "333-44-55", name: "Test Org", canEditAllCiphers: false }; - const policyAppliesToActiveUser$ = new BehaviorSubject(true); const organization$ = new BehaviorSubject(testOrg as Organization); const getCipherAdmin = jest.fn().mockResolvedValue(null); const getCipher = jest.fn().mockResolvedValue(null); @@ -32,10 +30,6 @@ describe("AdminConsoleCipherFormConfigService", () => { await TestBed.configureTestingModule({ providers: [ AdminConsoleCipherFormConfigService, - { - provide: PolicyService, - useValue: { policyAppliesToActiveUser$: () => policyAppliesToActiveUser$ }, - }, { provide: OrganizationService, useValue: { get$: () => organization$ } }, { provide: CipherService, useValue: { get: getCipher } }, { provide: CollectionAdminService, useValue: { getAll: () => Promise.resolve([]) } }, @@ -85,20 +79,12 @@ describe("AdminConsoleCipherFormConfigService", () => { expect(result.admin).toBe(true); }); - it("sets `allowPersonalOwnership`", async () => { + it("sets `allowPersonalOwnership` to false", async () => { adminConsoleConfigService = TestBed.inject(AdminConsoleCipherFormConfigService); - policyAppliesToActiveUser$.next(true); - - let result = await adminConsoleConfigService.buildConfig("clone", cipherId); + const result = await adminConsoleConfigService.buildConfig("clone", cipherId); expect(result.allowPersonalOwnership).toBe(false); - - policyAppliesToActiveUser$.next(false); - - result = await adminConsoleConfigService.buildConfig("clone", cipherId); - - expect(result.allowPersonalOwnership).toBe(true); }); describe("getCipher", () => { diff --git a/apps/web/src/app/vault/org-vault/services/admin-console-cipher-form-config.service.ts b/apps/web/src/app/vault/org-vault/services/admin-console-cipher-form-config.service.ts index 9f4bfe8e730..fa5cbedfca8 100644 --- a/apps/web/src/app/vault/org-vault/services/admin-console-cipher-form-config.service.ts +++ b/apps/web/src/app/vault/org-vault/services/admin-console-cipher-form-config.service.ts @@ -4,8 +4,6 @@ import { combineLatest, filter, firstValueFrom, map, switchMap } from "rxjs"; import { CollectionAdminService } from "@bitwarden/admin-console/common"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; -import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; -import { PolicyType } from "@bitwarden/common/admin-console/enums"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { CipherId } from "@bitwarden/common/types/guid"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; @@ -23,17 +21,12 @@ import { RoutedVaultFilterService } from "../../individual-vault/vault-filter/se /** Admin Console implementation of the `CipherFormConfigService`. */ @Injectable() export class AdminConsoleCipherFormConfigService implements CipherFormConfigService { - private policyService: PolicyService = inject(PolicyService); private organizationService: OrganizationService = inject(OrganizationService); private cipherService: CipherService = inject(CipherService); private routedVaultFilterService: RoutedVaultFilterService = inject(RoutedVaultFilterService); private collectionAdminService: CollectionAdminService = inject(CollectionAdminService); private apiService: ApiService = inject(ApiService); - private allowPersonalOwnership$ = this.policyService - .policyAppliesToActiveUser$(PolicyType.PersonalOwnership) - .pipe(map((p) => !p)); - private organizationId$ = this.routedVaultFilterService.filter$.pipe( map((filter) => filter.organizationId), filter((filter) => filter !== undefined), @@ -60,8 +53,8 @@ export class AdminConsoleCipherFormConfigService implements CipherFormConfigServ cipherId?: CipherId, cipherType?: CipherType, ): Promise { - const [organization, allowPersonalOwnership, allCollections] = await firstValueFrom( - combineLatest([this.organization$, this.allowPersonalOwnership$, this.editableCollections$]), + const [organization, allCollections] = await firstValueFrom( + combineLatest([this.organization$, this.editableCollections$]), ); const cipher = await this.getCipher(organization, cipherId); @@ -74,7 +67,7 @@ export class AdminConsoleCipherFormConfigService implements CipherFormConfigServ mode, cipherType: cipher?.type ?? cipherType ?? CipherType.Login, admin: organization.canEditAllCiphers ?? false, - allowPersonalOwnership, + allowPersonalOwnership: false, originalCipher: cipher, collections, organizations: [organization], // only a single org is in context at a time