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: OTR session closing after 10 seconds without warning #29245

Merged
merged 5 commits into from May 31, 2023

Conversation

gabriellsh
Copy link
Member

@gabriellsh gabriellsh commented May 15, 2023

Proposed changes (including videos or screenshots)

The Notifications streamer is sending two events when there's a license applied to the workspace and it's not using Microservices. I'm avoiding this by simply ignoring the second event in OTRRoom.

There is still an issue where there's 2 system messages being fired after accepting, but that's not a really big concern since it doesn't break anything.

Issue(s)

SUP-224

Steps to test or reproduce

Apply a license to the workspace
Start an OTR session with another user.
The other user will receive a notification (modal) asking to accept the session. Counting from the time the modal shows up, even if accepted, 10 seconds later the OTR session will timeout.

Further comments

@codecov
Copy link

codecov bot commented May 15, 2023

Codecov Report

Merging #29245 (59414c0) into develop (7db2fc5) will increase coverage by 0.13%.
The diff coverage is 25.00%.

Impacted file tree graph

@@             Coverage Diff             @@
##           develop   #29245      +/-   ##
===========================================
+ Coverage    45.76%   45.89%   +0.13%     
===========================================
  Files          685      685              
  Lines        12984    12988       +4     
  Branches      2208     2209       +1     
===========================================
+ Hits          5942     5961      +19     
+ Misses        6732     6719      -13     
+ Partials       310      308       -2     
Flag Coverage Δ
e2e 45.85% <25.00%> (+0.13%) ⬆️

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

@changeset-bot
Copy link

changeset-bot bot commented May 22, 2023

🦋 Changeset detected

Latest commit: 59414c0

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

This PR includes changesets to release 24 packages
Name Type
@rocket.chat/meteor Patch
@rocket.chat/core-typings Patch
@rocket.chat/rest-typings Patch
@rocket.chat/api-client Patch
@rocket.chat/core-services Patch
@rocket.chat/cron 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/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/uikit-playground 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

@scuciatto scuciatto added this to the 6.2.3 milestone May 24, 2023
@dionisio-bot dionisio-bot bot added the stat: ready to merge PR tested and approved waiting for merge label May 30, 2023
@dionisio-bot dionisio-bot bot 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 May 31, 2023
@ggazzo ggazzo merged commit d33f4eb into develop May 31, 2023
38 checks passed
@ggazzo ggazzo deleted the fix/otrTimeout branch May 31, 2023 15:00
gabriellsh added a commit that referenced this pull request Jun 1, 2023
…e/system-messages-update

* 'develop' of github.com:RocketChat/Rocket.Chat: (26 commits)
  fix: Importer crashes when sending the "active status" e-mail notification to users (#29401)
  docs: new README file (#27955)
  refactor: replace with new `Select` (#29368)
  fix: Sidebar's sort by name not being checked properly (#29415)
  fix: Login Terms custom content (#28999)
  fix: Broken link fixed inside webhook menu (#29048)
  fix: Apps settings i18n translation (#29394)
  fix: OTR session closing after 10 seconds without warning (#29245)
  fix: Register Username form showing before homepage (#29356)
  regression(ui-client): Toolbox action button badge in the wrong position (#29412)
  fix: marketplace filters are changing size (#28738)
  chore: Update highlighted word color (#29407)
  i18n: Language update from LingoHub 🤖 on 2023-05-22Z (#29317)
  chore(ddp-sdk): ts-jest -> swc/jest (#29380)
  chore: `ToolboxAction` pressed state (#29397)
  chore: add logs to recurring omnichannel cron jobs (#29392)
  regression: `t` using always sprintf (#29396)
  fix: fix wrong %s translations (#29395)
  regression(push): fix error when selecting what to import (#29289)
  chore: Change ddpsdk.stream to return subscription (#29375)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
stat: QA tested stat: ready to merge PR tested and approved waiting for merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants