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: Force logout live clients on E2EE keys reset #31958

Merged
merged 12 commits into from
Apr 20, 2024
Merged

Conversation

yash-rajpal
Copy link
Member

Proposed changes (including videos or screenshots)

Issue(s)

Steps to test or reproduce

Further comments

E2EE-10

Copy link

changeset-bot bot commented Mar 11, 2024

🦋 Changeset detected

Latest commit: 2af676b

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

This PR includes changesets to release 32 packages
Name Type
@rocket.chat/meteor Patch
@rocket.chat/core-typings Patch
@rocket.chat/rest-typings Patch
@rocket.chat/apps Patch
@rocket.chat/core-services Patch
@rocket.chat/cron 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/api-client Patch
@rocket.chat/license Patch
@rocket.chat/omnichannel-services Patch
@rocket.chat/pdf-worker Patch
@rocket.chat/presence Patch
rocketchat-services Patch
@rocket.chat/ddp-client Patch
@rocket.chat/fuselage-ui-kit Patch
@rocket.chat/models Patch
@rocket.chat/ui-avatar Patch
@rocket.chat/ui-client Patch
@rocket.chat/ui-video-conf Patch
@rocket.chat/uikit-playground 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

Copy link

codecov bot commented Mar 11, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 52.30%. Comparing base (3925d43) to head (2af676b).

Additional details and impacted files

Impacted file tree graph

@@             Coverage Diff             @@
##           develop   #31958      +/-   ##
===========================================
- Coverage    55.42%   52.30%   -3.12%     
===========================================
  Files         2330     2131     -199     
  Lines        51380    48342    -3038     
  Branches     10509     9890     -619     
===========================================
- Hits         28475    25286    -3189     
- Misses       20390    20765     +375     
+ Partials      2515     2291     -224     
Flag Coverage Δ
e2e 48.74% <ø> (-6.12%) ⬇️
unit 74.92% <ø> (ø)

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

@yash-rajpal yash-rajpal marked this pull request as ready for review March 11, 2024 20:03
@yash-rajpal yash-rajpal requested a review from a team as a code owner March 11, 2024 20:03
@yash-rajpal yash-rajpal requested a review from a team as a code owner March 12, 2024 16:02
KevLehman
KevLehman previously approved these changes Mar 26, 2024
Copy link
Contributor

dionisio-bot bot commented Apr 12, 2024

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

@jessicaschelly jessicaschelly added the stat: QA assured Means it has been tested and approved by a company insider label Apr 15, 2024
@gabriellsh gabriellsh added this to the 6.8 milestone Apr 15, 2024
@dionisio-bot dionisio-bot bot added the stat: ready to merge PR tested and approved waiting for merge label Apr 15, 2024
gabriellsh
gabriellsh previously approved these changes Apr 15, 2024
Copy link
Member

@gabriellsh gabriellsh left a comment

Choose a reason for hiding this comment

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

Nice tests!

@scuciatto scuciatto added stat: ready to merge PR tested and approved waiting for merge and removed stat: ready to merge PR tested and approved waiting for merge labels Apr 18, 2024
@kodiakhq kodiakhq bot removed the stat: ready to merge PR tested and approved waiting for merge label Apr 20, 2024
Copy link
Contributor

kodiakhq bot commented Apr 20, 2024

This PR currently has a merge conflict. Please resolve this and then re-add the ['stat: ready to merge', 'automerge'] label.

@rodrigok rodrigok added the stat: ready to merge PR tested and approved waiting for merge label Apr 20, 2024
@kodiakhq kodiakhq bot merged commit 1b7479d into develop Apr 20, 2024
35 of 40 checks passed
@kodiakhq kodiakhq bot deleted the e2e-notify-reset-keys branch April 20, 2024 18:09
@ggazzo
Copy link
Member

ggazzo commented Apr 23, 2024

/patch

Copy link
Contributor

dionisio-bot bot commented Apr 23, 2024

    Sorry, I couldn't do that backport because of conflicts. Could you please solve them?
    
    you can do so by running the following commands:
git fetch
git checkout backport-6.7.1-31958
git cherry-pick 1b7479d97bab2f2347dab248534901a713e388a5
// solve the conflict
git push

after that just run /patch again

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.

10 participants