1
0
mirror of https://github.com/bitwarden/browser synced 2025-12-16 08:13:42 +00:00

[PM-20633] rename personal ownership (#15228)

* sensible renames

* renames

* clean up comments
This commit is contained in:
Brandon Treston
2025-06-24 09:31:40 -04:00
committed by GitHub
parent fa23a905e0
commit 1c237a3753
37 changed files with 170 additions and 162 deletions

View File

@@ -44,7 +44,7 @@ export class DefaultCipherFormConfigService implements CipherFormConfigService {
): Promise<CipherFormConfig> {
const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
const [organizations, collections, allowPersonalOwnership, folders, cipher] =
const [organizations, collections, organizationDataOwnershipDisabled, folders, cipher] =
await firstValueFrom(
combineLatest([
this.organizations$(activeUserId),
@@ -55,7 +55,7 @@ export class DefaultCipherFormConfigService implements CipherFormConfigService {
),
),
),
this.allowPersonalOwnership$,
this.organizationDataOwnershipDisabled$,
this.folderService.folders$(activeUserId).pipe(
switchMap((f) =>
this.folderService.folderViews$(activeUserId).pipe(
@@ -71,7 +71,7 @@ export class DefaultCipherFormConfigService implements CipherFormConfigService {
mode,
cipherType: cipher?.type ?? cipherType ?? CipherType.Login,
admin: false,
allowPersonalOwnership,
organizationDataOwnershipDisabled,
originalCipher: cipher,
collections,
organizations,
@@ -91,10 +91,10 @@ export class DefaultCipherFormConfigService implements CipherFormConfigService {
);
}
private allowPersonalOwnership$ = this.accountService.activeAccount$.pipe(
private organizationDataOwnershipDisabled$ = this.accountService.activeAccount$.pipe(
getUserId,
switchMap((userId) =>
this.policyService.policyAppliesToUser$(PolicyType.PersonalOwnership, userId),
this.policyService.policyAppliesToUser$(PolicyType.OrganizationDataOwnership, userId),
),
map((p) => !p),
);