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

fix: Don't return users with E2ESuggestedKey set when selecting users to provide E2EKey #33405

Merged

Conversation

KevLehman
Copy link
Contributor

@KevLehman KevLehman commented Sep 30, 2024

Proposed changes (including videos or screenshots)

This should prevent an issue where a user may receive an indefinite amount of "suggested keys" from all the users on a room even when a user already suggested a key for them, duplicating the work.

Now, the endpoint that returns users waiting for keys will return only users that don't have neither E2EKey nor E2ESuggestedKey.

Issue(s)

https://rocketchat.atlassian.net/browse/E2EE2-72

Steps to test or reproduce

Further comments

Copy link
Contributor

dionisio-bot bot commented Sep 30, 2024

Looks like this PR is ready to merge! 🎉
If you have any trouble, please check the PR guidelines

Copy link

changeset-bot bot commented Sep 30, 2024

🦋 Changeset detected

Latest commit: a698950

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 33 packages
Name Type
@rocket.chat/meteor Patch
@rocket.chat/core-typings Patch
@rocket.chat/rest-typings Patch
@rocket.chat/uikit-playground Patch
@rocket.chat/api-client Patch
@rocket.chat/apps Patch
@rocket.chat/core-services Patch
@rocket.chat/cron Patch
@rocket.chat/ddp-client Patch
@rocket.chat/freeswitch Patch
@rocket.chat/fuselage-ui-kit Patch
@rocket.chat/gazzodown Patch
@rocket.chat/livechat Patch
@rocket.chat/model-typings Patch
@rocket.chat/ui-contexts Patch
@rocket.chat/account-service Patch
@rocket.chat/authorization-service Patch
@rocket.chat/ddp-streamer Patch
@rocket.chat/omnichannel-transcript Patch
@rocket.chat/presence-service Patch
@rocket.chat/queue-worker Patch
@rocket.chat/stream-hub-service Patch
@rocket.chat/license Patch
@rocket.chat/omnichannel-services Patch
@rocket.chat/pdf-worker Patch
@rocket.chat/presence Patch
rocketchat-services Patch
@rocket.chat/network-broker Patch
@rocket.chat/models Patch
@rocket.chat/ui-avatar Patch
@rocket.chat/ui-video-conf Patch
@rocket.chat/web-ui-registration Patch
@rocket.chat/instance-status Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@KevLehman KevLehman added this to the 6.14 milestone Sep 30, 2024
Copy link
Contributor

github-actions bot commented Sep 30, 2024

PR Preview Action v1.4.8
Preview removed because the pull request was closed.
2024-10-08 21:53 UTC

Copy link

codecov bot commented Sep 30, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 58.59%. Comparing base (af202c7) to head (a698950).
Report is 1 commits behind head on develop.

Additional details and impacted files

Impacted file tree graph

@@           Coverage Diff            @@
##           develop   #33405   +/-   ##
========================================
  Coverage    58.58%   58.59%           
========================================
  Files         2737     2737           
  Lines        65679    65708   +29     
  Branches     14824    14826    +2     
========================================
+ Hits         38479    38500   +21     
- Misses       24421    24429    +8     
  Partials      2779     2779           
Flag Coverage Δ
unit 75.66% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

@KevLehman KevLehman marked this pull request as ready for review September 30, 2024 19:29
@KevLehman KevLehman requested a review from a team as a code owner September 30, 2024 19:29
@dionisio-bot dionisio-bot bot added stat: ready to merge PR tested and approved waiting for merge stat: QA assured Means it has been tested and approved by a company insider and removed stat: QA tested labels Oct 7, 2024
Copy link
Member

@sampaiodiego sampaiodiego left a comment

Choose a reason for hiding this comment

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

we agreed to work on API tests in a further task

Copy link
Member

@sampaiodiego sampaiodiego left a comment

Choose a reason for hiding this comment

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

we agreed to work on API tests in a further task

@kodiakhq kodiakhq bot merged commit a16b582 into develop Oct 8, 2024
50 checks passed
@kodiakhq kodiakhq bot deleted the fix/avoid-suggesting-keys-to-users-with-a-suggested-key branch October 8, 2024 21:53
@ggazzo ggazzo modified the milestones: 6.14, 7.0 Oct 17, 2024
This was referenced Oct 20, 2024
abhinavkrin pushed a commit that referenced this pull request Oct 25, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
stat: QA assured Means it has been tested and approved by a company insider stat: ready to merge PR tested and approved waiting for merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants