Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Open
wants to merge 29 commits into
base: main
Choose a base branch
from

Conversation

Jingo88
Copy link
Contributor

@Jingo88 Jingo88 commented Oct 2, 2024

🎟️ Tracking

PM-11162

📔 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.

📸 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)

PM-14165-cli

Removed Assign option from Can Edit Except PW items in browser

PM-14165-browser-assign-remove.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

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

codecov bot commented Oct 2, 2024

Codecov Report

Attention: Patch coverage is 4.76190% with 20 lines in your changes missing coverage. Please review.

Project coverage is 33.41%. Comparing base (5592d64) to head (0fa9f53).
Report is 1 commits behind head on main.

✅ All tests successful. No failed tests found.

Files with missing lines Patch % Lines
...lt/components/vault-items/vault-items.component.ts 0.00% 5 Missing ⚠️
...ult/src/components/assign-collections.component.ts 0.00% 4 Missing ⚠️
...e/src/common/collections/models/collection.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 ⚠️
libs/common/src/vault/models/view/cipher.view.ts 0.00% 1 Missing ⚠️
...nts/item-details/item-details-section.component.ts 50.00% 0 Missing and 1 partial ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main   #11367      +/-   ##
==========================================
- Coverage   33.41%   33.41%   -0.01%     
==========================================
  Files        2841     2841              
  Lines       89008    89024      +16     
  Branches    16979    16984       +5     
==========================================
+ Hits        29744    29745       +1     
- Misses      56927    56941      +14     
- Partials     2337     2338       +1     

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

Copy link
Contributor

github-actions bot commented Oct 2, 2024

Logo
Checkmarx One – Scan Summary & Detailsf9cdadf9-00ea-4502-9fde-1630e45e81b3

No New Or Fixed Issues Found

Copy link
Member

@shane-melton shane-melton left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

@Jingo88 Jingo88 added the needs-qa Marks a PR as requiring QA approval label Oct 2, 2024
return org.id === this.originalCipherView.organizationId;
});

const filteredCollections = this.originalCipherView.collectionIds.find((id) => {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

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

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ 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.

@Jingo88 Jingo88 requested a review from a team as a code owner October 14, 2024 19:31
@Jingo88 Jingo88 requested a review from eliykat October 14, 2024 19:31
Comment on lines 72 to 73
if (cipher?.organizationId == null) {
this.canAssignCollections = true;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

shane-melton
shane-melton previously approved these changes Oct 22, 2024
Copy link
Member

@shane-melton shane-melton left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

shane-melton
shane-melton previously approved these changes Oct 22, 2024
eliykat
eliykat previously approved these changes Oct 31, 2024
shane-melton
shane-melton previously approved these changes Nov 6, 2024
Copy link
Member

@eliykat eliykat left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This no longer affects any AC Team owned files, no approval needed from me 👍

@@ -40,7 +40,7 @@ export class CollectionView implements View, ITreeNodeObject {
}

// Applying excludeHidePassword false will remove collections with Can Edit Except Password Permissions
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⛏️ Comment is outdated

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
needs-qa Marks a PR as requiring QA approval
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants