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: Disabled E2EE room instances creation #32857

Merged
merged 10 commits into from
Jul 24, 2024
Merged

Conversation

yash-rajpal
Copy link
Member

@yash-rajpal yash-rajpal commented Jul 22, 2024

Proposed changes (including videos or screenshots)

The e2ee room instances were being created for rooms where E2EE was disabled due to a bad condition. This PR fixes this condition and now it doesn't create e2ee room instances for disabled rooms or rooms which don't have e2eKeyId.

Issue(s)

Steps to test or reproduce

Further comments

E2EE2-58

Copy link
Contributor

dionisio-bot bot commented Jul 22, 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 Jul 22, 2024

🦋 Changeset detected

Latest commit: 8be7a6f

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/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/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/uikit-playground Patch
@rocket.chat/models Patch
@rocket.chat/ui-avatar Patch
@rocket.chat/ui-client 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

Copy link

codecov bot commented Jul 22, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 55.50%. Comparing base (a0578b1) to head (8be7a6f).

Additional details and impacted files

Impacted file tree graph

@@             Coverage Diff             @@
##           develop   #32857      +/-   ##
===========================================
+ Coverage    55.48%   55.50%   +0.02%     
===========================================
  Files         2637     2636       -1     
  Lines        57393    57362      -31     
  Branches     11892    11886       -6     
===========================================
- Hits         31844    31839       -5     
+ Misses       22850    22828      -22     
+ Partials      2699     2695       -4     
Flag Coverage Δ
e2e 54.07% <100.00%> (+0.02%) ⬆️
unit 72.25% <ø> (+0.03%) ⬆️

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 July 24, 2024 14:04
@yash-rajpal yash-rajpal requested a review from a team as a code owner July 24, 2024 14:04
@yash-rajpal yash-rajpal added this to the 6.11 milestone Jul 24, 2024
@yash-rajpal yash-rajpal added the stat: QA assured Means it has been tested and approved by a company insider label Jul 24, 2024
@dionisio-bot dionisio-bot bot added the stat: ready to merge PR tested and approved waiting for merge label Jul 24, 2024
@kodiakhq kodiakhq bot merged commit e9fb44a into develop Jul 24, 2024
49 checks passed
@kodiakhq kodiakhq bot deleted the fix/e2ee-rooms-creation branch July 24, 2024 19:50
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.

2 participants