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.

Sign up for GitHub

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

Jump to bottom

fix: prevent OTR in E2EE #32459

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

fix: prevent OTR in E2EE #32459

wants to merge 3 commits into from
+255 −18

Conversation

hugocostadev
Copy link
Contributor

Proposed changes (including videos or screenshots)

Attempting to use OTR and E2E at the same time just renders a harsh.

Issue(s)

Steps to test or reproduce

  1. Enable E2E for a direct message channel
  2. Assemble an OTR session
  3. Try to send a message

Further comments

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

@hugocostadev hugocostadev requested a review from a team as a code owner May 20, 2024 19:43
@dionisio-bot dionisio-bot
Copy link
Contributor

dionisio-bot bot commented May 20, 2024 •
edited

Looks like this PR is not ready to merge, because of the following issues:

  • This PR is missing the 'stat: QA assured' label
  • This PR is targeting the wrong base branch. It should target 7.0.0, but it targets 6.9.0

Please fix the issues and try again

If you have any trouble, please check the PR guidelines

@changeset-bot changeset-bot
Copy link

changeset-bot bot commented May 20, 2024 •
edited

🦋 Changeset detected

Latest commit: 35fdc16

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

This PR includes changesets to release 34 packages
Name Type
@rocket.chat/meteor Patch
@rocket.chat/i18n Patch
@rocket.chat/mock-providers Patch
@rocket.chat/ui-contexts Patch
@rocket.chat/web-ui-registration Patch
@rocket.chat/fuselage-ui-kit Patch
@rocket.chat/ui-client Patch
@rocket.chat/gazzodown Patch
@rocket.chat/livechat Patch
@rocket.chat/ui-avatar Patch
@rocket.chat/ui-video-conf Patch
@rocket.chat/uikit-playground Patch
@rocket.chat/ddp-streamer Patch
@rocket.chat/omnichannel-transcript 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/model-typings Patch
@rocket.chat/account-service Patch
@rocket.chat/authorization-service 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/models 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

@hugocostadev hugocostadev added this to the 7.0 milestone May 20, 2024
@codecov Codecov
Copy link

codecov bot commented May 20, 2024 •
edited

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 55.89%. Comparing base (6ac3607) to head (35fdc16).

Additional details and impacted files

Impacted file tree graph

@@             Coverage Diff             @@
##           develop   #32459      +/-   ##
===========================================
+ Coverage    55.86%   55.89%   +0.02%     
===========================================
  Files         2432     2433       +1     
  Lines        53480    53521      +41     
  Branches     10993    11000       +7     
===========================================
+ Hits         29877    29914      +37     
- Misses       20966    20970       +4     
  Partials      2637     2637
Flag Coverage Δ
e2e 55.20% <78.57%> (+<0.01%) ⬆️
unit 72.84% <100.00%> (+0.09%) ⬆️

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

MarcosSpessatto
MarcosSpessatto requested changes May 24, 2024
View reviewed changes
Copy link
Contributor

@MarcosSpessatto MarcosSpessatto left a comment

Choose a reason for hiding this comment

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

Would it be possible to add some UI tests to ensure the behavior?

@KevLehman
Copy link
Contributor

Random question from my ignorance: if the action is not allowed, shouldn't we at least gray out the button so users cannot click? 🤔
(nt sure if u are already doing it and i cannot see)

@hugocostadev
Copy link
Contributor Author

Random question from my ignorance: if the action is not allowed, shouldn't we at least gray out the button so users cannot click? 🤔

(nt sure if u are already doing it and i cannot see)

We have a similar scenario for Auto translate feature, so we decided (product and design) to do the same

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MarcosSpessatto MarcosSpessatto MarcosSpessatto requested changes

Requested changes must be addressed to merge this pull request.

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
7.0
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@hugocostadev @KevLehman @MarcosSpessatto