[PM-11162] Assign To Collections Permission Update #11367

Jingo88 · 2024-10-02T18:52:09Z

🎟️ Tracking

📔 Objective

Only users with Can Edit permissions will be allowed to Assign To Collections. If the user has Can Edit Except Password they should not see Assign To Collections in the menu of the item row.

UPDATE:
After speaking with product and design we have decided to move away from hiding Can Edit Except Passwords collections from the dropdown.

If an item belongs to only a Can Edit Except Passwords collection, the user will not see the Assign to Collections action in the item row menu, and the collections dropdown will be disabled

If an item belongs to multiple collections with a higher permission (e.g. item is in Can Edit Except Password and Can Manage) the user will see the Assign to Collections action, and the collections dropdown in the edit modal will show all available collections

📸 Screen Recording

PM-11162.mov

Desktop Permissions

PM-11162-Desktop.mov

Screenshot of CLI error when trying to add collection to Can Edit Except PW item UPDATED (shows new error text)

Removed Assign option from Can Edit Except PW items in browser

PM-14165-browser-assign-remove.mov

Recording of Collections dropdown disable for item with only Can Edit Except PW. And dropdown available for item with multiple collections including a Manage/Edit permission.

PM-11162-edit-except-pw-PM-AC.mov

Recording for PM-17390 - When Owners/Admin Access setting is turned on, disable collection options in PM for Owners if they do not have Edit/Manage permissions

Screen.Recording.2025-01-27.at.11.14.53.AM.mov

Recording for PM-17390 - Custom User Flow in PM

PM-17390-custom-user-collection-edit-except-pw-check.mov

⏰ Reminders before review

Contributor guidelines followed
All formatters and local linters executed and passed
Written new unit and / or integration tests where applicable
Protected functional changes with optionality (feature flags)
Used internationalization (i18n) for all UI strings
CI builds passed
Communicated to DevOps any deployment requirements
Updated any necessary documentation (Confluence, contributing docs) or informed the documentation team

🦮 Reviewer guidelines

👍 (:+1:) or similar for great changes
📝 (:memo:) or ℹ️ (:information_source:) for notes or general info
❓ (:question:) for questions
🤔 (:thinking:) or 💭 (:thought_balloon:) for more open inquiry that's not quite a confirmed issue and could potentially benefit from discussion
🎨 (:art:) for suggestions / improvements
❌ (:x:) or ⚠️ (:warning:) for more significant problems or concerns needing attention
🌱 (:seedling:) or ♻️ (:recycle:) for future improvements or indications of technical debt
⛏ (:pick:) for minor or nitpick changes

codecov · 2024-10-02T19:00:53Z

Codecov Report

Attention: Patch coverage is 34.28571% with 23 lines in your changes missing coverage. Please review.

Project coverage is 35.39%. Comparing base (aeb4e21) to head (f98884f).
Report is 8 commits behind head on main.

Files with missing lines	Patch %	Lines
...ult/src/components/assign-collections.component.ts	0.00%	6 Missing ⚠️
...lt/components/vault-items/vault-items.component.ts	0.00%	4 Missing ⚠️
...nts/item-details/item-details-section.component.ts	75.00%	3 Missing and 1 partial ⚠️
libs/common/src/vault/models/view/cipher.view.ts	0.00%	3 Missing ⚠️
apps/cli/src/commands/edit.command.ts	0.00%	2 Missing ⚠️
...mponents/vault-items/vault-cipher-row.component.ts	0.00%	2 Missing ⚠️
...2/item-more-options/item-more-options.component.ts	0.00%	1 Missing ⚠️
apps/cli/src/models/response.ts	0.00%	1 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main   #11367      +/-   ##
==========================================
- Coverage   35.39%   35.39%   -0.01%     
==========================================
  Files        3009     3009              
  Lines       90783    90807      +24     
  Branches    16868    16876       +8     
==========================================
+ Hits        32137    32144       +7     
- Misses      56182    56199      +17     
  Partials     2464     2464

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

github-actions · 2024-10-02T19:03:24Z

Checkmarx One – Scan Summary & Details – 92453ffd-8963-4db9-86af-82646864e2a5

Great job, no security vulnerabilities found in this Pull Request

shane-melton

The change to vault-items looks good!

However, we need to make a similar change to the item-details-section.component for the new CipherForm. It also allows users to modify a cipher's collections without the "Assign To Collections" dialog so we need to adjust that component to disable the collections control when !cipher.viewPassword

shane-melton · 2024-10-07T21:55:07Z

libs/vault/src/cipher-form/components/item-details/item-details-section.component.ts

+      return org.id === this.originalCipherView.organizationId;
+    });
+
+    const filteredCollections = this.originalCipherView.collectionIds.find((id) => {


⚠️ this.originalCipherView can be null when creating a new cipher and this will throw.

shane-melton · 2024-10-07T22:03:32Z

libs/vault/src/cipher-form/components/item-details/item-details-section.component.ts

+      filteredCollections?.length > 0 ||
+      (this.originalCipherView.edit && this.originalCipherView.viewPassword)
+    ) {
+      this.showCollectionsControl = true;


⚠️ We only want to disable the collection control when they don't have access to assign to other collections. Disabling allows the user to still see what its assigned to, otherwise there is no way to view that information.

libs/vault/src/cipher-form/components/item-details/item-details-section.component.ts

apps/web/src/app/vault/components/vault-items/vault-items.component.ts

…ot remove assign to collections based on permissions

…ons in desktop client

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

eliykat · 2024-10-16T04:49:34Z

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

+    if (cipher?.organizationId == null) {
+      this.canAssignCollections = true;


I don't follow this - if the cipher isn't in an organization, you can't assign it to a collection.

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

shane-melton

Looks good to go! There do seem to be a couple merge conflicts though

cd-bitwarden

Looks good

cd-bitwarden

You're most recent changes look good 👍

cd-bitwarden

LGTM!

cd-bitwarden

lgtm

Jingo88 added 2 commits October 2, 2024 12:22

updated canEditCipher permission logic inside vault-items

51d15cd

Merge branch 'main' into PM-11162-assign-to-collections-perm

be5ac61

Jingo88 requested a review from a team as a code owner October 2, 2024 18:52

Jingo88 requested review from gbubemismith and shane-melton October 2, 2024 18:52

shane-melton requested changes Oct 2, 2024

View reviewed changes

Jingo88 added the needs-qa Marks a PR as requiring QA approval label Oct 2, 2024

Jingo88 added 3 commits October 2, 2024 17:41

Merge branch 'main' into PM-11162-assign-to-collections-perm

c852cd9

add permission logic to assign to collections for browser cipher edit

a7eb84c

update spec for new perm logic in item details section

3812613

Jingo88 requested a review from shane-melton October 4, 2024 19:01

shane-melton requested changes Oct 7, 2024

View reviewed changes

Jingo88 added 3 commits October 8, 2024 16:51

Merge branch 'main' into PM-11162-assign-to-collections-perm

f53b337

updates to vault items and item details section to only disable and n…

6308eca

…ot remove assign to collections based on permissions

fix reversed logic for canEdit and canAssign in vault-items

97efd35

Jingo88 requested a review from shane-melton October 9, 2024 18:32

Jingo88 added 2 commits October 14, 2024 11:22

Merge branch 'main' into PM-11162-assign-to-collections-perm

65caab7

update collections component to disable collections based on permissi…

2a93e72

…ons in desktop client

Jingo88 requested a review from a team as a code owner October 14, 2024 19:31

Jingo88 requested a review from eliykat October 14, 2024 19:31

eliykat requested changes Oct 16, 2024

View reviewed changes

Jingo88 added 2 commits October 16, 2024 12:02

reduce logic for can assign for desktop

8cd5cac

update naming for new cipherView getter

b94ee53

shane-melton previously approved these changes Oct 22, 2024

View reviewed changes

merged latest, fixed conflicts

704b22f

Jingo88 dismissed shane-melton’s stale review via 704b22f October 22, 2024 22:51

Jingo88 requested a review from shane-melton October 22, 2024 22:52

shane-melton previously approved these changes Oct 22, 2024

View reviewed changes

Merge branch 'main' into PM-11162-assign-to-collections-perm

ce5add0

cd-bitwarden previously approved these changes Jan 15, 2025

View reviewed changes

eliykat previously approved these changes Jan 16, 2025

View reviewed changes

kejaeger and others added 3 commits January 16, 2025 12:44

Merge branch 'main' into PM-11162-assign-to-collections-perm

01dafe4

Merge branch 'main' into PM-11162-assign-to-collections-perm

ad2e28a

check for org on load of canAssignCollections

3c9f5bb

Jingo88 dismissed stale reviews from eliykat and cd-bitwarden via 3c9f5bb January 17, 2025 14:56

Jingo88 requested a review from cd-bitwarden January 17, 2025 14:56

cd-bitwarden previously approved these changes Jan 17, 2025

View reviewed changes

merged latest, fixed conflicts

3e5ce6c

Jingo88 dismissed cd-bitwarden’s stale review via 3e5ce6c January 24, 2025 14:33

Jingo88 added 2 commits January 26, 2025 10:29

fix old org service call in assign collections

a9e6f5a

Merge branch 'main' into PM-11162-assign-to-collections-perm

535017a

eliykat previously approved these changes Jan 27, 2025

View reviewed changes

add disable check for owners without edit/manage access inside PM

df453f2

Jingo88 dismissed eliykat’s stale review via df453f2 January 27, 2025 16:24

Jingo88 requested review from cd-bitwarden and shane-melton January 27, 2025 16:27

cd-bitwarden previously approved these changes Jan 27, 2025

View reviewed changes

Jingo88 added 3 commits February 3, 2025 14:36

Merge branch 'main' into PM-11162-assign-to-collections-perm

01fbfc6

Merge branch 'main' into PM-11162-assign-to-collections-perm

4152b9c

adding check in PM for custom users looking at collections

f43c457

Jingo88 dismissed cd-bitwarden’s stale review via f43c457 February 3, 2025 23:45

Jingo88 requested a review from cd-bitwarden February 4, 2025 15:16

Merge branch 'main' into PM-11162-assign-to-collections-perm

f98884f

cd-bitwarden approved these changes Feb 4, 2025

View reviewed changes

Jingo88 removed the needs-qa Marks a PR as requiring QA approval label Feb 4, 2025

Jingo88 merged commit 327aed9 into main Feb 4, 2025
105 of 111 checks passed

Jingo88 deleted the PM-11162-assign-to-collections-perm branch February 4, 2025 20:45

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[PM-11162] Assign To Collections Permission Update #11367

[PM-11162] Assign To Collections Permission Update #11367

Jingo88 commented Oct 2, 2024 •

edited

Loading

codecov bot commented Oct 2, 2024 •

edited

Loading

github-actions bot commented Oct 2, 2024 •

edited

Loading

shane-melton left a comment

shane-melton Oct 7, 2024

shane-melton Oct 7, 2024

eliykat Oct 16, 2024

shane-melton left a comment

cd-bitwarden left a comment

cd-bitwarden left a comment

cd-bitwarden left a comment

cd-bitwarden left a comment

		if (cipher?.organizationId == null) {
		this.canAssignCollections = true;

[PM-11162] Assign To Collections Permission Update #11367

[PM-11162] Assign To Collections Permission Update #11367

Conversation

Jingo88 commented Oct 2, 2024 • edited Loading

🎟️ Tracking

📔 Objective

📸 Screen Recording

⏰ Reminders before review

🦮 Reviewer guidelines

codecov bot commented Oct 2, 2024 • edited Loading

Codecov Report

github-actions bot commented Oct 2, 2024 • edited Loading

Great job, no security vulnerabilities found in this Pull Request

shane-melton left a comment

Choose a reason for hiding this comment

shane-melton Oct 7, 2024

Choose a reason for hiding this comment

shane-melton Oct 7, 2024

Choose a reason for hiding this comment

eliykat Oct 16, 2024

Choose a reason for hiding this comment

shane-melton left a comment

Choose a reason for hiding this comment

cd-bitwarden left a comment

Choose a reason for hiding this comment

cd-bitwarden left a comment

Choose a reason for hiding this comment

cd-bitwarden left a comment

Choose a reason for hiding this comment

cd-bitwarden left a comment

Choose a reason for hiding this comment

Jingo88 commented Oct 2, 2024 •

edited

Loading

codecov bot commented Oct 2, 2024 •

edited

Loading

github-actions bot commented Oct 2, 2024 •

edited

Loading